diff --git a/.travis.yml b/.travis.yml
index 31b754d8cbe..23c3ab8c631 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+# Copyright (c) 2013-2019 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -222,7 +222,7 @@ matrix:
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
-          rm -r rtos usb features/cellular features/netsocket features/nanostack \
+          rm -r rtos drivers/source/usb features/cellular features/netsocket features/nanostack \
             features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
diff --git a/TESTS/usb_device/hid/main.cpp b/TESTS/usb_device/hid/main.cpp
index 12a8d2b4d04..27b100fa7b0 100644
--- a/TESTS/usb_device/hid/main.cpp
+++ b/TESTS/usb_device/hid/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/TESTS/usb_device/serial/main.cpp b/TESTS/usb_device/serial/main.cpp
index 3a75c96da84..0b10de06ea5 100644
--- a/TESTS/usb_device/serial/main.cpp
+++ b/TESTS/usb_device/serial/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/usb/device/USBAudio/USBAudio.h b/drivers/USBAudio.h
similarity index 98%
rename from usb/device/USBAudio/USBAudio.h
rename to drivers/USBAudio.h
index 8e69519f073..846e47b2418 100644
--- a/usb/device/USBAudio/USBAudio.h
+++ b/drivers/USBAudio.h
@@ -28,6 +28,15 @@
 #include "ByteBuffer.h"
 #include "rtos/EventFlags.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBAudio USBAudio class
