diff --git a/drivers/BusIn.h b/drivers/BusIn.h
index 0e7d7f48754..575203343c0 100644
--- a/drivers/BusIn.h
+++ b/drivers/BusIn.h
@@ -23,13 +23,9 @@
 #include "platform/NonCopyable.h"
 
 namespace mbed {
-/** \defgroup drivers-public-api-bus Bus
- * \ingroup drivers-public-api
- */
-
 /**
  * \defgroup drivers_BusIn BusIn class
- * \ingroup drivers-public-api-bus
+ * \ingroup drivers-public-api-gpio
  * @{
  */
 
diff --git a/drivers/BusInOut.h b/drivers/BusInOut.h
index e42a9a52ad4..59bcbce9dc9 100644
--- a/drivers/BusInOut.h
+++ b/drivers/BusInOut.h
@@ -24,7 +24,7 @@
 namespace mbed {
 /**
  * \defgroup drivers_BusInOut BusInOut class
- * \ingroup drivers-public-api-bus
+ * \ingroup drivers-public-api-gpio
  * @{
  */
 
diff --git a/drivers/BusOut.h b/drivers/BusOut.h
index 459a6d78131..f9c2fdcee68 100644
--- a/drivers/BusOut.h
+++ b/drivers/BusOut.h
@@ -24,7 +24,7 @@
 namespace mbed {
 /**
  * \defgroup drivers_BusOut BusOut class
- * \ingroup drivers-public-api-bus
+ * \ingroup drivers-public-api-gpio
  * @{
  */
 
diff --git a/drivers/Ethernet.h b/drivers/Ethernet.h
index ff8cbd2cc24..5a145172613 100644
--- a/drivers/Ethernet.h
+++ b/drivers/Ethernet.h
@@ -32,6 +32,11 @@ namespace mbed {
  */
 
 /** An ethernet interface, to use with the ethernet pins.
+ *
+ * @deprecated
+ * EthInterface is now the preferred way to get an Ethernet object.
+ * Alternatively, use NetworkInterface to get an instance of an appropriate network
+ * interface (WiFi or Ethernet).
  *
  * @note Synchronization level: Not protected
  *
@@ -72,10 +77,12 @@ class
 
     /** Initialize the ethernet interface.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     Ethernet();
 
     /** Powers the hardware down.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     virtual ~Ethernet();
 
     enum Mode {
@@ -96,6 +103,7 @@ class
      *  @returns
      *   The number of written bytes.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     int write(const char *data, int size);
 
     /** Send an outgoing ethernet packet.
@@ -107,6 +115,7 @@ class
      *    0 if the sending was failed,
      *    or the size of the packet successfully sent.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     int send();
 
     /** Receives an arrived ethernet packet.
@@ -119,6 +128,7 @@ class
      *    0 if no ethernet packet is arrived,
      *    or the size of the arrived packet.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     int receive();
 
     /** Read from an received ethernet packet.
@@ -134,12 +144,14 @@ class
      *  Each time read will start reading after the last read byte before.
      *
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     int read(char *data, int size);
 
     /** Gives the ethernet address of the mbed.
      *
      *  @param mac Must be a pointer to a 6 byte char array to copy the ethernet address in.
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     void address(char *mac);
 
     /** Returns if an ethernet link is present or not. It takes a while after Ethernet initialization to show up.
@@ -165,6 +177,7 @@ class
      * }
      * @endcode
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     int link();
 
     /** Sets the speed and duplex parameters of an ethernet link
@@ -177,6 +190,7 @@ class
      *
      *  @param mode the speed and duplex mode to set the link to:
      */
+    MBED_DEPRECATED("The class has been deprecated and will be removed in the future.")
     void set_link(Mode mode);
 };
 
diff --git a/drivers/InterruptIn.h b/drivers/InterruptIn.h
index 7537ce96e82..cb1849a4202 100644
--- a/drivers/InterruptIn.h
+++ b/drivers/InterruptIn.h
@@ -29,13 +29,9 @@
 #include "platform/NonCopyable.h"
 
 namespace mbed {
-/** \defgroup drivers-public-api-interrupt Interrupt
- * \ingroup drivers-public-api
- */
-
 /**
  * \defgroup drivers_InterruptIn InterruptIn class
- * \ingroup drivers-public-api-interrupt
+ * \ingroup drivers-public-api-gpio
  * @{
  */
 
diff --git a/drivers/InterruptManager.h b/drivers/InterruptManager.h
index 08487875a5d..d6ff5c9dd70 100644
--- a/drivers/InterruptManager.h
+++ b/drivers/InterruptManager.h
@@ -18,7 +18,7 @@
 #define MBED_INTERRUPTMANAGER_H
 
 #include "cmsis.h"
-#include "platform/internal/CallChain.h"
+#include "platform/CallChain.h"
 #include "platform/PlatformMutex.h"
 #include "platform/NonCopyable.h"
 #include <string.h>
@@ -26,7 +26,7 @@
 namespace mbed {
 /**
  * \defgroup drivers_InterruptManager InterruptManager class
- * \ingroup drivers-public-api-interrupt
+ * \ingroup drivers-public-api-gpio
  * @{
  */
 
diff --git a/drivers/SerialWireOutput.h b/drivers/SerialWireOutput.h
index 69d607e60dc..6b43094daa4 100644
--- a/drivers/SerialWireOutput.h
+++ b/drivers/SerialWireOutput.h
@@ -27,7 +27,7 @@
 namespace mbed {
 /**
  * \defgroup drivers_SerialWireOutput SerialWireOutput class
- * \ingroup drivers-public-api-uart
+ * \ingroup drivers-public-api
  * @{
  */
 
diff --git a/drivers/Watchdog.h b/drivers/Watchdog.h
index 97f971830e5..699f19864c7 100644
--- a/drivers/Watchdog.h
+++ b/drivers/Watchdog.h
@@ -28,11 +28,9 @@
 #include <cstdio>
 
 namespace mbed {
-/** \ingroup mbed-os-public */
-/** \addtogroup drivers-public-api */
-/** @{*/
 /**
  * \defgroup drivers_Watchdog Watchdog class
+ * \ingroup drivers-public-api
  * @{
  */
 
@@ -154,7 +152,6 @@ class Watchdog : private NonCopyable<Watchdog>  {
     bool _running;
 };
 
-/** @}*/
 /** @}*/
 
 } // namespace mbed
diff --git a/drivers/internal/AsyncOp.h b/drivers/internal/AsyncOp.h
index 507c3f8f424..9e858a102cf 100644
--- a/drivers/internal/AsyncOp.h
+++ b/drivers/internal/AsyncOp.h
@@ -31,9 +31,13 @@
  * \ingroup mbed-os-internal
  */
 
+/** \defgroup drivers-internal-api-usb USB
+ * \ingroup drivers-internal-api
+ */
+
 /**
  * \defgroup drivers_AsyncOp AsyncOp class
- * \ingroup drivers-internal-api
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 class AsyncOp: public LinkEntry {
diff --git a/drivers/internal/ByteBuffer.h b/drivers/internal/ByteBuffer.h
index 6cfd5e994f0..45f2cb19b71 100644
--- a/drivers/internal/ByteBuffer.h
+++ b/drivers/internal/ByteBuffer.h
@@ -22,7 +22,7 @@
 
 /**
  * \defgroup drivers_ByteBuffer ByteBuffer class
- * \ingroup drivers-internal-api
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 class ByteBuffer {
diff --git a/drivers/internal/EndpointResolver.h b/drivers/internal/EndpointResolver.h
index a3c7b7f4754..7ea13f4287c 100644
--- a/drivers/internal/EndpointResolver.h
+++ b/drivers/internal/EndpointResolver.h
@@ -22,7 +22,7 @@
 
 /**
  * \defgroup drivers_EndpointResolver EndpointResolver class
- * \ingroup drivers-internal-api
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 
diff --git a/drivers/internal/LinkEntry.h b/drivers/internal/LinkEntry.h
index f0936074526..f3fc9475716 100644
--- a/drivers/internal/LinkEntry.h
+++ b/drivers/internal/LinkEntry.h
@@ -22,7 +22,7 @@
 
 /**
  * \defgroup drivers_LinkEntry LinkEntry class
- * \ingroup drivers-internal-api-list
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 class LinkEntry {
diff --git a/drivers/internal/LinkedList.h b/drivers/internal/LinkedList.h
index fe84a28dfcc..23478619100 100644
--- a/drivers/internal/LinkedList.h
+++ b/drivers/internal/LinkedList.h
@@ -21,13 +21,9 @@
 #include "LinkEntry.h"
 #include "LinkedListBase.h"
 
-/** \defgroup drivers-internal-api-list List
- * \ingroup drivers-internal-api
- */
-
 /**
  * \defgroup drivers_LinkedList LinkedList class
- * \ingroup drivers-internal-api-list
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 template<class T>
diff --git a/drivers/internal/LinkedListBase.h b/drivers/internal/LinkedListBase.h
index 99eebe7730b..27d86103d98 100644
--- a/drivers/internal/LinkedListBase.h
+++ b/drivers/internal/LinkedListBase.h
@@ -22,7 +22,7 @@
 
 /**
  * \defgroup drivers_LinkedListBase LinkedListBase class
- * \ingroup drivers-internal-api-list
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 class LinkedListBase {
diff --git a/drivers/internal/MIDIMessage.h b/drivers/internal/MIDIMessage.h
index 490a3952622..14b08a1e2b5 100644
--- a/drivers/internal/MIDIMessage.h
+++ b/drivers/internal/MIDIMessage.h
@@ -43,7 +43,7 @@
 
 /**
  * \defgroup drivers_MIDIMessage MIDIMessage class
- * \ingroup drivers-internal-api
+ * \ingroup drivers-internal-usb
  * @{
  */
 
diff --git a/drivers/internal/OperationList.h b/drivers/internal/OperationList.h
index bbb543a9f2e..9f5e7563cba 100644
--- a/drivers/internal/OperationList.h
+++ b/drivers/internal/OperationList.h
@@ -21,6 +21,11 @@
 #include "OperationListBase.h"
 #include "AsyncOp.h"
 
+/**
+ * \defgroup drivers_OperationList OperationList class
+ * \ingroup drivers-internal-api-usb
+ * @{
+ */
 template<class T>
 class OperationList: public OperationListBase {
 public:
@@ -84,4 +89,6 @@ class OperationList: public OperationListBase {
 
 };
 
+/** @}*/
+
 #endif
diff --git a/drivers/internal/OperationListBase.h b/drivers/internal/OperationListBase.h
index 0e973aa28a7..e964cc961e9 100644
--- a/drivers/internal/OperationListBase.h
+++ b/drivers/internal/OperationListBase.h
@@ -22,6 +22,11 @@
 
 class AsyncOp;
 
+/**
+ * \defgroup drivers_OperationListBase OperationListBase class
+ * \ingroup drivers-internal-api-usb
+ * @{
+ */
 class OperationListBase {
 public:
 
@@ -93,4 +98,6 @@ class OperationListBase {
     LinkedListBase _list;
 };
 
+/** @}*/
+
 #endif
diff --git a/drivers/internal/PolledQueue.h b/drivers/internal/PolledQueue.h
index f7dd1f4069c..d8964218b03 100644
--- a/drivers/internal/PolledQueue.h
+++ b/drivers/internal/PolledQueue.h
@@ -22,15 +22,9 @@
 #include "platform/Callback.h"
 #include "LinkedList.h"
 namespace events {
-/** \addtogroup events-internal-api Events
- * \ingroup mbed-os-internal
- * @{
- */
-
-
 /**
- * \defgroup events_PolledQueue PolledQueue class
- * \ingroup events-internal-api
+ * \defgroup drivers_PolledQueue PolledQueue class
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 
@@ -75,7 +69,6 @@ class PolledQueue: public TaskQueue {
 
 };
 
-/** @}*/
 /** @}*/
 
 }
diff --git a/drivers/internal/Task.h b/drivers/internal/Task.h
index 04b48cb38a8..be2c932563c 100644
--- a/drivers/internal/Task.h
+++ b/drivers/internal/Task.h
@@ -24,8 +24,7 @@
 #include "platform/Callback.h"
 
 namespace events {
-/** \addtogroup events-internal-api
- * \ingroup mbed-os-internal
+/** \addtogroup drivers-internal-api-usb
  * @{
  */
 
diff --git a/drivers/internal/TaskBase.h b/drivers/internal/TaskBase.h
index 51ae547009c..e8a38b4adf7 100644
--- a/drivers/internal/TaskBase.h
+++ b/drivers/internal/TaskBase.h
@@ -31,8 +31,8 @@ namespace events {
 class TaskQueue;
 
 /**
- * \defgroup events_TaskBase TaskBase class
- * \ingroup events-internal-api
+ * \defgroup drivers_TaskBase TaskBase class
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 
diff --git a/drivers/internal/TaskQueue.h b/drivers/internal/TaskQueue.h
index dbacef3b753..530a9204406 100644
--- a/drivers/internal/TaskQueue.h
+++ b/drivers/internal/TaskQueue.h
@@ -27,8 +27,8 @@
 namespace events {
 
 /**
- * \defgroup events_TaskQueue TaskQueue class
- * \ingroup events-internal-api
+ * \defgroup drivers_TaskQueue TaskQueue class
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 
diff --git a/drivers/internal/USBDevice.h b/drivers/internal/USBDevice.h
index d0de70cdc8f..91a603e6617 100644
--- a/drivers/internal/USBDevice.h
+++ b/drivers/internal/USBDevice.h
@@ -23,11 +23,9 @@
 #include "USBPhy.h"
 #include "mbed_critical.h"
 
-/** \ingroup drivers */
-/** \addtogroup drivers-internal-api */
-/** @{*/
 /**
  * \defgroup drivers_USBDevice USBDevice class
+ * \ingroup drivers-internal-api-usb
  * @{
  */
 
@@ -612,7 +610,6 @@ class USBDevice: public  USBPhyEvents {
     uint32_t _locked;
 };
 
-/** @}*/
 /** @}*/
 
 #endif
diff --git a/drivers/source/usb/mbed_lib.json b/drivers/source/usb/mbed_lib.json
index dc0cd0d8b62..32a28d417d7 100644
--- a/drivers/source/usb/mbed_lib.json
+++ b/drivers/source/usb/mbed_lib.json
@@ -1,3 +1,3 @@
 {
-    "name": "usb"
+    "name": "drivers-usb"
 }
diff --git a/events/internal/equeue_platform.h b/events/internal/equeue_platform.h
index 18e986a8efc..aebd70a3647 100644
--- a/events/internal/equeue_platform.h
+++ b/events/internal/equeue_platform.h
@@ -25,12 +25,6 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
-/**
- * \addtogroup events-internal-api Events
- * \ingroup mbed-os-internal
- * @{
- */
-
 // Currently supported platforms
 //
 // Uncomment to select a supported platform or reimplement this file
@@ -153,8 +147,6 @@ void equeue_sema_destroy(equeue_sema_t *sema);
 void equeue_sema_signal(equeue_sema_t *sema);
 bool equeue_sema_wait(equeue_sema_t *sema, int ms);
 
-/** @}*/
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/events/mbed_events.h b/events/mbed_events.h
index fdcbcae0b0e..6243c7ab21d 100644
--- a/events/mbed_events.h
+++ b/events/mbed_events.h
@@ -23,8 +23,7 @@
 
 #include "events/mbed_shared_queues.h"
 
-/** \ingroup mbed-os-internal */
-/** \addtogroup events-internal-api */
+/** \addtogroup events-public-api */
 /** @{*/
 #ifndef MBED_NO_GLOBAL_USING_DIRECTIVE
 using namespace events;
diff --git a/features/device_key/source/DeviceKey.h b/features/device_key/source/DeviceKey.h
index 861d1592a0c..9d17aaf1510 100644
--- a/features/device_key/source/DeviceKey.h
+++ b/features/device_key/source/DeviceKey.h
@@ -32,7 +32,11 @@
 #if (DEVICEKEY_ENABLED) || defined(DOXYGEN_ONLY)
 
 namespace mbed {
-/** \addtogroup device-key Device Key */
+/** \addtogroup device-security Device Key
+ * \ingroup mbed-os-public
+ * @{
+ */
+
 
 #define DEVICE_KEY_16BYTE 16
 #define DEVICE_KEY_32BYTE 32
@@ -58,7 +62,11 @@ enum DeviceKeyStatus {
  * @note Synchronization level: Thread safe
  * @ingroup device-key
  */
-
+/**
+ * \defgroup device-security_DeviceKey DeviceKey class
+ * \addtogroup device-security
+ * @{
+ */
 class DeviceKey : private mbed::NonCopyable<DeviceKey> {
 public:
 
@@ -143,6 +151,8 @@ class DeviceKey : private mbed::NonCopyable<DeviceKey> {
     int generate_key_by_random(uint32_t *output, size_t size);
 
 };
+
+/** @}*/
 /** @}*/
 
 }
diff --git a/platform/internal/CallChain.h b/platform/CallChain.h
similarity index 98%
rename from platform/internal/CallChain.h
rename to platform/CallChain.h
index e1bfce06b7a..cd9e67af869 100644
--- a/platform/internal/CallChain.h
+++ b/platform/CallChain.h
@@ -28,11 +28,9 @@ namespace mbed {
 typedef Callback<void()> *pFunctionPointer_t;
 class CallChainLink;
 
-/** \ingroup mbed-os-internal */
-/** \addtogroup platform-internal-api Platform */
-/** @{*/
 /**
  * \defgroup platform_CallChain CallChain class
+ * \ingroup platform-public-api
  * @{
  */
 
@@ -260,8 +258,6 @@ class
 
 /**@}*/
 
-/**@}*/
-
 } // namespace mbed
 
 #endif
diff --git a/platform/internal/CThunkBase.h b/platform/internal/CThunkBase.h
index 918924d9058..ef0f326646f 100644
--- a/platform/internal/CThunkBase.h
+++ b/platform/internal/CThunkBase.h
@@ -18,14 +18,16 @@
 #ifndef __CTHUNK_BASE_H__
 #define __CTHUNK_BASE_H__
 
+/** \addtogroup platform-internal-api Platform
+ * \ingroup mbed-os-internal
+ */
+
 /* IRQ/Exception compatible thunk entry function */
 typedef void (*CThunkEntry)(void);
 
-/** \ingroup mbed-os-internal */
-/** \addtogroup platform-internal-api */
-/** @{*/
 /**
  * \defgroup platform_CThunkBase CThunkBase class
+ * \ingroup platform-internal-api
  * @{
  */
 class CThunkBase {
@@ -83,6 +85,4 @@ class CThunkBase {
 
 /**@}*/
 
-/**@}*/
-
 #endif/*__CTHUNK_BASE_H__*/
diff --git a/platform/source/CallChain.cpp b/platform/source/CallChain.cpp
index 5c892d78200..90d00acd02c 100644
--- a/platform/source/CallChain.cpp
+++ b/platform/source/CallChain.cpp
@@ -21,7 +21,7 @@
 #undef MBED_DEPRECATED_SINCE
 #define MBED_DEPRECATED_SINCE(...)
 
-#include "platform/internal/CallChain.h"
+#include "platform/CallChain.h"
 #include "cmsis.h"
 #include "platform/mbed_critical.h"
 
diff --git a/targets/TARGET_Freescale/USBEndpoints_Kinetis.h b/usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
similarity index 100%
rename from targets/TARGET_Freescale/USBEndpoints_Kinetis.h
rename to usb/device/targets/TARGET_Freescale/USBEndpoints_Kinetis.h
diff --git a/targets/TARGET_Freescale/USBPhyHw.h b/usb/device/targets/TARGET_Freescale/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_Freescale/USBPhyHw.h
rename to usb/device/targets/TARGET_Freescale/USBPhyHw.h
diff --git a/targets/TARGET_Freescale/USBPhy_Kinetis.cpp b/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
similarity index 100%
rename from targets/TARGET_Freescale/USBPhy_Kinetis.cpp
rename to usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhyHw.h b/usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhyHw.h
rename to usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhyHw.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp b/usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
rename to usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
diff --git a/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h b/usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
similarity index 100%
rename from targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
rename to usb/device/targets/TARGET_NXP/USBEndpoints_LPC17_LPC23.h
diff --git a/targets/TARGET_NXP/USBHAL_LPC17.cpp b/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
similarity index 100%
rename from targets/TARGET_NXP/USBHAL_LPC17.cpp
rename to usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
diff --git a/targets/TARGET_NXP/USBPhyHw.h b/usb/device/targets/TARGET_NXP/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_NXP/USBPhyHw.h
rename to usb/device/targets/TARGET_NXP/USBPhyHw.h
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h b/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
similarity index 100%
rename from targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
rename to usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBEndpoints_RZ_A1.h
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h b/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
rename to usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhyHw.h
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp b/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
similarity index 100%
rename from targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
rename to usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h b/usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
similarity index 100%
rename from targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
rename to usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1_Def.h
diff --git a/targets/TARGET_STM/USBEndpoints_STM32.h b/usb/device/targets/TARGET_STM/USBEndpoints_STM32.h
similarity index 100%
rename from targets/TARGET_STM/USBEndpoints_STM32.h
rename to usb/device/targets/TARGET_STM/USBEndpoints_STM32.h
diff --git a/targets/TARGET_STM/USBPhyHw.h b/usb/device/targets/TARGET_STM/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_STM/USBPhyHw.h
rename to usb/device/targets/TARGET_STM/USBPhyHw.h
diff --git a/targets/TARGET_STM/USBPhy_STM32.cpp b/usb/device/targets/TARGET_STM/USBPhy_STM32.cpp
similarity index 100%
rename from targets/TARGET_STM/USBPhy_STM32.cpp
rename to usb/device/targets/TARGET_STM/USBPhy_STM32.cpp
diff --git a/targets/TARGET_Template/USBPhyHw.h b/usb/device/targets/TARGET_Template/USBPhyHw.h
similarity index 100%
rename from targets/TARGET_Template/USBPhyHw.h
rename to usb/device/targets/TARGET_Template/USBPhyHw.h
diff --git a/targets/TARGET_Template/USBPhy_template.cpp b/usb/device/targets/TARGET_Template/USBPhy_template.cpp
similarity index 100%
rename from targets/TARGET_Template/USBPhy_template.cpp
rename to usb/device/targets/TARGET_Template/USBPhy_template.cpp
diff --git a/usb/device/targets/mbed_lib.json b/usb/device/targets/mbed_lib.json
new file mode 100644
index 00000000000..7e1564fde37
--- /dev/null
+++ b/usb/device/targets/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "usb-device-targets"
+}