diff --git a/Arduino.h b/arduino/Arduino.h
similarity index 98%
rename from Arduino.h
rename to arduino/Arduino.h
index 192c6e8..8340ca3 100644
--- a/Arduino.h
+++ b/arduino/Arduino.h
@@ -221,10 +221,10 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
 #include "WCharacter.h"
 #include "WString.h"
 #include "HardwareSerial.h"
-#include "USBAPI.h"
-#include "CDC.h"
-#include "HID.h"
-#include "HIDTables.h"
+#include "USB-Core/USBAPI.h"
+#include "USB-Core/CDC.h"
+#include "USB-Core/HID.h"
+#include "USB-Core/HIDTables.h"
 
 #if defined(HAVE_HWSERIAL0) && defined(HAVE_CDCSERIAL)
 #error "Targets with both UART0 and CDC serial not supported"
diff --git a/CDC.cpp b/arduino/USB-Core/CDC.cpp
similarity index 100%
rename from CDC.cpp
rename to arduino/USB-Core/CDC.cpp
diff --git a/CDC.h b/arduino/USB-Core/CDC.h
similarity index 100%
rename from CDC.h
rename to arduino/USB-Core/CDC.h
diff --git a/Consumer.cpp b/arduino/USB-Core/Consumer.cpp
similarity index 100%
rename from Consumer.cpp
rename to arduino/USB-Core/Consumer.cpp
diff --git a/Consumer.h b/arduino/USB-Core/Consumer.h
similarity index 100%
rename from Consumer.h
rename to arduino/USB-Core/Consumer.h
diff --git a/Gamepad.cpp b/arduino/USB-Core/Gamepad.cpp
similarity index 100%
rename from Gamepad.cpp
rename to arduino/USB-Core/Gamepad.cpp
diff --git a/Gamepad.h b/arduino/USB-Core/Gamepad.h
similarity index 100%
rename from Gamepad.h
rename to arduino/USB-Core/Gamepad.h
diff --git a/HID.cpp b/arduino/USB-Core/HID.cpp
similarity index 100%
rename from HID.cpp
rename to arduino/USB-Core/HID.cpp
diff --git a/HID.h b/arduino/USB-Core/HID.h
similarity index 100%
rename from HID.h
rename to arduino/USB-Core/HID.h
diff --git a/HIDAPI.h b/arduino/USB-Core/HIDAPI.h
similarity index 100%
rename from HIDAPI.h
rename to arduino/USB-Core/HIDAPI.h
diff --git a/HIDTables.h b/arduino/USB-Core/HIDTables.h
similarity index 100%
rename from HIDTables.h
rename to arduino/USB-Core/HIDTables.h
diff --git a/Keyboard.cpp b/arduino/USB-Core/Keyboard.cpp
similarity index 100%
rename from Keyboard.cpp
rename to arduino/USB-Core/Keyboard.cpp
diff --git a/Keyboard.h b/arduino/USB-Core/Keyboard.h
similarity index 100%
rename from Keyboard.h
rename to arduino/USB-Core/Keyboard.h
diff --git a/Mouse.cpp b/arduino/USB-Core/Mouse.cpp
similarity index 100%
rename from Mouse.cpp
rename to arduino/USB-Core/Mouse.cpp
diff --git a/Mouse.h b/arduino/USB-Core/Mouse.h
similarity index 100%
rename from Mouse.h
rename to arduino/USB-Core/Mouse.h
diff --git a/System.cpp b/arduino/USB-Core/System.cpp
similarity index 100%
rename from System.cpp
rename to arduino/USB-Core/System.cpp
diff --git a/System.h b/arduino/USB-Core/System.h
similarity index 100%
rename from System.h
rename to arduino/USB-Core/System.h
diff --git a/USBAPI.h b/arduino/USB-Core/USBAPI.h
similarity index 100%
rename from USBAPI.h
rename to arduino/USB-Core/USBAPI.h
diff --git a/USBCore.cpp b/arduino/USB-Core/USBCore.cpp
similarity index 100%
rename from USBCore.cpp
rename to arduino/USB-Core/USBCore.cpp
diff --git a/USBCore.h b/arduino/USB-Core/USBCore.h
similarity index 100%
rename from USBCore.h
rename to arduino/USB-Core/USBCore.h
diff --git a/USBDesc.h b/arduino/USB-Core/USBDesc.h
similarity index 100%
rename from USBDesc.h
rename to arduino/USB-Core/USBDesc.h
diff --git a/wiring_private.h b/arduino/wiring_private.h
similarity index 100%
rename from wiring_private.h
rename to arduino/wiring_private.h