diff --git a/.travis.yml b/.travis.yml
index 90fd04d6d5..6c73ef1226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -284,7 +284,7 @@ matrix:
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
-          rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
+          rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/usb connectivity/cellular connectivity/drivers/cellular \
             connectivity/libraries/ppp connectivity/netsocket connectivity/nanostack connectivity/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
diff --git a/drivers/include/drivers/USBAudio.h b/drivers/usb/include/usb/USBAudio.h
similarity index 100%
rename from drivers/include/drivers/USBAudio.h
rename to drivers/usb/include/usb/USBAudio.h
diff --git a/drivers/include/drivers/USBCDC.h b/drivers/usb/include/usb/USBCDC.h
similarity index 100%
rename from drivers/include/drivers/USBCDC.h
rename to drivers/usb/include/usb/USBCDC.h
diff --git a/drivers/include/drivers/USBCDC_ECM.h b/drivers/usb/include/usb/USBCDC_ECM.h
similarity index 100%
rename from drivers/include/drivers/USBCDC_ECM.h
rename to drivers/usb/include/usb/USBCDC_ECM.h
diff --git a/drivers/include/drivers/USBHID.h b/drivers/usb/include/usb/USBHID.h
similarity index 100%
rename from drivers/include/drivers/USBHID.h
rename to drivers/usb/include/usb/USBHID.h
diff --git a/drivers/include/drivers/USBKeyboard.h b/drivers/usb/include/usb/USBKeyboard.h
similarity index 100%
rename from drivers/include/drivers/USBKeyboard.h
rename to drivers/usb/include/usb/USBKeyboard.h
diff --git a/drivers/include/drivers/USBMIDI.h b/drivers/usb/include/usb/USBMIDI.h
similarity index 100%
rename from drivers/include/drivers/USBMIDI.h
rename to drivers/usb/include/usb/USBMIDI.h
diff --git a/drivers/include/drivers/USBMSD.h b/drivers/usb/include/usb/USBMSD.h
similarity index 99%
rename from drivers/include/drivers/USBMSD.h
rename to drivers/usb/include/usb/USBMSD.h
index b6e992ae3b..f26e07cb08 100644
--- a/drivers/include/drivers/USBMSD.h
+++ b/drivers/usb/include/usb/USBMSD.h
@@ -22,8 +22,8 @@
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
 #include "platform/Callback.h"
-#include "drivers/internal/PolledQueue.h"
-#include "drivers/internal/Task.h"
+#include "usb/internal/PolledQueue.h"
+#include "usb/internal/Task.h"
 #include "BlockDevice.h"
 #include "Mutex.h"
 
