diff --git a/src/kaleidoscope/driver/hid/keyboardio/Keyboard.h b/src/kaleidoscope/driver/hid/keyboardio/Keyboard.h
index d68c77c0..03d1f638 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/Keyboard.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/Keyboard.h
@@ -17,11 +17,13 @@
 
 #pragma once
 
-#include <KeyboardioHID.h>  // for BootKeyboard, BootKeyboard_, Keyboard
 #include <stdint.h>         // for uint8_t, uint16_t
 
-// From Kaleidoscope:
-#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, KeyboardProps
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, Keyboar...
+#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
 
 namespace kaleidoscope {
 namespace driver {
diff --git a/src/kaleidoscope/driver/hid/keyboardio/Mouse.h b/src/kaleidoscope/driver/hid/keyboardio/Mouse.h
index b52cfe86..9da66938 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/Mouse.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/Mouse.h
@@ -17,11 +17,10 @@
 
 #pragma once
 
-#include <KeyboardioHID.h>  // for HID_MouseReport_Data_t, (anonymous union...
 #include <stdint.h>         // for int8_t, uint8_t
 
-// From Kaleidoscope:
 #include "kaleidoscope/driver/hid/base/Mouse.h"  // for Mouse, MouseProps
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
 
 namespace kaleidoscope {
 namespace driver {
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.cpp
index f3a77ff9..05ad759f 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.cpp
@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "BootKeyboard.h"
-#include "DescriptorPrimitives.h"
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 // See Appendix B of USB HID spec
 static const uint8_t boot_keyboard_hid_descriptor_[] PROGMEM = {
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h b/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h
index d7cfeadb..873cca9a 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h
@@ -27,9 +27,10 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HIDTables.h"
-#include "HIDAliases.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
+#include "kaleidoscope/HIDTables.h"
 
 typedef union {
   // Low level key report: up to 6 keys and shift, ctrl etc at once
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h b/src/kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h
index a2150728..3989ef76 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h
@@ -27,10 +27,10 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "MouseButtons.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 
 #define DESCRIPTOR_ABS_MOUSE_BUTTONS \
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h b/src/kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h
index 5cf2eef7..99ee8388 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h
@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #pragma once
 
-#include "HIDTables.h"
+#include "kaleidoscope/HIDTables.h"
 
 #define HID_FIRST_KEY HID_KEYBOARD_NO_EVENT
 #define HID_LAST_KEY HID_KEYPAD_HEXADECIMAL
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.cpp
index 8f0ec1d9..9b07e84f 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.cpp
@@ -22,6 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 HIDReportObserver::SendReportHook HIDReportObserver::send_report_hook_ = nullptr;
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.cpp
index 27dbb168..ce19d723 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.cpp
@@ -18,8 +18,8 @@
 
 #ifndef KEYBOARDIOHID_BUILD_WITHOUT_HID
 
-#include "HID.h"
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 #if defined(USBCON)
 
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.h b/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.h
index 8788e201..22604bb7 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/HID_.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include <Arduino.h>
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 #if defined(USBCON)
 
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.cpp
index 437ef915..dc33161d 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "AbsoluteMouse.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t absolute_mouse_hid_descriptor_[] PROGMEM = {
   /*  Mouse absolute */
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h
index 8dabd085..a1794046 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h
@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../DeviceAPIs/AbsoluteMouseAPI.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
 
 class AbsoluteMouse_ : public AbsoluteMouseAPI {
  public:
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.cpp
index 0cb4c2f5..db572ee1 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "ConsumerControl.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t consumer_control_hid_descriptor_[] PROGMEM = {
   /* Consumer Control (Sound/Media keys) */
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h
index ed3ac03f..c8b9f07a 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h
@@ -27,8 +27,8 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 typedef union {
   // Every usable Consumer key possible, up to 4 keys presses possible
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.cpp
index 7b0774c0..c5ddbf21 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Gamepad.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t gamepad_hid_descriptor_[] PROGMEM = {
   /* Gamepad with 32 buttons and 6 axis*/
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h
index c2892d1d..ed06eac1 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h
@@ -27,8 +27,8 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 // Dpad directions
 #define GAMEPAD_DPAD_CENTERED 0
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.cpp
index b776bc8a..6f51f719 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Keyboard.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t nkro_keyboard_hid_descriptor_[] PROGMEM = {
   //  NKRO Keyboard
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h
index 799b1fd8..381f5b16 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h
@@ -27,11 +27,11 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
-#include "HIDTables.h"
-#include "HIDAliases.h"
+#include "kaleidoscope/HIDTables.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
 
 #define KEY_BYTES 28
 
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.cpp
index dd3cec6e..2dca172c 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Mouse.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t mouse_hid_descriptor_[] PROGMEM = {
   /*  Mouse relative */
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h
index 469be1fd..14b009c1 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h
@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
 
 typedef union {
   // Mouse report: 8 buttons, position, wheel
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.cpp
index c8cb7cf8..13bc2ae0 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.cpp
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "SystemControl.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t system_control_hid_descriptor_[] PROGMEM = {
   //TODO limit to system keys only?
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h
index 1b6fd1b1..a03de4da 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h
@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "HIDTables.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/HIDTables.h"
 
 typedef union {
   // Every usable system control key possible
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.cpp b/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.cpp
index 05f5176c..c5230301 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.cpp
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.cpp
@@ -23,9 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "SingleAbsoluteMouse.h"
-#include "HIDReportObserver.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 static const uint8_t _hidSingleReportDescriptorAbsoluteMouse[] PROGMEM = {
   D_USAGE_PAGE, D_PAGE_GENERIC_DESKTOP,         /* USAGE_PAGE (Generic Desktop)         54 */
diff --git a/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h b/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h
index 7a59403e..97f44fac 100644
--- a/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h
+++ b/src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h
@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../DeviceAPIs/AbsoluteMouseAPI.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
 
 
 class SingleAbsoluteMouse_ : public PluggableUSBModule, public AbsoluteMouseAPI {