diff --git a/usb/device/targets/TARGET_Template/USBPhyHw.h b/hal/usb/TARGET_Templates/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_Template/USBPhyHw.h
rename to hal/usb/TARGET_Templates/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_Template/USBPhy_template.cpp b/hal/usb/TARGET_Templates/USBPhy_template.cpp
similarity index 100%
rename from usb/device/targets/TARGET_Template/USBPhy_template.cpp
rename to hal/usb/TARGET_Templates/USBPhy_template.cpp
diff --git a/usb/device/targets/TARGET_Cypress/TARGET_PSOC6/USBPhy_PSOC6.cpp b/targets/TARGET_Cypress/TARGET_PSOC6/cy_usb_phy.cpp
similarity index 99%
rename from usb/device/targets/TARGET_Cypress/TARGET_PSOC6/USBPhy_PSOC6.cpp
rename to targets/TARGET_Cypress/TARGET_PSOC6/cy_usb_phy.cpp
index 11850f93aa5..1801ffca250 100644
--- a/usb/device/targets/TARGET_Cypress/TARGET_PSOC6/USBPhy_PSOC6.cpp
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/cy_usb_phy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "USBPhyHw.h"
+#include "cy_usb_phy_hw.h"
 #include "mbed_assert.h"
 
 #if defined(DEVICE_USBDEVICE)
diff --git a/usb/device/targets/TARGET_Cypress/TARGET_PSOC6/USBPhyHw.h b/targets/TARGET_Cypress/TARGET_PSOC6/cy_usb_phy_hw.h
similarity index 100%
rename from usb/device/targets/TARGET_Cypress/TARGET_PSOC6/USBPhyHw.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/cy_usb_phy_hw.h
diff --git a/usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h b/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
similarity index 100%
rename from usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
rename to targets/TARGET_Freescale/USBEndpoints_Kinetis.h
diff --git a/usb/device/targets/TARGET_Freescale/USBPhyHw.h b/targets/TARGET_Freescale/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_Freescale/USBPhyHw.h
rename to targets/TARGET_Freescale/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp b/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
similarity index 100%
rename from usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
rename to targets/TARGET_Freescale/USBPhy_Kinetis.cpp
diff --git a/usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhyHw.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhyHw.h
rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
similarity index 100%
rename from usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
diff --git a/usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h b/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
similarity index 100%
rename from usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
rename to targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
diff --git a/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp b/targets/TARGET_NXP/USBHAL_LPC17.cpp
similarity index 100%
rename from usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
rename to targets/TARGET_NXP/USBHAL_LPC17.cpp
diff --git a/usb/device/targets/TARGET_NXP/USBPhyHw.h b/targets/TARGET_NXP/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_NXP/USBPhyHw.h
rename to targets/TARGET_NXP/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
similarity index 100%
rename from usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
rename to targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
diff --git a/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
rename to targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
similarity index 100%
rename from usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
rename to targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
diff --git a/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
similarity index 100%
rename from usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
rename to targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
diff --git a/usb/device/targets/TARGET_STM/USBEndpoints_STM32.h b/targets/TARGET_STM/USBEndpoints_STM32.h
similarity index 100%
rename from usb/device/targets/TARGET_STM/USBEndpoints_STM32.h
rename to targets/TARGET_STM/USBEndpoints_STM32.h
diff --git a/usb/device/targets/TARGET_STM/USBPhyHw.h b/targets/TARGET_STM/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_STM/USBPhyHw.h
rename to targets/TARGET_STM/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_STM/USBPhy_STM32.cpp b/targets/TARGET_STM/USBPhy_STM32.cpp
similarity index 100%
rename from usb/device/targets/TARGET_STM/USBPhy_STM32.cpp
rename to targets/TARGET_STM/USBPhy_STM32.cpp
diff --git a/usb/device/targets/mbed_lib.json b/usb/device/targets/mbed_lib.json
deleted file mode 100644
index 7e1564fde37..00000000000
--- a/usb/device/targets/mbed_lib.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "usb-device-targets"
-}