diff --git a/drivers/include/drivers/USBMouse.h b/drivers/usb/include/usb/USBMouse.h
similarity index 100%
rename from drivers/include/drivers/USBMouse.h
rename to drivers/usb/include/usb/USBMouse.h
diff --git a/drivers/include/drivers/USBMouseKeyboard.h b/drivers/usb/include/usb/USBMouseKeyboard.h
similarity index 100%
rename from drivers/include/drivers/USBMouseKeyboard.h
rename to drivers/usb/include/usb/USBMouseKeyboard.h
diff --git a/drivers/include/drivers/USBSerial.h b/drivers/usb/include/usb/USBSerial.h
similarity index 100%
rename from drivers/include/drivers/USBSerial.h
rename to drivers/usb/include/usb/USBSerial.h
diff --git a/drivers/include/drivers/internal/AsyncOp.h b/drivers/usb/include/usb/internal/AsyncOp.h
similarity index 100%
rename from drivers/include/drivers/internal/AsyncOp.h
rename to drivers/usb/include/usb/internal/AsyncOp.h
diff --git a/drivers/include/drivers/internal/ByteBuffer.h b/drivers/usb/include/usb/internal/ByteBuffer.h
similarity index 100%
rename from drivers/include/drivers/internal/ByteBuffer.h
rename to drivers/usb/include/usb/internal/ByteBuffer.h
diff --git a/drivers/include/drivers/internal/EndpointResolver.h b/drivers/usb/include/usb/internal/EndpointResolver.h
similarity index 100%
rename from drivers/include/drivers/internal/EndpointResolver.h
rename to drivers/usb/include/usb/internal/EndpointResolver.h
diff --git a/drivers/include/drivers/internal/LinkEntry.h b/drivers/usb/include/usb/internal/LinkEntry.h
similarity index 100%
rename from drivers/include/drivers/internal/LinkEntry.h
rename to drivers/usb/include/usb/internal/LinkEntry.h
diff --git a/drivers/include/drivers/internal/LinkedList.h b/drivers/usb/include/usb/internal/LinkedList.h
similarity index 100%
rename from drivers/include/drivers/internal/LinkedList.h
rename to drivers/usb/include/usb/internal/LinkedList.h
diff --git a/drivers/include/drivers/internal/LinkedListBase.h b/drivers/usb/include/usb/internal/LinkedListBase.h
similarity index 100%
rename from drivers/include/drivers/internal/LinkedListBase.h
rename to drivers/usb/include/usb/internal/LinkedListBase.h
diff --git a/drivers/include/drivers/internal/MIDIMessage.h b/drivers/usb/include/usb/internal/MIDIMessage.h
similarity index 100%
rename from drivers/include/drivers/internal/MIDIMessage.h
rename to drivers/usb/include/usb/internal/MIDIMessage.h
diff --git a/drivers/include/drivers/internal/OperationList.h b/drivers/usb/include/usb/internal/OperationList.h
similarity index 100%
rename from drivers/include/drivers/internal/OperationList.h
rename to drivers/usb/include/usb/internal/OperationList.h
diff --git a/drivers/include/drivers/internal/OperationListBase.h b/drivers/usb/include/usb/internal/OperationListBase.h
similarity index 98%
rename from drivers/include/drivers/internal/OperationListBase.h
rename to drivers/usb/include/usb/internal/OperationListBase.h
index e964cc961e..9cd6f9fa6c 100644
--- a/drivers/include/drivers/internal/OperationListBase.h
+++ b/drivers/usb/include/usb/internal/OperationListBase.h
@@ -18,7 +18,7 @@
 #ifndef MBED_OPERATION_LIST_BASE_H
 #define MBED_OPERATION_LIST_BASE_H
 
-#include "drivers/internal/LinkedListBase.h"
+#include "usb/internal/LinkedListBase.h"
 
 class AsyncOp;
 
diff --git a/drivers/include/drivers/internal/PolledQueue.h b/drivers/usb/include/usb/internal/PolledQueue.h
similarity index 97%
rename from drivers/include/drivers/internal/PolledQueue.h
rename to drivers/usb/include/usb/internal/PolledQueue.h
index 97c02a83e0..539ea0c26b 100644
--- a/drivers/include/drivers/internal/PolledQueue.h
+++ b/drivers/usb/include/usb/internal/PolledQueue.h
@@ -18,9 +18,10 @@
 #ifndef POLLED_QUEUE_H
 #define POLLED_QUEUE_H
 
-#include "drivers/internal/TaskQueue.h"
+#include "usb/internal/TaskQueue.h"
 #include "platform/Callback.h"
 #include "LinkedList.h"
