diff --git a/drivers/AnalogIn.h b/drivers/include/drivers/AnalogIn.h
similarity index 100%
rename from drivers/AnalogIn.h
rename to drivers/include/drivers/AnalogIn.h
diff --git a/drivers/AnalogOut.h b/drivers/include/drivers/AnalogOut.h
similarity index 100%
rename from drivers/AnalogOut.h
rename to drivers/include/drivers/AnalogOut.h
diff --git a/drivers/BufferedSerial.h b/drivers/include/drivers/BufferedSerial.h
similarity index 100%
rename from drivers/BufferedSerial.h
rename to drivers/include/drivers/BufferedSerial.h
diff --git a/drivers/BusIn.h b/drivers/include/drivers/BusIn.h
similarity index 100%
rename from drivers/BusIn.h
rename to drivers/include/drivers/BusIn.h
diff --git a/drivers/BusInOut.h b/drivers/include/drivers/BusInOut.h
similarity index 100%
rename from drivers/BusInOut.h
rename to drivers/include/drivers/BusInOut.h
diff --git a/drivers/BusOut.h b/drivers/include/drivers/BusOut.h
similarity index 100%
rename from drivers/BusOut.h
rename to drivers/include/drivers/BusOut.h
diff --git a/drivers/CAN.h b/drivers/include/drivers/CAN.h
similarity index 100%
rename from drivers/CAN.h
rename to drivers/include/drivers/CAN.h
diff --git a/drivers/DigitalIn.h b/drivers/include/drivers/DigitalIn.h
similarity index 100%
rename from drivers/DigitalIn.h
rename to drivers/include/drivers/DigitalIn.h
diff --git a/drivers/DigitalInOut.h b/drivers/include/drivers/DigitalInOut.h
similarity index 100%
rename from drivers/DigitalInOut.h
rename to drivers/include/drivers/DigitalInOut.h
diff --git a/drivers/DigitalOut.h b/drivers/include/drivers/DigitalOut.h
similarity index 100%
rename from drivers/DigitalOut.h
rename to drivers/include/drivers/DigitalOut.h
diff --git a/drivers/FlashIAP.h b/drivers/include/drivers/FlashIAP.h
similarity index 100%
rename from drivers/FlashIAP.h
rename to drivers/include/drivers/FlashIAP.h
diff --git a/drivers/HighResClock.h b/drivers/include/drivers/HighResClock.h
similarity index 100%
rename from drivers/HighResClock.h
rename to drivers/include/drivers/HighResClock.h
diff --git a/drivers/I2C.h b/drivers/include/drivers/I2C.h
similarity index 100%
rename from drivers/I2C.h
rename to drivers/include/drivers/I2C.h
diff --git a/drivers/I2CSlave.h b/drivers/include/drivers/I2CSlave.h
similarity index 100%
rename from drivers/I2CSlave.h
rename to drivers/include/drivers/I2CSlave.h
diff --git a/drivers/InterruptIn.h b/drivers/include/drivers/InterruptIn.h
similarity index 100%
rename from drivers/InterruptIn.h
rename to drivers/include/drivers/InterruptIn.h
diff --git a/drivers/LowPowerClock.h b/drivers/include/drivers/LowPowerClock.h
similarity index 100%
rename from drivers/LowPowerClock.h
rename to drivers/include/drivers/LowPowerClock.h
diff --git a/drivers/LowPowerTicker.h b/drivers/include/drivers/LowPowerTicker.h
similarity index 100%
rename from drivers/LowPowerTicker.h
rename to drivers/include/drivers/LowPowerTicker.h
diff --git a/drivers/LowPowerTimeout.h b/drivers/include/drivers/LowPowerTimeout.h
similarity index 100%
rename from drivers/LowPowerTimeout.h
rename to drivers/include/drivers/LowPowerTimeout.h
diff --git a/drivers/LowPowerTimer.h b/drivers/include/drivers/LowPowerTimer.h
similarity index 100%
rename from drivers/LowPowerTimer.h
rename to drivers/include/drivers/LowPowerTimer.h
diff --git a/drivers/MbedCRC.h b/drivers/include/drivers/MbedCRC.h
similarity index 100%
rename from drivers/MbedCRC.h
rename to drivers/include/drivers/MbedCRC.h
diff --git a/drivers/PortIn.h b/drivers/include/drivers/PortIn.h
similarity index 100%
rename from drivers/PortIn.h
rename to drivers/include/drivers/PortIn.h
diff --git a/drivers/PortInOut.h b/drivers/include/drivers/PortInOut.h
similarity index 100%
rename from drivers/PortInOut.h
rename to drivers/include/drivers/PortInOut.h
diff --git a/drivers/PortOut.h b/drivers/include/drivers/PortOut.h
similarity index 100%
rename from drivers/PortOut.h
rename to drivers/include/drivers/PortOut.h
diff --git a/drivers/PwmOut.h b/drivers/include/drivers/PwmOut.h
similarity index 100%
rename from drivers/PwmOut.h
rename to drivers/include/drivers/PwmOut.h
diff --git a/drivers/QSPI.h b/drivers/include/drivers/QSPI.h
similarity index 100%
rename from drivers/QSPI.h
rename to drivers/include/drivers/QSPI.h
diff --git a/drivers/RealTimeClock.h b/drivers/include/drivers/RealTimeClock.h
similarity index 100%
rename from drivers/RealTimeClock.h
rename to drivers/include/drivers/RealTimeClock.h
diff --git a/drivers/ResetReason.h b/drivers/include/drivers/ResetReason.h
similarity index 100%
rename from drivers/ResetReason.h
rename to drivers/include/drivers/ResetReason.h
diff --git a/drivers/SPI.h b/drivers/include/drivers/SPI.h
similarity index 100%
rename from drivers/SPI.h
rename to drivers/include/drivers/SPI.h
diff --git a/drivers/SPISlave.h b/drivers/include/drivers/SPISlave.h
similarity index 100%
rename from drivers/SPISlave.h
rename to drivers/include/drivers/SPISlave.h
diff --git a/drivers/SerialBase.h b/drivers/include/drivers/SerialBase.h
similarity index 100%
rename from drivers/SerialBase.h
rename to drivers/include/drivers/SerialBase.h
diff --git a/drivers/SerialWireOutput.h b/drivers/include/drivers/SerialWireOutput.h
similarity index 100%
rename from drivers/SerialWireOutput.h
rename to drivers/include/drivers/SerialWireOutput.h
diff --git a/drivers/Ticker.h b/drivers/include/drivers/Ticker.h
similarity index 100%
rename from drivers/Ticker.h
rename to drivers/include/drivers/Ticker.h
diff --git a/drivers/TickerDataClock.h b/drivers/include/drivers/TickerDataClock.h
similarity index 100%
rename from drivers/TickerDataClock.h
rename to drivers/include/drivers/TickerDataClock.h
diff --git a/drivers/Timeout.h b/drivers/include/drivers/Timeout.h
similarity index 100%
rename from drivers/Timeout.h
rename to drivers/include/drivers/Timeout.h
diff --git a/drivers/Timer.h b/drivers/include/drivers/Timer.h
similarity index 100%
rename from drivers/Timer.h
rename to drivers/include/drivers/Timer.h
diff --git a/drivers/TimerEvent.h b/drivers/include/drivers/TimerEvent.h
similarity index 100%
rename from drivers/TimerEvent.h
rename to drivers/include/drivers/TimerEvent.h
diff --git a/drivers/USBAudio.h b/drivers/include/drivers/USBAudio.h
similarity index 100%
rename from drivers/USBAudio.h
rename to drivers/include/drivers/USBAudio.h
diff --git a/drivers/USBCDC.h b/drivers/include/drivers/USBCDC.h
similarity index 100%
rename from drivers/USBCDC.h
rename to drivers/include/drivers/USBCDC.h
diff --git a/drivers/USBCDC_ECM.h b/drivers/include/drivers/USBCDC_ECM.h
similarity index 100%
rename from drivers/USBCDC_ECM.h
rename to drivers/include/drivers/USBCDC_ECM.h
diff --git a/drivers/USBHID.h b/drivers/include/drivers/USBHID.h
similarity index 100%
rename from drivers/USBHID.h
rename to drivers/include/drivers/USBHID.h
diff --git a/drivers/USBKeyboard.h b/drivers/include/drivers/USBKeyboard.h
similarity index 100%
rename from drivers/USBKeyboard.h
rename to drivers/include/drivers/USBKeyboard.h
diff --git a/drivers/USBMIDI.h b/drivers/include/drivers/USBMIDI.h
similarity index 100%
rename from drivers/USBMIDI.h
rename to drivers/include/drivers/USBMIDI.h
diff --git a/drivers/USBMSD.h b/drivers/include/drivers/USBMSD.h
similarity index 100%
rename from drivers/USBMSD.h
rename to drivers/include/drivers/USBMSD.h
diff --git a/drivers/USBMouse.h b/drivers/include/drivers/USBMouse.h
similarity index 100%
rename from drivers/USBMouse.h
rename to drivers/include/drivers/USBMouse.h
diff --git a/drivers/USBMouseKeyboard.h b/drivers/include/drivers/USBMouseKeyboard.h
similarity index 100%
rename from drivers/USBMouseKeyboard.h
rename to drivers/include/drivers/USBMouseKeyboard.h
diff --git a/drivers/USBSerial.h b/drivers/include/drivers/USBSerial.h
similarity index 100%
rename from drivers/USBSerial.h
rename to drivers/include/drivers/USBSerial.h
diff --git a/drivers/UnbufferedSerial.h b/drivers/include/drivers/UnbufferedSerial.h
similarity index 100%
rename from drivers/UnbufferedSerial.h
rename to drivers/include/drivers/UnbufferedSerial.h
diff --git a/drivers/Watchdog.h b/drivers/include/drivers/Watchdog.h
similarity index 100%
rename from drivers/Watchdog.h
rename to drivers/include/drivers/Watchdog.h
diff --git a/drivers/internal/AsyncOp.h b/drivers/include/drivers/internal/AsyncOp.h
similarity index 100%
rename from drivers/internal/AsyncOp.h
rename to drivers/include/drivers/internal/AsyncOp.h
diff --git a/drivers/internal/ByteBuffer.h b/drivers/include/drivers/internal/ByteBuffer.h
similarity index 100%
rename from drivers/internal/ByteBuffer.h
rename to drivers/include/drivers/internal/ByteBuffer.h
diff --git a/drivers/internal/EndpointResolver.h b/drivers/include/drivers/internal/EndpointResolver.h
similarity index 100%
rename from drivers/internal/EndpointResolver.h
rename to drivers/include/drivers/internal/EndpointResolver.h
diff --git a/drivers/internal/LinkEntry.h b/drivers/include/drivers/internal/LinkEntry.h
similarity index 100%
rename from drivers/internal/LinkEntry.h
rename to drivers/include/drivers/internal/LinkEntry.h
diff --git a/drivers/internal/LinkedList.h b/drivers/include/drivers/internal/LinkedList.h
similarity index 100%
rename from drivers/internal/LinkedList.h
rename to drivers/include/drivers/internal/LinkedList.h
diff --git a/drivers/internal/LinkedListBase.h b/drivers/include/drivers/internal/LinkedListBase.h
similarity index 100%
rename from drivers/internal/LinkedListBase.h
rename to drivers/include/drivers/internal/LinkedListBase.h
diff --git a/drivers/internal/MIDIMessage.h b/drivers/include/drivers/internal/MIDIMessage.h
similarity index 100%
rename from drivers/internal/MIDIMessage.h
rename to drivers/include/drivers/internal/MIDIMessage.h
diff --git a/drivers/internal/OperationList.h b/drivers/include/drivers/internal/OperationList.h
similarity index 100%
rename from drivers/internal/OperationList.h
rename to drivers/include/drivers/internal/OperationList.h
diff --git a/drivers/internal/OperationListBase.h b/drivers/include/drivers/internal/OperationListBase.h
similarity index 100%
rename from drivers/internal/OperationListBase.h
rename to drivers/include/drivers/internal/OperationListBase.h
diff --git a/drivers/internal/PolledQueue.h b/drivers/include/drivers/internal/PolledQueue.h
similarity index 100%
rename from drivers/internal/PolledQueue.h
rename to drivers/include/drivers/internal/PolledQueue.h
diff --git a/drivers/internal/SFDP.h b/drivers/include/drivers/internal/SFDP.h
similarity index 100%
rename from drivers/internal/SFDP.h
rename to drivers/include/drivers/internal/SFDP.h
diff --git a/drivers/internal/Task.h b/drivers/include/drivers/internal/Task.h
similarity index 100%
rename from drivers/internal/Task.h
rename to drivers/include/drivers/internal/Task.h
diff --git a/drivers/internal/TaskBase.h b/drivers/include/drivers/internal/TaskBase.h
similarity index 100%
rename from drivers/internal/TaskBase.h
rename to drivers/include/drivers/internal/TaskBase.h
diff --git a/drivers/internal/TaskQueue.h b/drivers/include/drivers/internal/TaskQueue.h
similarity index 100%
rename from drivers/internal/TaskQueue.h
rename to drivers/include/drivers/internal/TaskQueue.h
diff --git a/drivers/internal/USBAudio_Types.h b/drivers/include/drivers/internal/USBAudio_Types.h
similarity index 100%
rename from drivers/internal/USBAudio_Types.h
rename to drivers/include/drivers/internal/USBAudio_Types.h
diff --git a/drivers/internal/USBDescriptor.h b/drivers/include/drivers/internal/USBDescriptor.h
similarity index 100%
rename from drivers/internal/USBDescriptor.h
rename to drivers/include/drivers/internal/USBDescriptor.h
diff --git a/drivers/internal/USBDevice.h b/drivers/include/drivers/internal/USBDevice.h
similarity index 100%
rename from drivers/internal/USBDevice.h
rename to drivers/include/drivers/internal/USBDevice.h
diff --git a/drivers/internal/USBDevice_Types.h b/drivers/include/drivers/internal/USBDevice_Types.h
similarity index 100%
rename from drivers/internal/USBDevice_Types.h
rename to drivers/include/drivers/internal/USBDevice_Types.h
diff --git a/drivers/internal/USBHID_Types.h b/drivers/include/drivers/internal/USBHID_Types.h
similarity index 100%
rename from drivers/internal/USBHID_Types.h
rename to drivers/include/drivers/internal/USBHID_Types.h