diff --git a/hardware/arduino/sam/cores/sam/CDC.cpp b/hardware/arduino/sam/cores/sam/USB/CDC.cpp
similarity index 100%
rename from hardware/arduino/sam/cores/sam/CDC.cpp
rename to hardware/arduino/sam/cores/sam/USB/CDC.cpp
diff --git a/hardware/arduino/sam/cores/sam/HID.cpp b/hardware/arduino/sam/cores/sam/USB/HID.cpp
similarity index 100%
rename from hardware/arduino/sam/cores/sam/HID.cpp
rename to hardware/arduino/sam/cores/sam/USB/HID.cpp
diff --git a/hardware/arduino/sam/cores/sam/USBAPI.h b/hardware/arduino/sam/cores/sam/USB/USBAPI.h
similarity index 100%
rename from hardware/arduino/sam/cores/sam/USBAPI.h
rename to hardware/arduino/sam/cores/sam/USB/USBAPI.h
diff --git a/hardware/arduino/sam/cores/sam/USBCore.cpp.disabled b/hardware/arduino/sam/cores/sam/USB/USBCore.cpp.disabled
similarity index 100%
rename from hardware/arduino/sam/cores/sam/USBCore.cpp.disabled
rename to hardware/arduino/sam/cores/sam/USB/USBCore.cpp.disabled
diff --git a/hardware/arduino/sam/cores/sam/USBCore.h b/hardware/arduino/sam/cores/sam/USB/USBCore.h
similarity index 100%
rename from hardware/arduino/sam/cores/sam/USBCore.h
rename to hardware/arduino/sam/cores/sam/USB/USBCore.h
diff --git a/hardware/arduino/sam/cores/sam/USBDesc.h b/hardware/arduino/sam/cores/sam/USB/USBDesc.h
similarity index 100%
rename from hardware/arduino/sam/cores/sam/USBDesc.h
rename to hardware/arduino/sam/cores/sam/USB/USBDesc.h
diff --git a/hardware/arduino/sam/cores/sam/USB_driver.h b/hardware/arduino/sam/cores/sam/USB/USB_driver.h
similarity index 100%
rename from hardware/arduino/sam/cores/sam/USB_driver.h
rename to hardware/arduino/sam/cores/sam/USB/USB_driver.h