diff --git a/platform/USBPhy.h b/usb/device/USBPhy/USBPhy.h
similarity index 100%
rename from platform/USBPhy.h
rename to usb/device/USBPhy/USBPhy.h
diff --git a/platform/USBPhyEvents.h b/usb/device/USBPhy/USBPhyEvents.h
similarity index 100%
rename from platform/USBPhyEvents.h
rename to usb/device/USBPhy/USBPhyEvents.h
diff --git a/platform/USBPhyTypes.h b/usb/device/USBPhy/USBPhyTypes.h
similarity index 100%
rename from platform/USBPhyTypes.h
rename to usb/device/USBPhy/USBPhyTypes.h
diff --git a/hal/mbed_usb_phy.cpp b/usb/device/hal/mbed_usb_phy.cpp
similarity index 100%
rename from hal/mbed_usb_phy.cpp
rename to usb/device/hal/mbed_usb_phy.cpp
diff --git a/hal/usb_phy_api.h b/usb/device/hal/usb_phy_api.h
similarity index 100%
rename from hal/usb_phy_api.h
rename to usb/device/hal/usb_phy_api.h
diff --git a/targets/TARGET_Freescale/usb/USBEndpoints_Kinetis.h b/usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
similarity index 100%
rename from targets/TARGET_Freescale/usb/USBEndpoints_Kinetis.h
rename to usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
diff --git a/targets/TARGET_Freescale/usb/USBPhyHw.h b/usb/device/targets/TARGET_Freescale/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_Freescale/usb/USBPhyHw.h
rename to usb/device/targets/TARGET_Freescale/USBPhyHw.h
diff --git a/targets/TARGET_Freescale/usb/USBPhy_Kinetis.cpp b/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
similarity index 100%
rename from targets/TARGET_Freescale/usb/USBPhy_Kinetis.cpp
rename to usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
diff --git a/targets/TARGET_NXP/TARGET_LPC176X/usb/USBEndpoints_LPC17_LPC23.h b/usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
similarity index 100%
rename from targets/TARGET_NXP/TARGET_LPC176X/usb/USBEndpoints_LPC17_LPC23.h
rename to usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
diff --git a/targets/TARGET_NXP/TARGET_LPC176X/usb/USBHAL_LPC17.cpp b/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
similarity index 100%
rename from targets/TARGET_NXP/TARGET_LPC176X/usb/USBHAL_LPC17.cpp
rename to usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
diff --git a/targets/TARGET_NXP/TARGET_LPC176X/usb/USBPhyHw.h b/usb/device/targets/TARGET_NXP/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_NXP/TARGET_LPC176X/usb/USBPhyHw.h
rename to usb/device/targets/TARGET_NXP/USBPhyHw.h