+ * @{
+ */
+
+
 /**
 * USBAudio example
 *
@@ -373,4 +382,7 @@ class USBAudio: protected USBDevice {
 
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBSerial/USBCDC.h b/drivers/USBCDC.h
similarity index 97%
rename from usb/device/USBSerial/USBCDC.h
rename to drivers/USBCDC.h
index 7b57a8dd652..0c2044ed509 100644
--- a/usb/device/USBSerial/USBCDC.h
+++ b/drivers/USBCDC.h
@@ -27,6 +27,14 @@
 
 class AsyncOp;
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBCDC USBCDC class
+ * @{
+ */
+
 class USBCDC: public USBDevice {
 public:
 
@@ -224,4 +232,7 @@ class USBCDC: public USBDevice {
     uint32_t _rx_size;
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBCDC_ECM/USBCDC_ECM.h b/drivers/USBCDC_ECM.h
similarity index 97%
rename from usb/device/USBCDC_ECM/USBCDC_ECM.h
rename to drivers/USBCDC_ECM.h
index 323c4405f67..4502ef5d715 100644
--- a/usb/device/USBCDC_ECM/USBCDC_ECM.h
+++ b/drivers/USBCDC_ECM.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,14 @@
 #define PACKET_TYPE_BROADCAST       (1<<3)
 #define PACKET_TYPE_MULTICAST       (1<<4)
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBCDC_ECM USBCDC_ECM class
+ * @{
+ */
+
 class USBCDC_ECM: public USBDevice {
 public:
 
@@ -267,4 +275,7 @@ class USBCDC_ECM: public USBDevice {
     void _notify_connect();
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBHID/USBHID.h b/drivers/USBHID.h
similarity index 98%
rename from usb/device/USBHID/USBHID.h
rename to drivers/USBHID.h
index 85380e4148d..8723a648804 100644
--- a/usb/device/USBHID/USBHID.h
+++ b/drivers/USBHID.h
@@ -26,6 +26,13 @@
 #include "OperationList.h"
 
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBHID USBHID class
+ * @{
+ */
 
 /**
  * USBHID example
@@ -268,4 +275,7 @@ class USBHID: public USBDevice {
 
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBHID/USBKeyboard.h b/drivers/USBKeyboard.h
similarity index 96%
rename from usb/device/USBHID/USBKeyboard.h
rename to drivers/USBKeyboard.h
index ca24255780f..70777abe3c2 100644
--- a/usb/device/USBHID/USBKeyboard.h
+++ b/drivers/USBKeyboard.h
@@ -74,6 +74,14 @@ enum FUNCTION_KEY {
     UP_ARROW,           /* Up arrow */
 };
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBKeyboard USBKeyboard class
+ * @{
+ */
+
 /**
  * USBKeyboard example
  * @code
@@ -181,7 +189,7 @@ class USBKeyboard: public USBHID, public mbed::Stream {
     virtual void report_rx();
 
     /**
-    * Read status of lock keys. Useful to switch-on/off leds according to key pressed. Only the first three bits of the result is important:
+    * Read status of lock keys. Useful to switch-on/off LEDs according to key pressed. Only the first three bits of the result is important:
     *   - First bit: NUM_LOCK
     *   - Second bit: CAPS_LOCK
     *   - Third bit: SCROLL_LOCK
@@ -209,4 +217,7 @@ class USBKeyboard: public USBHID, public mbed::Stream {
 
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBMIDI/USBMIDI.h b/drivers/USBMIDI.h
similarity index 97%
rename from usb/device/USBMIDI/USBMIDI.h
rename to drivers/USBMIDI.h
index 2e6e5659cc7..e1872bb802c 100644
--- a/usb/device/USBMIDI/USBMIDI.h
+++ b/drivers/USBMIDI.h
@@ -30,6 +30,14 @@
 
 #define DEFAULT_CONFIGURATION (1)
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBMIDI USBMIDI class
+ * @{
+ */
+
 /**
 * USBMIDI example
 *
@@ -182,4 +190,7 @@ class USBMIDI: public USBDevice {
     bool _next_message();
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBMSD/USBMSD.h b/drivers/USBMSD.h
similarity index 96%
rename from usb/device/USBMSD/USBMSD.h
rename to drivers/USBMSD.h
index 2a22cc0c1ff..ce5e3b7244d 100644
--- a/usb/device/USBMSD/USBMSD.h
+++ b/drivers/USBMSD.h
@@ -22,19 +22,27 @@
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
 #include "platform/Callback.h"
-#include "events/PolledQueue.h"
-#include "events/Task.h"
+#include "drivers/internal/PolledQueue.h"
+#include "drivers/internal/Task.h"
 #include "BlockDevice.h"
 #include "Mutex.h"
 
 #include "USBDevice.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBMSD USBMSD class
+ * @{
+ */
+
 /**
  * USBMSD class: generic class in order to use all kinds of blocks storage chip
  *
  * Introduction
  *
- * USBMSD implements the MSD protocol. It permits to access a block device (flash, sdcard,...)
+ * USBMSD implements the MSD protocol. It permits to access a block device (flash, SD Card,...)
  * from a computer over USB.
  *
  * @code
@@ -304,4 +312,7 @@ class USBMSD: public USBDevice {
     void fail();
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBHID/USBMouse.h b/drivers/USBMouse.h
similarity index 97%
rename from usb/device/USBHID/USBMouse.h
rename to drivers/USBMouse.h
index 0e4edcfe993..b4450025ef1 100644
--- a/usb/device/USBHID/USBMouse.h
+++ b/drivers/USBMouse.h
@@ -49,6 +49,14 @@ enum MOUSE_TYPE {
     REL_MOUSE,
 };
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBMouse USBMouse class
+ * @{
+ */
+
 /**
  *
  * USBMouse example
@@ -232,4 +240,7 @@ class USBMouse: public USBHID {
     bool mouse_send(int8_t x, int8_t y, uint8_t buttons, int8_t z);
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBHID/USBMouseKeyboard.h b/drivers/USBMouseKeyboard.h
similarity index 96%
rename from usb/device/USBHID/USBMouseKeyboard.h
rename to drivers/USBMouseKeyboard.h
index 77d233331c3..f54238724a0 100644
--- a/usb/device/USBHID/USBMouseKeyboard.h
+++ b/drivers/USBMouseKeyboard.h
@@ -28,6 +28,14 @@
 #include "USBHID.h"
 #include "PlatformMutex.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBMouseKeyboard USBMouseKeyboard class
+ * @{
+ */
+
 /**
  * USBMouseKeyboard example
  * @code
@@ -207,7 +215,7 @@ class USBMouseKeyboard: public USBHID, public mbed::Stream {
     bool media_control(MEDIA_KEY key);
 
     /**
-    * Read status of lock keys. Useful to switch-on/off leds according to key pressed. Only the first three bits of the result is important:
+    * Read status of lock keys. Useful to switch-on/off LEDs according to key pressed. Only the first three bits of the result is important:
     *   - First bit: NUM_LOCK
     *   - Second bit: CAPS_LOCK
     *   - Third bit: SCROLL_LOCK
@@ -243,4 +251,7 @@ class USBMouseKeyboard: public USBHID, public mbed::Stream {
     virtual int _getc();
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBSerial/USBSerial.h b/drivers/USBSerial.h
similarity index 97%
rename from usb/device/USBSerial/USBSerial.h
rename to drivers/USBSerial.h
index b0bf2f18d77..f7e0f380355 100644
--- a/usb/device/USBSerial/USBSerial.h
+++ b/drivers/USBSerial.h
@@ -22,6 +22,14 @@
 #include "Stream.h"
 #include "Callback.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-public-api */
+/** @{*/
+/**
+ * \defgroup drivers_USBSerial USBSerial class
+ * @{
+ */
+
 /**
 * USBSerial example
 *
@@ -216,4 +224,7 @@ class USBSerial: public USBCDC, public mbed::Stream {
     void (*_settings_changed_callback)(int baud, int bits, int parity, int stop);
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/utilities/AsyncOp.h b/drivers/internal/AsyncOp.h
similarity index 94%
rename from usb/device/utilities/AsyncOp.h
rename to drivers/internal/AsyncOp.h
index 625d6eddf13..a9a2f1d9bee 100644
--- a/usb/device/utilities/AsyncOp.h
+++ b/drivers/internal/AsyncOp.h
@@ -25,6 +25,13 @@
 #include "LinkEntry.h"
 #include "OperationListBase.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_AsyncOp AsyncOp class
+ * @{
+ */
 class AsyncOp: public LinkEntry {
 public:
 
@@ -109,4 +116,7 @@ class AsyncOp: public LinkEntry {
     static void _host_unlock(rtos::Mutex *host_mutex);
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/utilities/ByteBuffer.h b/drivers/internal/ByteBuffer.h
similarity index 94%
rename from usb/device/utilities/ByteBuffer.h
rename to drivers/internal/ByteBuffer.h
index 93514508708..e39488767ff 100644
--- a/usb/device/utilities/ByteBuffer.h
+++ b/drivers/internal/ByteBuffer.h
@@ -20,6 +20,13 @@
 
 #include <stdint.h>
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_ByteBuffer ByteBuffer class
+ * @{
+ */
 class ByteBuffer {
 public:
 
@@ -116,5 +123,7 @@ class ByteBuffer {
     uint8_t *_buf;
 };
 
+/** @}*/
+/** @}*/
 
 #endif
diff --git a/usb/device/USBDevice/EndpointResolver.h b/drivers/internal/EndpointResolver.h
similarity index 93%
rename from usb/device/USBDevice/EndpointResolver.h
rename to drivers/internal/EndpointResolver.h
index 53e241f020a..212b4f23553 100644
--- a/usb/device/USBDevice/EndpointResolver.h
+++ b/drivers/internal/EndpointResolver.h
@@ -29,7 +29,14 @@
  * to check if the device has enough resources for the
  * given configuration.
  *
- * @ingroup usb_device_core
+ */
+
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_EndpointResolver EndpointResolver class
+ * @{
  */
 class EndpointResolver {
 public:
@@ -89,5 +96,7 @@ class EndpointResolver {
     bool _valid;
 };
 
+/** @}*/
+/** @}*/
 
 #endif
diff --git a/usb/device/utilities/LinkEntry.h b/drivers/internal/LinkEntry.h
similarity index 85%
rename from usb/device/utilities/LinkEntry.h
rename to drivers/internal/LinkEntry.h
index dadf07ddb67..6cbd8e1c30b 100644
--- a/usb/device/utilities/LinkEntry.h
+++ b/drivers/internal/LinkEntry.h
@@ -20,6 +20,13 @@
 
 #include <cstddef>
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_LinkEntry LinkEntry class
+ * @{
+ */
 class LinkEntry {
 public:
     LinkEntry(): _next(NULL)
@@ -32,5 +39,7 @@ class LinkEntry {
     LinkEntry *_next;
 };
 
+/** @}*/
+/** @}*/
 
 #endif
diff --git a/usb/device/utilities/LinkedList.h b/drivers/internal/LinkedList.h
similarity index 91%
rename from usb/device/utilities/LinkedList.h
rename to drivers/internal/LinkedList.h
index 03e7cff592f..cc1f6131335 100644
--- a/usb/device/utilities/LinkedList.h
+++ b/drivers/internal/LinkedList.h
@@ -21,6 +21,13 @@
 #include "LinkEntry.h"
 #include "LinkedListBase.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_LinkedList LinkedList class
+ * @{
+ */
 template<class T>
 class LinkedList: public LinkedListBase {
 public:
@@ -58,4 +65,7 @@ class LinkedList: public LinkedListBase {
     }
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/utilities/LinkedListBase.h b/drivers/internal/LinkedListBase.h
similarity index 90%
rename from usb/device/utilities/LinkedListBase.h
rename to drivers/internal/LinkedListBase.h
index 63dab981c91..ed7df8d1cb3 100644
--- a/usb/device/utilities/LinkedListBase.h
+++ b/drivers/internal/LinkedListBase.h
@@ -20,6 +20,13 @@
 
 #include "LinkEntry.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_LinkedListBase LinkedListBase class
+ * @{
+ */
 class LinkedListBase {
 public:
     LinkedListBase();
@@ -58,4 +65,7 @@ class LinkedListBase {
     LinkEntry *_tail;
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBMIDI/MIDIMessage.h b/drivers/internal/MIDIMessage.h
similarity index 98%
rename from usb/device/USBMIDI/MIDIMessage.h
rename to drivers/internal/MIDIMessage.h
index 74e8d25bd63..5e9c502dde4 100644
--- a/usb/device/USBMIDI/MIDIMessage.h
+++ b/drivers/internal/MIDIMessage.h
@@ -40,6 +40,14 @@
 
 #define CABLE_NUM (0<<4)
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
+/**
+ * \defgroup drivers_MIDIMessage MIDIMessage class
+ * @{
+ */
+
 /** A MIDI message container */
 class MIDIMessage {
 public:
@@ -472,4 +480,7 @@ class MIDIMessage {
     uint16_t length;
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/utilities/OperationList.h b/drivers/internal/OperationList.h
similarity index 97%
rename from usb/device/utilities/OperationList.h
rename to drivers/internal/OperationList.h
index 9f82c6b2ee7..bbb543a9f2e 100644
--- a/usb/device/utilities/OperationList.h
+++ b/drivers/internal/OperationList.h
@@ -75,7 +75,7 @@ class OperationList: public OperationListBase {
      * Additionally process() must be called on this object
      * if there are still elements in the list.
      *
-     * @return The async op at the head of the list
+     * @return The asynchronous op at the head of the list
      */
     T *dequeue_raw()
     {
diff --git a/usb/device/utilities/OperationListBase.h b/drivers/internal/OperationListBase.h
similarity index 95%
rename from usb/device/utilities/OperationListBase.h
rename to drivers/internal/OperationListBase.h
index 8c7bd6897cd..0e973aa28a7 100644
--- a/usb/device/utilities/OperationListBase.h
+++ b/drivers/internal/OperationListBase.h
@@ -18,8 +18,7 @@
 #ifndef MBED_OPERATION_LIST_BASE_H
 #define MBED_OPERATION_LIST_BASE_H
 
-#include "LinkedListBase.h"
-#include "Mutex.h"
+#include "drivers/internal/LinkedListBase.h"
 
 class AsyncOp;
 
@@ -72,7 +71,7 @@ class OperationListBase {
      * Additionally process() must be called on this object
      * if there are still elements in the list.
      *
-     * @return The async op at the head of the list
+     * @return The asynchronous op at the head of the list
      */
     AsyncOp *dequeue_raw();
 
diff --git a/usb/device/utilities/events/PolledQueue.h b/drivers/internal/PolledQueue.h
similarity index 97%
rename from usb/device/utilities/events/PolledQueue.h
rename to drivers/internal/PolledQueue.h
index a2bfc0ac78c..47d049c638b 100644
--- a/usb/device/utilities/events/PolledQueue.h
+++ b/drivers/internal/PolledQueue.h
@@ -18,7 +18,7 @@
 #ifndef POLLED_QUEUE_H
 #define POLLED_QUEUE_H
 
-#include "events/TaskQueue.h"
+#include "drivers/internal/TaskQueue.h"
 #include "platform/Callback.h"
 #include "LinkedList.h"
 namespace events {
diff --git a/usb/device/utilities/events/Task.h b/drivers/internal/Task.h
similarity index 99%
rename from usb/device/utilities/events/Task.h
rename to drivers/internal/Task.h
index b1e2a517fa1..e4843582533 100644
--- a/usb/device/utilities/events/Task.h
+++ b/drivers/internal/Task.h
@@ -19,7 +19,7 @@
 #define MBED_TASK_H
 
 #include "events/EventQueue.h"
-#include "events/TaskBase.h"
+#include "drivers/internal/TaskBase.h"
 #include "platform/mbed_assert.h"
 #include "platform/Callback.h"
 
diff --git a/usb/device/utilities/events/TaskBase.h b/drivers/internal/TaskBase.h
similarity index 100%
rename from usb/device/utilities/events/TaskBase.h
rename to drivers/internal/TaskBase.h
diff --git a/usb/device/utilities/events/TaskQueue.h b/drivers/internal/TaskQueue.h
similarity index 97%
rename from usb/device/utilities/events/TaskQueue.h
rename to drivers/internal/TaskQueue.h
index 8fae4e676bf..cfdf488153d 100644
--- a/usb/device/utilities/events/TaskQueue.h
+++ b/drivers/internal/TaskQueue.h
@@ -18,7 +18,7 @@
 #ifndef TASK_QUEUE_H
 #define TASK_QUEUE_H
 
-#include "events/TaskBase.h"
+#include "drivers/internal/TaskBase.h"
 #include "platform/Callback.h"
 #include "mbed_critical.h"
 
@@ -68,7 +68,7 @@ class TaskQueue {
      *
      *  Cancels the given event so the event's memory can be reused.
      *
-     *  The cancel function is irq safe.
+     *  The cancel function is IRQ safe.
      *
      *  If called while the event queue's dispatch loop is active, the cancel
      *  function does not guarantee that the event will not execute after it
diff --git a/usb/device/USBAudio/USBAudio_Types.h b/drivers/internal/USBAudio_Types.h
similarity index 100%
rename from usb/device/USBAudio/USBAudio_Types.h
rename to drivers/internal/USBAudio_Types.h
diff --git a/usb/device/USBDevice/USBDescriptor.h b/drivers/internal/USBDescriptor.h
similarity index 100%
rename from usb/device/USBDevice/USBDescriptor.h
rename to drivers/internal/USBDescriptor.h
diff --git a/usb/device/USBDevice/USBDevice.h b/drivers/internal/USBDevice.h
similarity index 98%
rename from usb/device/USBDevice/USBDevice.h
rename to drivers/internal/USBDevice.h
index 01e25141411..d0de70cdc8f 100644
--- a/usb/device/USBDevice/USBDevice.h
+++ b/drivers/internal/USBDevice.h
@@ -23,23 +23,18 @@
 #include "USBPhy.h"
 #include "mbed_critical.h"
 
+/** \ingroup drivers */
+/** \addtogroup drivers-internal-api */
+/** @{*/
 /**
- * \defgroup usb_device USB Device
- *
- */
-
-/**
- * \defgroup usb_device_core Core
- *
- * @ingroup usb_device
+ * \defgroup drivers_USBDevice USBDevice class
+ * @{
  */
 
 /**
  * Core USB Device driver
  *
  * USB driver which wraps and provides synchronization for a USBPhy object.
- *
- * @ingroup usb_device_core
  */
 class USBDevice: public  USBPhyEvents {
 public:
@@ -189,13 +184,13 @@ class USBDevice: public  USBPhyEvents {
     void endpoint_stall(usb_ep_t endpoint);
 
     /**
-    * Unstall an endpoint
+    * Un-stall an endpoint
     *
-    * Unstalling an endpoint resets data toggle back to DATA0.
+    * Un-stalling an endpoint resets data toggle back to DATA0.
     * Additionally, if there is an ongoing transfer on this endpoint
     * it will be aborted.
     *
-    * @param endpoint Endpoint to unstall
+    * @param endpoint Endpoint to un-stall
     * @note This endpoint must already have been setup with endpoint_add
     */
     void endpoint_unstall(usb_ep_t endpoint);
@@ -617,4 +612,7 @@ class USBDevice: public  USBPhyEvents {
     uint32_t _locked;
 };
 
+/** @}*/
+/** @}*/
+
 #endif
diff --git a/usb/device/USBDevice/USBDevice_Types.h b/drivers/internal/USBDevice_Types.h
similarity index 100%
rename from usb/device/USBDevice/USBDevice_Types.h
rename to drivers/internal/USBDevice_Types.h
diff --git a/usb/device/USBHID/USBHID_Types.h b/drivers/internal/USBHID_Types.h
similarity index 100%
rename from usb/device/USBHID/USBHID_Types.h
rename to drivers/internal/USBHID_Types.h
diff --git a/usb/device/USBDevice/EndpointResolver.cpp b/drivers/source/usb/device/EndpointResolver.cpp
similarity index 100%
rename from usb/device/USBDevice/EndpointResolver.cpp
rename to drivers/source/usb/device/EndpointResolver.cpp
diff --git a/usb/device/USBAudio/USBAudio.cpp b/drivers/source/usb/device/USBAudio.cpp
similarity index 100%
rename from usb/device/USBAudio/USBAudio.cpp
rename to drivers/source/usb/device/USBAudio.cpp
diff --git a/usb/device/USBSerial/USBCDC.cpp b/drivers/source/usb/device/USBCDC.cpp
similarity index 100%
rename from usb/device/USBSerial/USBCDC.cpp
rename to drivers/source/usb/device/USBCDC.cpp
diff --git a/usb/device/USBCDC_ECM/USBCDC_ECM.cpp b/drivers/source/usb/device/USBCDC_ECM.cpp
similarity index 100%
rename from usb/device/USBCDC_ECM/USBCDC_ECM.cpp
rename to drivers/source/usb/device/USBCDC_ECM.cpp
diff --git a/usb/device/USBDevice/USBDevice.cpp b/drivers/source/usb/device/USBDevice.cpp
similarity index 100%
rename from usb/device/USBDevice/USBDevice.cpp
rename to drivers/source/usb/device/USBDevice.cpp
diff --git a/usb/device/USBHID/USBHID.cpp b/drivers/source/usb/device/USBHID.cpp
similarity index 100%
rename from usb/device/USBHID/USBHID.cpp
rename to drivers/source/usb/device/USBHID.cpp
diff --git a/usb/device/USBHID/USBKeyboard.cpp b/drivers/source/usb/device/USBKeyboard.cpp
similarity index 100%
rename from usb/device/USBHID/USBKeyboard.cpp
rename to drivers/source/usb/device/USBKeyboard.cpp
diff --git a/usb/device/USBMIDI/USBMIDI.cpp b/drivers/source/usb/device/USBMIDI.cpp
similarity index 100%
rename from usb/device/USBMIDI/USBMIDI.cpp
rename to drivers/source/usb/device/USBMIDI.cpp
diff --git a/usb/device/USBMSD/USBMSD.cpp b/drivers/source/usb/device/USBMSD.cpp
similarity index 100%
rename from usb/device/USBMSD/USBMSD.cpp
rename to drivers/source/usb/device/USBMSD.cpp
diff --git a/usb/device/USBHID/USBMouse.cpp b/drivers/source/usb/device/USBMouse.cpp
similarity index 100%
rename from usb/device/USBHID/USBMouse.cpp
rename to drivers/source/usb/device/USBMouse.cpp
diff --git a/usb/device/USBHID/USBMouseKeyboard.cpp b/drivers/source/usb/device/USBMouseKeyboard.cpp
similarity index 100%
rename from usb/device/USBHID/USBMouseKeyboard.cpp
rename to drivers/source/usb/device/USBMouseKeyboard.cpp
diff --git a/usb/device/USBSerial/USBSerial.cpp b/drivers/source/usb/device/USBSerial.cpp
similarity index 100%
rename from usb/device/USBSerial/USBSerial.cpp
rename to drivers/source/usb/device/USBSerial.cpp
diff --git a/usb/device/utilities/AsyncOp.cpp b/drivers/source/usb/device/utilities/AsyncOp.cpp
similarity index 100%
rename from usb/device/utilities/AsyncOp.cpp
rename to drivers/source/usb/device/utilities/AsyncOp.cpp
diff --git a/usb/device/utilities/ByteBuffer.cpp b/drivers/source/usb/device/utilities/ByteBuffer.cpp
similarity index 100%
rename from usb/device/utilities/ByteBuffer.cpp
rename to drivers/source/usb/device/utilities/ByteBuffer.cpp
diff --git a/usb/device/utilities/LinkedListBase.cpp b/drivers/source/usb/device/utilities/LinkedListBase.cpp
similarity index 100%
rename from usb/device/utilities/LinkedListBase.cpp
rename to drivers/source/usb/device/utilities/LinkedListBase.cpp
diff --git a/usb/device/utilities/OperationListBase.cpp b/drivers/source/usb/device/utilities/OperationListBase.cpp
similarity index 100%
rename from usb/device/utilities/OperationListBase.cpp
rename to drivers/source/usb/device/utilities/OperationListBase.cpp
diff --git a/usb/device/utilities/events/PolledQueue.cpp b/drivers/source/usb/device/utilities/events/PolledQueue.cpp
similarity index 98%
rename from usb/device/utilities/events/PolledQueue.cpp
rename to drivers/source/usb/device/utilities/events/PolledQueue.cpp
index ec79cfb4f1b..0f6e5e7f247 100644
--- a/usb/device/utilities/events/PolledQueue.cpp
+++ b/drivers/source/usb/device/utilities/events/PolledQueue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "events/PolledQueue.h"
+#include "drivers/internal/PolledQueue.h"
 
 #include "events/mbed_events.h"
 #include "platform/Callback.h"
diff --git a/usb/device/utilities/events/TaskBase.cpp b/drivers/source/usb/device/utilities/events/TaskBase.cpp
similarity index 97%
rename from usb/device/utilities/events/TaskBase.cpp
rename to drivers/source/usb/device/utilities/events/TaskBase.cpp
index ab52c2c69cc..feabb7af455 100644
--- a/usb/device/utilities/events/TaskBase.cpp
+++ b/drivers/source/usb/device/utilities/events/TaskBase.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include "events/TaskBase.h"
-#include "events/TaskQueue.h"
+#include "drivers/internal/TaskBase.h"
+#include "drivers/internal/TaskQueue.h"
 #include "events/mbed_events.h"
 #include "rtos/Semaphore.h"
 #include "platform/mbed_critical.h"
diff --git a/usb/device/USBPhy/USBPhy.h b/hal/usb/USBPhy.h
similarity index 99%
rename from usb/device/USBPhy/USBPhy.h
rename to hal/usb/USBPhy.h
index a1b5a9930d0..c7c69bb9b6d 100644
--- a/usb/device/USBPhy/USBPhy.h
+++ b/hal/usb/USBPhy.h
@@ -259,7 +259,7 @@ class USBPhy {
     virtual void endpoint_stall(usb_ep_t endpoint) = 0;
 
     /**
-     * Unstall the endpoint
+     * Un-stall the endpoint
      *
      * Clear the HALT feature on this endpoint so communication can
      * resume.
diff --git a/usb/device/USBPhy/USBPhyEvents.h b/hal/usb/USBPhyEvents.h
similarity index 100%
rename from usb/device/USBPhy/USBPhyEvents.h
rename to hal/usb/USBPhyEvents.h
diff --git a/usb/device/USBPhy/USBPhyTypes.h b/hal/usb/USBPhyTypes.h
similarity index 100%
rename from usb/device/USBPhy/USBPhyTypes.h
rename to hal/usb/USBPhyTypes.h
diff --git a/usb/device/hal/mbed_usb_phy.cpp b/hal/usb/mbed_usb_phy.cpp
similarity index 100%
rename from usb/device/hal/mbed_usb_phy.cpp
rename to hal/usb/mbed_usb_phy.cpp
diff --git a/usb/device/hal/usb_phy_api.h b/hal/usb/usb_phy_api.h
similarity index 100%
rename from usb/device/hal/usb_phy_api.h
rename to hal/usb/usb_phy_api.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/TARGET_Template/USBPhyHw.h b/targets/TARGET_Template/USBPhyHw.h
similarity index 100%
rename from usb/device/targets/TARGET_Template/USBPhyHw.h
rename to targets/TARGET_Template/USBPhyHw.h
diff --git a/usb/device/targets/TARGET_Template/USBPhy_template.cpp b/targets/TARGET_Template/USBPhy_template.cpp
similarity index 100%
rename from usb/device/targets/TARGET_Template/USBPhy_template.cpp
rename to targets/TARGET_Template/USBPhy_template.cpp
diff --git a/tools/test/travis-ci/doxy-spellchecker/ignore.en.pws b/tools/test/travis-ci/doxy-spellchecker/ignore.en.pws
index 606a7119351..b78a2ce7940 100644
--- a/tools/test/travis-ci/doxy-spellchecker/ignore.en.pws
+++ b/tools/test/travis-ci/doxy-spellchecker/ignore.en.pws
@@ -96,4 +96,5 @@ TCPSocket
 UDPSocket
 Socket
 unregister
-_doxy_
\ No newline at end of file
+deinit
+_doxy_
diff --git a/usb/mbed_lib.json b/usb/mbed_lib.json
deleted file mode 100644
index dc0cd0d8b62..00000000000
--- a/usb/mbed_lib.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "usb"
-}