+
 namespace events {
 /**
  * \defgroup drivers_PolledQueue PolledQueue class
diff --git a/drivers/include/drivers/internal/Task.h b/drivers/usb/include/usb/internal/Task.h
similarity index 99%
rename from drivers/include/drivers/internal/Task.h
rename to drivers/usb/include/usb/internal/Task.h
index be2c932563..b629fdd8f5 100644
--- a/drivers/include/drivers/internal/Task.h
+++ b/drivers/usb/include/usb/internal/Task.h
@@ -19,7 +19,7 @@
 #define MBED_TASK_H
 
 #include "events/EventQueue.h"
-#include "drivers/internal/TaskBase.h"
+#include "usb/internal/TaskBase.h"
 #include "platform/mbed_assert.h"
 #include "platform/Callback.h"
 
diff --git a/drivers/include/drivers/internal/TaskBase.h b/drivers/usb/include/usb/internal/TaskBase.h
similarity index 100%
rename from drivers/include/drivers/internal/TaskBase.h
rename to drivers/usb/include/usb/internal/TaskBase.h
diff --git a/drivers/include/drivers/internal/TaskQueue.h b/drivers/usb/include/usb/internal/TaskQueue.h
similarity index 98%
rename from drivers/include/drivers/internal/TaskQueue.h
rename to drivers/usb/include/usb/internal/TaskQueue.h
index 530a920440..f38d6c12b2 100644
--- a/drivers/include/drivers/internal/TaskQueue.h
+++ b/drivers/usb/include/usb/internal/TaskQueue.h
@@ -18,7 +18,7 @@
 #ifndef TASK_QUEUE_H
 #define TASK_QUEUE_H
 
-#include "drivers/internal/TaskBase.h"
+#include "usb/internal/TaskBase.h"
 #include "platform/Callback.h"
 #include "mbed_critical.h"
 
diff --git a/drivers/include/drivers/internal/USBAudio_Types.h b/drivers/usb/include/usb/internal/USBAudio_Types.h
similarity index 100%
rename from drivers/include/drivers/internal/USBAudio_Types.h
rename to drivers/usb/include/usb/internal/USBAudio_Types.h
diff --git a/drivers/include/drivers/internal/USBDescriptor.h b/drivers/usb/include/usb/internal/USBDescriptor.h
similarity index 100%
rename from drivers/include/drivers/internal/USBDescriptor.h
rename to drivers/usb/include/usb/internal/USBDescriptor.h
diff --git a/drivers/include/drivers/internal/USBDevice.h b/drivers/usb/include/usb/internal/USBDevice.h
similarity index 100%
rename from drivers/include/drivers/internal/USBDevice.h
rename to drivers/usb/include/usb/internal/USBDevice.h
diff --git a/drivers/include/drivers/internal/USBDevice_Types.h b/drivers/usb/include/usb/internal/USBDevice_Types.h
similarity index 100%
rename from drivers/include/drivers/internal/USBDevice_Types.h
rename to drivers/usb/include/usb/internal/USBDevice_Types.h
diff --git a/drivers/include/drivers/internal/USBHID_Types.h b/drivers/usb/include/usb/internal/USBHID_Types.h
similarity index 100%
rename from drivers/include/drivers/internal/USBHID_Types.h
rename to drivers/usb/include/usb/internal/USBHID_Types.h
diff --git a/drivers/source/usb/mbed_lib.json b/drivers/usb/mbed_lib.json
similarity index 100%
rename from drivers/source/usb/mbed_lib.json
rename to drivers/usb/mbed_lib.json
diff --git a/drivers/source/usb/AsyncOp.cpp b/drivers/usb/source/AsyncOp.cpp
similarity index 100%
rename from drivers/source/usb/AsyncOp.cpp
rename to drivers/usb/source/AsyncOp.cpp
diff --git a/drivers/source/usb/ByteBuffer.cpp b/drivers/usb/source/ByteBuffer.cpp
similarity index 100%
rename from drivers/source/usb/ByteBuffer.cpp
rename to drivers/usb/source/ByteBuffer.cpp
diff --git a/drivers/source/usb/EndpointResolver.cpp b/drivers/usb/source/EndpointResolver.cpp
similarity index 100%
rename from drivers/source/usb/EndpointResolver.cpp
rename to drivers/usb/source/EndpointResolver.cpp
diff --git a/drivers/source/usb/LinkedListBase.cpp b/drivers/usb/source/LinkedListBase.cpp
similarity index 100%
rename from drivers/source/usb/LinkedListBase.cpp
rename to drivers/usb/source/LinkedListBase.cpp
diff --git a/drivers/source/usb/OperationListBase.cpp b/drivers/usb/source/OperationListBase.cpp
similarity index 100%
rename from drivers/source/usb/OperationListBase.cpp
rename to drivers/usb/source/OperationListBase.cpp
diff --git a/drivers/source/usb/PolledQueue.cpp b/drivers/usb/source/PolledQueue.cpp
similarity index 98%
rename from drivers/source/usb/PolledQueue.cpp
rename to drivers/usb/source/PolledQueue.cpp
index 0f6e5e7f24..3f8cd9d88c 100644
--- a/drivers/source/usb/PolledQueue.cpp
+++ b/drivers/usb/source/PolledQueue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "drivers/internal/PolledQueue.h"
+#include "usb/internal/PolledQueue.h"
 
 #include "events/mbed_events.h"
 #include "platform/Callback.h"
diff --git a/drivers/source/usb/TaskBase.cpp b/drivers/usb/source/TaskBase.cpp
similarity index 97%
rename from drivers/source/usb/TaskBase.cpp
rename to drivers/usb/source/TaskBase.cpp
index feabb7af45..a8292edd22 100644
--- a/drivers/source/usb/TaskBase.cpp
+++ b/drivers/usb/source/TaskBase.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include "drivers/internal/TaskBase.h"
-#include "drivers/internal/TaskQueue.h"
+#include "usb/internal/TaskBase.h"
+#include "usb/internal/TaskQueue.h"
 #include "events/mbed_events.h"
 #include "rtos/Semaphore.h"
 #include "platform/mbed_critical.h"
diff --git a/drivers/source/usb/USBAudio.cpp b/drivers/usb/source/USBAudio.cpp
similarity index 100%
rename from drivers/source/usb/USBAudio.cpp
rename to drivers/usb/source/USBAudio.cpp
diff --git a/drivers/source/usb/USBCDC.cpp b/drivers/usb/source/USBCDC.cpp
similarity index 100%
rename from drivers/source/usb/USBCDC.cpp
rename to drivers/usb/source/USBCDC.cpp
diff --git a/drivers/source/usb/USBCDC_ECM.cpp b/drivers/usb/source/USBCDC_ECM.cpp
similarity index 100%
rename from drivers/source/usb/USBCDC_ECM.cpp
rename to drivers/usb/source/USBCDC_ECM.cpp
diff --git a/drivers/source/usb/USBDevice.cpp b/drivers/usb/source/USBDevice.cpp
similarity index 100%
rename from drivers/source/usb/USBDevice.cpp
rename to drivers/usb/source/USBDevice.cpp
diff --git a/drivers/source/usb/USBHID.cpp b/drivers/usb/source/USBHID.cpp
similarity index 100%
rename from drivers/source/usb/USBHID.cpp
rename to drivers/usb/source/USBHID.cpp
diff --git a/drivers/source/usb/USBKeyboard.cpp b/drivers/usb/source/USBKeyboard.cpp
similarity index 100%
rename from drivers/source/usb/USBKeyboard.cpp
rename to drivers/usb/source/USBKeyboard.cpp
diff --git a/drivers/source/usb/USBMIDI.cpp b/drivers/usb/source/USBMIDI.cpp
similarity index 100%
rename from drivers/source/usb/USBMIDI.cpp
rename to drivers/usb/source/USBMIDI.cpp
diff --git a/drivers/source/usb/USBMSD.cpp b/drivers/usb/source/USBMSD.cpp
similarity index 100%
rename from drivers/source/usb/USBMSD.cpp
rename to drivers/usb/source/USBMSD.cpp
diff --git a/drivers/source/usb/USBMouse.cpp b/drivers/usb/source/USBMouse.cpp
similarity index 100%
rename from drivers/source/usb/USBMouse.cpp
rename to drivers/usb/source/USBMouse.cpp
diff --git a/drivers/source/usb/USBMouseKeyboard.cpp b/drivers/usb/source/USBMouseKeyboard.cpp
similarity index 100%
rename from drivers/source/usb/USBMouseKeyboard.cpp
rename to drivers/usb/source/USBMouseKeyboard.cpp
diff --git a/drivers/source/usb/USBSerial.cpp b/drivers/usb/source/USBSerial.cpp
similarity index 100%
rename from drivers/source/usb/USBSerial.cpp
rename to drivers/usb/source/USBSerial.cpp