diff --git a/Controllers/A4TechController/BloodyB820RController.cpp b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp
similarity index 100%
rename from Controllers/A4TechController/BloodyB820RController.cpp
rename to Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp
diff --git a/Controllers/A4TechController/BloodyB820RController.h b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h
similarity index 100%
rename from Controllers/A4TechController/BloodyB820RController.h
rename to Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h
diff --git a/Controllers/A4TechController/RGBController_BloodyB820R.cpp b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp
similarity index 100%
rename from Controllers/A4TechController/RGBController_BloodyB820R.cpp
rename to Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp
diff --git a/Controllers/A4TechController/RGBController_BloodyB820R.h b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h
similarity index 100%
rename from Controllers/A4TechController/RGBController_BloodyB820R.h
rename to Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h
diff --git a/Controllers/A4TechController/BloodyMouseController.cpp b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp
similarity index 100%
rename from Controllers/A4TechController/BloodyMouseController.cpp
rename to Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp
diff --git a/Controllers/A4TechController/BloodyMouseController.h b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h
similarity index 100%
rename from Controllers/A4TechController/BloodyMouseController.h
rename to Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h
diff --git a/Controllers/A4TechController/RGBController_BloodyMouse.cpp b/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.cpp
similarity index 100%
rename from Controllers/A4TechController/RGBController_BloodyMouse.cpp
rename to Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.cpp
diff --git a/Controllers/A4TechController/RGBController_BloodyMouse.h b/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h
similarity index 100%
rename from Controllers/A4TechController/RGBController_BloodyMouse.h
rename to Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h
diff --git a/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.cpp b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.cpp
rename to Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.cpp
diff --git a/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.h b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.h
rename to Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp
rename to Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.cpp
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.h
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h
rename to Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.h
diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.cpp b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.cpp
rename to Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.cpp
diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.h b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.h
rename to Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp
rename to Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.cpp
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.h
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h
rename to Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.h
diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.cpp b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.cpp
rename to Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp
diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.h b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h
similarity index 100%
rename from Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.h
rename to Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.cpp
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp
rename to Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.cpp
diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.h
similarity index 100%
rename from Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h
rename to Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.h
diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW410KController.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp
similarity index 100%
rename from Controllers/AlienwareKeyboardController/AlienwareAW410KController.cpp
rename to Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp
diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW410KController.h b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h
similarity index 100%
rename from Controllers/AlienwareKeyboardController/AlienwareAW410KController.h
rename to Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h
diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW410K.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp
similarity index 100%
rename from Controllers/AlienwareKeyboardController/RGBController_AlienwareAW410K.cpp
rename to Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp
diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW410K.h b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.h
similarity index 100%
rename from Controllers/AlienwareKeyboardController/RGBController_AlienwareAW410K.h
rename to Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.h
diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW510KController.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp
similarity index 100%
rename from Controllers/AlienwareKeyboardController/AlienwareAW510KController.cpp
rename to Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp
diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW510KController.h b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h
similarity index 100%
rename from Controllers/AlienwareKeyboardController/AlienwareAW510KController.h
rename to Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h
diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp
similarity index 100%
rename from Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp
rename to Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp
diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.h
similarity index 100%
rename from Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h
rename to Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.h
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp
similarity index 100%
rename from Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp
rename to Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h
similarity index 100%
rename from Controllers/AsusAuraCoreController/AsusAuraCoreController.h
rename to Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h
diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
similarity index 100%
rename from Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
rename to Controllers/AsusAuraCoreController/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h b/Controllers/AsusAuraCoreController/AsusAuraCoreController/RGBController_AsusAuraCore.h
similarity index 100%
rename from Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h
rename to Controllers/AsusAuraCoreController/AsusAuraCoreController/RGBController_AsusAuraCore.h
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp
similarity index 100%
rename from Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.cpp
rename to Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h
similarity index 100%
rename from Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.h
rename to Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h
diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/RGBController_AsusAuraCoreLaptop.cpp
similarity index 100%
rename from Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp
rename to Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/RGBController_AsusAuraCoreLaptop.cpp
diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/RGBController_AsusAuraCoreLaptop.h
similarity index 100%
rename from Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h
rename to Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/RGBController_AsusAuraCoreLaptop.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController.cpp b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController.h b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController.h
rename to Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h
rename to Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraKeyboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraKeyboardController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraKeyboardController.h b/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraKeyboardController.h
rename to Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp b/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/RGBController_AsusAuraKeyboard.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraKeyboardController/RGBController_AsusAuraKeyboard.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h b/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/RGBController_AsusAuraKeyboard.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h
rename to Controllers/AsusAuraUSBController/AsusAuraKeyboardController/RGBController_AsusAuraKeyboard.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMonitorController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMonitorController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMonitorController.h b/Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMonitorController.h
rename to Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp b/Controllers/AsusAuraUSBController/AsusAuraMonitorController/RGBController_AsusAuraMonitor.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMonitorController/RGBController_AsusAuraMonitor.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h b/Controllers/AsusAuraUSBController/AsusAuraMonitorController/RGBController_AsusAuraMonitor.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h
rename to Controllers/AsusAuraUSBController/AsusAuraMonitorController/RGBController_AsusAuraMonitor.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseController.h b/Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMouseController.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h b/Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseDevices.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseDevices.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController/RGBController_AsusAuraMouse.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMouseController/RGBController_AsusAuraMouse.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h b/Controllers/AsusAuraUSBController/AsusAuraMouseController/RGBController_AsusAuraMouse.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseController/RGBController_AsusAuraMouse.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller.h b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGSpatha.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGSpatha.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGSpatha.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGSpatha.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGSpatha.h b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGSpatha.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGSpatha.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGSpatha.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGStrixEvolve.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGStrixEvolve.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGStrixEvolve.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGStrixEvolve.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGStrixEvolve.h b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGStrixEvolve.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGStrixEvolve.h
rename to Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/RGBController_AsusROGStrixEvolve.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMousematController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMousematController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMousematController.h b/Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMousematController.h
rename to Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp b/Controllers/AsusAuraUSBController/AsusAuraMousematController/RGBController_AsusAuraMousemat.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraMousematController/RGBController_AsusAuraMousemat.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h b/Controllers/AsusAuraUSBController/AsusAuraMousematController/RGBController_AsusAuraMousemat.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h
rename to Controllers/AsusAuraUSBController/AsusAuraMousematController/RGBController_AsusAuraMousemat.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.cpp b/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.h b/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.h
rename to Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp b/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/RGBController_AsusAuraRyuoAIO.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/RGBController_AsusAuraRyuoAIO.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h b/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/RGBController_AsusAuraRyuoAIO.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h
rename to Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/RGBController_AsusAuraRyuoAIO.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h
rename to Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardLayouts.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h
rename to Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardLayouts.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/RGBController_AsusAuraTUFKeyboard.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/RGBController_AsusAuraTUFKeyboard.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/RGBController_AsusAuraTUFKeyboard.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h
rename to Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/RGBController_AsusAuraTUFKeyboard.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraAddressableController.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraAddressableController.h
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMainboardController.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraMainboardController.h
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBController.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusAuraUSBController.h
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMainboard.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraMainboard.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMainboard.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraMainboard.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMainboard.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraMainboard.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraMainboard.h
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraMainboard.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraUSB.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h
rename to Controllers/AsusAuraUSBController/AsusAuraUSBController/RGBController_AsusAuraUSB.h
diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp
index dec3bf96..34c36e6e 100644
--- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp
@@ -6,6 +6,7 @@
 #include "AsusAuraMainboardController.h"
 #include "AsusAuraMouseController.h"
 #include "AsusROGAllyController.h"
+#include "AsusROGStrixLCController.h"
 #include "AsusAuraMouseGen1Controller.h"
 #include "AsusAuraMousematController.h"
 #include "AsusAuraMonitorController.h"
@@ -19,7 +20,7 @@
 #include "RGBController_AsusAuraMouse.h"
 #include "RGBController_AsusAuraMousemat.h"
 #include "RGBController_AsusROGAlly.h"
-#include "RGBController_ROGStrixLC_Controller.h"
+#include "RGBController_AsusROGStrixLC.h"
 #include "RGBController_AsusROGSpatha.h"
 #include "RGBController_AsusROGStrixEvolve.h"
 #include "RGBController_AsusAuraMonitor.h"
@@ -226,9 +227,9 @@ void DetectAsusAuraUSBROGStrixLC(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        ROGStrixLC_Controller* controller                   = new ROGStrixLC_Controller(dev, info->path);
-        RGBController_ROGStrixLC_Controller* rgb_controller = new RGBController_ROGStrixLC_Controller(controller);
-        rgb_controller->name                                = name;
+        AsusROGStrixLCController*     controller     = new AsusROGStrixLCController(dev, info->path);
+        RGBController_AsusROGStrixLC* rgb_controller = new RGBController_AsusROGStrixLC(controller);
+        rgb_controller->name                         = name;
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
diff --git a/Controllers/AsusAuraUSBController/AsusROGAllyController.cpp b/Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusROGAllyController.cpp
rename to Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.cpp
diff --git a/Controllers/AsusAuraUSBController/AsusROGAllyController.h b/Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/AsusROGAllyController.h
rename to Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.h
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGAlly.cpp b/Controllers/AsusAuraUSBController/AsusROGAllyController/RGBController_AsusROGAlly.cpp
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGAlly.cpp
rename to Controllers/AsusAuraUSBController/AsusROGAllyController/RGBController_AsusROGAlly.cpp
diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusROGAlly.h b/Controllers/AsusAuraUSBController/AsusROGAllyController/RGBController_AsusROGAlly.h
similarity index 100%
rename from Controllers/AsusAuraUSBController/RGBController_AsusROGAlly.h
rename to Controllers/AsusAuraUSBController/AsusROGAllyController/RGBController_AsusROGAlly.h
diff --git a/Controllers/AsusAuraUSBController/ROGStrixLC_Controller.cpp b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.cpp
similarity index 82%
rename from Controllers/AsusAuraUSBController/ROGStrixLC_Controller.cpp
rename to Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.cpp
index e2dc06b2..8429ee96 100644
--- a/Controllers/AsusAuraUSBController/ROGStrixLC_Controller.cpp
+++ b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.cpp
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  ROGStrixLC_Controller.cpp                                          |
+|  AsusROGStrixLCController.cpp                                       |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -8,9 +8,9 @@
 |                                                                     |
 \*-------------------------------------------------------------------*/
 
-#include "ROGStrixLC_Controller.h"
+#include "AsusROGStrixLCController.h"
 
-ROGStrixLC_Controller::ROGStrixLC_Controller(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
+AsusROGStrixLCController::AsusROGStrixLCController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
 {
     /*-----------------------------------------------------*\
     | Add addressable devices                               |
@@ -21,17 +21,17 @@ ROGStrixLC_Controller::ROGStrixLC_Controller(hid_device* dev_handle, const char*
     device_info.push_back({0x00, 0x00, 4, 0, AuraDeviceType::FIXED});
 }
 
-ROGStrixLC_Controller::~ROGStrixLC_Controller()
+AsusROGStrixLCController::~AsusROGStrixLCController()
 {
     // Device will close at AuraUSBController destructor
 }
 
-std::string ROGStrixLC_Controller::GetLocation()
+std::string AsusROGStrixLCController::GetLocation()
 {
     return("HID: " + location);
 }
 
-void ROGStrixLC_Controller::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
+void AsusROGStrixLCController::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |
@@ -39,7 +39,7 @@ void ROGStrixLC_Controller::SetMode(unsigned char /*channel*/, unsigned char /*m
     \*---------------------------------------------------------*/
 }
 
-void ROGStrixLC_Controller::SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour)
+void AsusROGStrixLCController::SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour)
 {
     bool needs_update       = !( (current_mode == mode) && (ToRGBColor(current_red, current_green, current_blue) == colour) && (current_speed == speed) && (current_direction == direction));
 
@@ -55,7 +55,7 @@ void ROGStrixLC_Controller::SetMode(unsigned char mode, unsigned char speed, uns
     }
 }
 
-void ROGStrixLC_Controller::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
+void AsusROGStrixLCController::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |
@@ -63,7 +63,7 @@ void ROGStrixLC_Controller::SetChannelLEDs(unsigned char /*channel*/, RGBColor*
     \*---------------------------------------------------------*/
 }
 
-void ROGStrixLC_Controller::SetLedsDirect(RGBColor * led_colours, uint8_t led_count)
+void AsusROGStrixLCController::SetLedsDirect(RGBColor * led_colours, uint8_t led_count)
 {
     uint8_t buffer[write_packet_size]   = { 0xEC, 0x40, 0x00, 0xFF, led_count };
 
@@ -90,7 +90,7 @@ void ROGStrixLC_Controller::SetLedsDirect(RGBColor * led_colours, uint8_t led_co
     hid_write(dev, buffer, write_packet_size);
 }
 
-void ROGStrixLC_Controller::GetStatus()
+void AsusROGStrixLCController::GetStatus()
 {
     uint8_t buffer[write_packet_size]   = { 0xEC, 0x01, 0x02 };
 
@@ -102,7 +102,7 @@ void ROGStrixLC_Controller::GetStatus()
     current_blue            = buffer[ROGSTRIXLC_BLUE_BYTE - 1];
 }
 
-void ROGStrixLC_Controller::SendUpdate()
+void AsusROGStrixLCController::SendUpdate()
 {
     uint8_t buffer[write_packet_size];
 
diff --git a/Controllers/AsusAuraUSBController/ROGStrixLC_Controller.h b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h
similarity index 94%
rename from Controllers/AsusAuraUSBController/ROGStrixLC_Controller.h
rename to Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h
index ed44add8..ada5a352 100644
--- a/Controllers/AsusAuraUSBController/ROGStrixLC_Controller.h
+++ b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  ROGStrixLC_Controller.h                                            |
+|  AsusROGStrixLCController.h                                         |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -54,11 +54,11 @@ enum
     ROGSTRIXLC_CONTROLLER_SPEED_FASTEST     = 0x00, // Fastest speed
 };
 
-class ROGStrixLC_Controller : public AuraUSBController
+class AsusROGStrixLCController : public AuraUSBController
 {
 public:
-    ROGStrixLC_Controller(hid_device* dev_handle, const char* path);
-    ~ROGStrixLC_Controller();
+    AsusROGStrixLCController(hid_device* dev_handle, const char* path);
+    ~AsusROGStrixLCController();
 
     std::string             GetLocation();
 
diff --git a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.cpp
similarity index 91%
rename from Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp
rename to Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.cpp
index 84f8e451..b7fb343d 100644
--- a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp
+++ b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.cpp
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  RGBController_ROGStrixLC_Controller.cpp                            |
+|  RGBController_AsusROGStrixLC.cpp                                   |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -9,7 +9,7 @@
 \*-------------------------------------------------------------------*/
 
 #include "RGBControllerKeyNames.h"
-#include "RGBController_ROGStrixLC_Controller.h"
+#include "RGBController_AsusROGStrixLC.h"
 
 /**------------------------------------------------------------------*\
     @name Asus ROG Strix Liquid Cooler
@@ -22,7 +22,7 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_ROGStrixLC_Controller::RGBController_ROGStrixLC_Controller(ROGStrixLC_Controller *controller_ptr)
+RGBController_AsusROGStrixLC::RGBController_AsusROGStrixLC(AsusROGStrixLCController *controller_ptr)
 {
     controller                  = controller_ptr;
     uint8_t speed               = ROGSTRIXLC_CONTROLLER_SPEED_NORMAL;
@@ -126,12 +126,12 @@ RGBController_ROGStrixLC_Controller::RGBController_ROGStrixLC_Controller(ROGStri
     SetupZones();
 }
 
-RGBController_ROGStrixLC_Controller::~RGBController_ROGStrixLC_Controller()
+RGBController_AsusROGStrixLC::~RGBController_AsusROGStrixLC()
 {
     delete controller;
 }
 
-void RGBController_ROGStrixLC_Controller::SetupZones()
+void RGBController_AsusROGStrixLC::SetupZones()
 {
     /*-------------------------------------------------*\
     | Set up zones                                      |
@@ -171,14 +171,14 @@ void RGBController_ROGStrixLC_Controller::SetupZones()
     SetupColors();
 }
 
-void RGBController_ROGStrixLC_Controller::ResizeZone(int /*zone*/, int /*new_size*/)
+void RGBController_AsusROGStrixLC::ResizeZone(int /*zone*/, int /*new_size*/)
 {
     /*---------------------------------------------------------*\
     | This device does not support resizing zones               |
     \*---------------------------------------------------------*/
 }
 
-void RGBController_ROGStrixLC_Controller::DeviceUpdateLEDs()
+void RGBController_AsusROGStrixLC::DeviceUpdateLEDs()
 {
     for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -186,24 +186,24 @@ void RGBController_ROGStrixLC_Controller::DeviceUpdateLEDs()
     }
 }
 
-void RGBController_ROGStrixLC_Controller::UpdateZoneLEDs(int zone)
+void RGBController_AsusROGStrixLC::UpdateZoneLEDs(int zone)
 {
     controller->SetLedsDirect( zones[zone].colors, zones[zone].leds_count );
 }
 
-void RGBController_ROGStrixLC_Controller::UpdateSingleLED(int led)
+void RGBController_AsusROGStrixLC::UpdateSingleLED(int led)
 {
     UpdateZoneLEDs(GetLED_Zone(led));
 }
 
-void RGBController_ROGStrixLC_Controller::DeviceUpdateMode()
+void RGBController_AsusROGStrixLC::DeviceUpdateMode()
 {
     RGBColor colour         = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;
 
     controller->SetMode( modes[active_mode].value, modes[active_mode].speed, modes[active_mode].direction, colour );
 }
 
-int RGBController_ROGStrixLC_Controller::GetLED_Zone(int led_idx)
+int RGBController_AsusROGStrixLC::GetLED_Zone(int led_idx)
 {
     for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
diff --git a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.h
similarity index 76%
rename from Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h
rename to Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.h
index 5f5c27d2..101ac194 100644
--- a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h
+++ b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.h
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  RGBController_ROGStrixLC_Controller.h                              |
+|  RGBController_AsusROGStrixLC.h                                     |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -11,14 +11,14 @@
 #pragma once
 #include "LogManager.h"
 #include "RGBController.h"
-#include "ROGStrixLC_Controller.h"
+#include "AsusROGStrixLCController.h"
 #include <vector>
 
-class RGBController_ROGStrixLC_Controller : public RGBController
+class RGBController_AsusROGStrixLC : public RGBController
 {
 public:
-    RGBController_ROGStrixLC_Controller(ROGStrixLC_Controller* controller_ptr);
-    ~RGBController_ROGStrixLC_Controller();
+    RGBController_AsusROGStrixLC(AsusROGStrixLCController* controller_ptr);
+    ~RGBController_AsusROGStrixLC();
 
     void                SetupZones();
     void                ResizeZone(int zone, int new_size);
@@ -32,5 +32,5 @@ private:
     int                 GetDeviceMode();
     int                 GetLED_Zone(int led_idx);
 
-    ROGStrixLC_Controller* controller;
+    AsusROGStrixLCController* controller;
 };
diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController.cpp
rename to Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp
diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController.h
rename to Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusCerberusKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusCerberusKeyboard.cpp
rename to Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusCerberusKeyboard.h b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusCerberusKeyboard.h
rename to Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h
diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController.cpp
rename to Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp
diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController.h
rename to Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusSagarisKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusSagarisKeyboard.cpp
rename to Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusSagarisKeyboard.h b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusSagarisKeyboard.h
rename to Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h
diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController.cpp b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusStrixClawController.cpp
rename to Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp
diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController.h b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/AsusStrixClawController.h
rename to Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp b/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.cpp
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp
rename to Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.cpp
diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h b/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h
similarity index 100%
rename from Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h
rename to Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h
diff --git a/Controllers/CoolerMasterController/CMARGBcontroller.cpp b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp
similarity index 99%
rename from Controllers/CoolerMasterController/CMARGBcontroller.cpp
rename to Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp
index a2eebc56..cd14b54a 100644
--- a/Controllers/CoolerMasterController/CMARGBcontroller.cpp
+++ b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp
@@ -7,7 +7,7 @@
 |                                                                     |
 \*-------------------------------------------------------------------*/
 
-#include "CMARGBcontroller.h"
+#include "CMARGBController.h"
 
 CMARGBController::CMARGBController(hid_device* dev_handle, char *_path, unsigned char _zone_idx, std::shared_ptr<std::mutex> cm_mutex)
 {
diff --git a/Controllers/CoolerMasterController/CMARGBcontroller.h b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMARGBcontroller.h
rename to Controllers/CoolerMasterController/CMARGBController/CMARGBController.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMARGBController.cpp
rename to Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.h b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
similarity index 95%
rename from Controllers/CoolerMasterController/RGBController_CMARGBController.h
rename to Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
index bd5ff079..02264b8e 100644
--- a/Controllers/CoolerMasterController/RGBController_CMARGBController.h
+++ b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
@@ -9,7 +9,7 @@
 
 #pragma once
 #include "RGBController.h"
-#include "CMARGBcontroller.h"
+#include "CMARGBController.h"
 #include <vector>
 
 #define first_zone(zn)          ((zones.size() > 1) ? 1 : 0)
diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1controller.cpp b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp
similarity index 99%
rename from Controllers/CoolerMasterController/CMARGBGen2A1controller.cpp
rename to Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp
index a845a98c..16ecb8f7 100644
--- a/Controllers/CoolerMasterController/CMARGBGen2A1controller.cpp
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  CMARGBGen2A1controller.cpp                                         |
+|  CMARGBGen2A1Controller.cpp                                         |
 |                                                                     |
 |  Driver for Coolermaster ARGB Gen 2 A1 USB Controller               |
 |                                                                     |
@@ -7,7 +7,7 @@
 |                                                                     |
 \*-------------------------------------------------------------------*/
 
-#include "CMARGBGen2A1controller.h"
+#include "CMARGBGen2A1Controller.h"
 #include <cstring>
 
 CMARGBGen2A1controller::CMARGBGen2A1controller(hid_device* dev_handle, const hid_device_info& info)
diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1controller.h b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.h
similarity index 98%
rename from Controllers/CoolerMasterController/CMARGBGen2A1controller.h
rename to Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.h
index 5da345b8..708c5d94 100644
--- a/Controllers/CoolerMasterController/CMARGBGen2A1controller.h
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.h
@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  CMARGBGen2A1controller.h                                           |
+|  CMARGBGen2A1Controller.h                                           |
 |                                                                     |
 |  Driver for Coolermaster ARGB Gen 2 A1 USB Controller               |
 |                                                                     |
diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.cpp b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.cpp
rename to Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.h b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
similarity index 95%
rename from Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.h
rename to Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
index 577f2f0f..e19c8b19 100644
--- a/Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.h
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
@@ -9,7 +9,7 @@
 
 #pragma once
 #include "RGBController.h"
-#include "CMARGBGen2A1controller.h"
+#include "CMARGBGen2A1Controller.h"
 #include <vector>
 
 class RGBController_CMARGBGen2A1Controller : public RGBController
@@ -27,6 +27,6 @@ public:
     void DeviceUpdateMode();
     void DeviceSaveMode();
 
-private:   
+private:
     CMARGBGen2A1controller*   controller;
 };
diff --git a/Controllers/CoolerMasterController/CMKeyboardAbstractController.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardAbstractController.cpp
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp
diff --git a/Controllers/CoolerMasterController/CMKeyboardAbstractController.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardAbstractController.h
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h
diff --git a/Controllers/CoolerMasterController/CMKeyboardDevices.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardDevices.cpp
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp
diff --git a/Controllers/CoolerMasterController/CMKeyboardDevices.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardDevices.h
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h
diff --git a/Controllers/CoolerMasterController/CMKeyboardV1Controller.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardV1Controller.cpp
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp
diff --git a/Controllers/CoolerMasterController/CMKeyboardV1Controller.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardV1Controller.h
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h
diff --git a/Controllers/CoolerMasterController/CMKeyboardV2Controller.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardV2Controller.cpp
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp
diff --git a/Controllers/CoolerMasterController/CMKeyboardV2Controller.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMKeyboardV2Controller.h
rename to Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMKeyboardController.cpp b/Controllers/CoolerMasterController/CMKeyboardController/RGBController_CMKeyboardController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMKeyboardController.cpp
rename to Controllers/CoolerMasterController/CMKeyboardController/RGBController_CMKeyboardController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMKeyboardController.h b/Controllers/CoolerMasterController/CMKeyboardController/RGBController_CMKeyboardController.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMKeyboardController.h
rename to Controllers/CoolerMasterController/CMKeyboardController/RGBController_CMKeyboardController.h
diff --git a/Controllers/CoolerMasterController/CMMM711Controller.cpp b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMMM711Controller.cpp
rename to Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp
diff --git a/Controllers/CoolerMasterController/CMMM711Controller.h b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMMM711Controller.h
rename to Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp
rename to Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMMM711Controller.h b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMM711Controller.h
rename to Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
diff --git a/Controllers/CoolerMasterController/CMMMController.cpp b/Controllers/CoolerMasterController/CMMMController/CMMMController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMMMController.cpp
rename to Controllers/CoolerMasterController/CMMMController/CMMMController.cpp
diff --git a/Controllers/CoolerMasterController/CMMMController.h b/Controllers/CoolerMasterController/CMMMController/CMMMController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMMMController.h
rename to Controllers/CoolerMasterController/CMMMController/CMMMController.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMMMController.cpp b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMMController.cpp
rename to Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMMMController.h b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMMController.h
rename to Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
diff --git a/Controllers/CoolerMasterController/CMMP750Controller.cpp b/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMMP750Controller.cpp
rename to Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.cpp
diff --git a/Controllers/CoolerMasterController/CMMP750Controller.h b/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMMP750Controller.h
rename to Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp
rename to Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.h b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMP750Controller.h
rename to Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
diff --git a/Controllers/CoolerMasterController/CMMonitorController.cpp b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMMonitorController.cpp
rename to Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp
diff --git a/Controllers/CoolerMasterController/CMMonitorController.h b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMMonitorController.h
rename to Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMMonitorController.cpp b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMonitorController.cpp
rename to Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMMonitorController.h b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMMonitorController.h
rename to Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
diff --git a/Controllers/CoolerMasterController/CMR6000Controller.cpp b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMR6000Controller.cpp
rename to Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp
diff --git a/Controllers/CoolerMasterController/CMR6000Controller.h b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMR6000Controller.h
rename to Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp
rename to Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.h b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMR6000Controller.h
rename to Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
diff --git a/Controllers/CoolerMasterController/CMRGBController.cpp b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMRGBController.cpp
rename to Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp
diff --git a/Controllers/CoolerMasterController/CMRGBController.h b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMRGBController.h
rename to Controllers/CoolerMasterController/CMRGBController/CMRGBController.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMRGBController.cpp b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMRGBController.cpp
rename to Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMRGBController.h b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMRGBController.h
rename to Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
diff --git a/Controllers/CoolerMasterController/CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/CMSmallARGBController.cpp
rename to Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp
diff --git a/Controllers/CoolerMasterController/CMSmallARGBController.h b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h
similarity index 100%
rename from Controllers/CoolerMasterController/CMSmallARGBController.h
rename to Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h
diff --git a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp
rename to Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp
diff --git a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.h b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h
similarity index 100%
rename from Controllers/CoolerMasterController/RGBController_CMSmallARGBController.h
rename to Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h
diff --git a/Controllers/CougarController/CougarKeyboardController.cpp b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
similarity index 100%
rename from Controllers/CougarController/CougarKeyboardController.cpp
rename to Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
diff --git a/Controllers/CougarController/CougarKeyboardController.h b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
similarity index 100%
rename from Controllers/CougarController/CougarKeyboardController.h
rename to Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
diff --git a/Controllers/CougarController/RGBController_CougarKeyboard.cpp b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp
similarity index 100%
rename from Controllers/CougarController/RGBController_CougarKeyboard.cpp
rename to Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp
diff --git a/Controllers/CougarController/RGBController_CougarKeyboard.h b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h
similarity index 100%
rename from Controllers/CougarController/RGBController_CougarKeyboard.h
rename to Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h
diff --git a/Controllers/CougarController/CougarRevengerSTController.cpp b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
similarity index 100%
rename from Controllers/CougarController/CougarRevengerSTController.cpp
rename to Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
diff --git a/Controllers/CougarController/CougarRevengerSTController.h b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
similarity index 100%
rename from Controllers/CougarController/CougarRevengerSTController.h
rename to Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
diff --git a/Controllers/CougarController/RGBController_CougarRevengerST.cpp b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp
similarity index 100%
rename from Controllers/CougarController/RGBController_CougarRevengerST.cpp
rename to Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp
diff --git a/Controllers/CougarController/RGBController_CougarRevengerST.h b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h
similarity index 100%
rename from Controllers/CougarController/RGBController_CougarRevengerST.h
rename to Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h
diff --git a/Controllers/EVGAUSBController/EVGAKeyboardController.cpp b/Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.cpp
similarity index 100%
rename from Controllers/EVGAUSBController/EVGAKeyboardController.cpp
rename to Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.cpp
diff --git a/Controllers/EVGAUSBController/EVGAKeyboardController.h b/Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.h
similarity index 100%
rename from Controllers/EVGAUSBController/EVGAKeyboardController.h
rename to Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.h
diff --git a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp b/Controllers/EVGAUSBController/EVGAKeyboardController/RGBController_EVGAKeyboard.cpp
similarity index 100%
rename from Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp
rename to Controllers/EVGAUSBController/EVGAKeyboardController/RGBController_EVGAKeyboard.cpp
diff --git a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h b/Controllers/EVGAUSBController/EVGAKeyboardController/RGBController_EVGAKeyboard.h
similarity index 100%
rename from Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h
rename to Controllers/EVGAUSBController/EVGAKeyboardController/RGBController_EVGAKeyboard.h
diff --git a/Controllers/EVGAUSBController/EVGAMouseController.cpp b/Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.cpp
similarity index 100%
rename from Controllers/EVGAUSBController/EVGAMouseController.cpp
rename to Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.cpp
diff --git a/Controllers/EVGAUSBController/EVGAMouseController.h b/Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.h
similarity index 100%
rename from Controllers/EVGAUSBController/EVGAMouseController.h
rename to Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.h
diff --git a/Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp b/Controllers/EVGAUSBController/EVGAMouseController/RGBController_EVGAMouse.cpp
similarity index 100%
rename from Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp
rename to Controllers/EVGAUSBController/EVGAMouseController/RGBController_EVGAMouse.cpp
diff --git a/Controllers/EVGAUSBController/RGBController_EVGAMouse.h b/Controllers/EVGAUSBController/EVGAMouseController/RGBController_EVGAMouse.h
similarity index 100%
rename from Controllers/EVGAUSBController/RGBController_EVGAMouse.h
rename to Controllers/EVGAUSBController/EVGAMouseController/RGBController_EVGAMouse.h
diff --git a/Controllers/GainwardGPUController/GainwardGPUv1Controller.cpp b/Controllers/GainwardGPUController/GainwardGPUv1Controller/GainwardGPUv1Controller.cpp
similarity index 100%
rename from Controllers/GainwardGPUController/GainwardGPUv1Controller.cpp
rename to Controllers/GainwardGPUController/GainwardGPUv1Controller/GainwardGPUv1Controller.cpp
diff --git a/Controllers/GainwardGPUController/GainwardGPUv1Controller.h b/Controllers/GainwardGPUController/GainwardGPUv1Controller/GainwardGPUv1Controller.h
similarity index 100%
rename from Controllers/GainwardGPUController/GainwardGPUv1Controller.h
rename to Controllers/GainwardGPUController/GainwardGPUv1Controller/GainwardGPUv1Controller.h
diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp b/Controllers/GainwardGPUController/GainwardGPUv1Controller/RGBController_GainwardGPUv1.cpp
similarity index 100%
rename from Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp
rename to Controllers/GainwardGPUController/GainwardGPUv1Controller/RGBController_GainwardGPUv1.cpp
diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.h b/Controllers/GainwardGPUController/GainwardGPUv1Controller/RGBController_GainwardGPUv1.h
similarity index 100%
rename from Controllers/GainwardGPUController/RGBController_GainwardGPUv1.h
rename to Controllers/GainwardGPUController/GainwardGPUv1Controller/RGBController_GainwardGPUv1.h
diff --git a/Controllers/GainwardGPUController/GainwardGPUv2Controller.cpp b/Controllers/GainwardGPUController/GainwardGPUv2Controller/GainwardGPUv2Controller.cpp
similarity index 100%
rename from Controllers/GainwardGPUController/GainwardGPUv2Controller.cpp
rename to Controllers/GainwardGPUController/GainwardGPUv2Controller/GainwardGPUv2Controller.cpp
diff --git a/Controllers/GainwardGPUController/GainwardGPUv2Controller.h b/Controllers/GainwardGPUController/GainwardGPUv2Controller/GainwardGPUv2Controller.h
similarity index 100%
rename from Controllers/GainwardGPUController/GainwardGPUv2Controller.h
rename to Controllers/GainwardGPUController/GainwardGPUv2Controller/GainwardGPUv2Controller.h
diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
similarity index 100%
rename from Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp
rename to Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.h b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
similarity index 100%
rename from Controllers/GainwardGPUController/RGBController_GainwardGPUv2.h
rename to Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
diff --git a/Controllers/HoltekController/HoltekA070Controller.cpp b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
similarity index 100%
rename from Controllers/HoltekController/HoltekA070Controller.cpp
rename to Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
diff --git a/Controllers/HoltekController/HoltekA070Controller.h b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h
similarity index 100%
rename from Controllers/HoltekController/HoltekA070Controller.h
rename to Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h
diff --git a/Controllers/HoltekController/RGBController_HoltekA070.cpp b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
similarity index 100%
rename from Controllers/HoltekController/RGBController_HoltekA070.cpp
rename to Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
diff --git a/Controllers/HoltekController/RGBController_HoltekA070.h b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h
similarity index 100%
rename from Controllers/HoltekController/RGBController_HoltekA070.h
rename to Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h
diff --git a/Controllers/HoltekController/HoltekA1FAController.cpp b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
similarity index 100%
rename from Controllers/HoltekController/HoltekA1FAController.cpp
rename to Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
diff --git a/Controllers/HoltekController/HoltekA1FAController.h b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h
similarity index 100%
rename from Controllers/HoltekController/HoltekA1FAController.h
rename to Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h
diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
similarity index 100%
rename from Controllers/HoltekController/RGBController_HoltekA1FA.cpp
rename to Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.h b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h
similarity index 100%
rename from Controllers/HoltekController/RGBController_HoltekA1FA.h
rename to Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller.h b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyEliteController.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController.h b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyEliteController.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyFPSController.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController.h b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyFPSController.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller.h b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins60and65.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins60and65.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins60and65.h b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins60and65.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.h
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.h
similarity index 100%
rename from Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h
rename to Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.h
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireDartController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireDartController/HyperXPulsefireDartController.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireDartController.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireDartController/HyperXPulsefireDartController.cpp
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireDartController.h b/Controllers/HyperXMouseController/HyperXPulsefireDartController/HyperXPulsefireDartController.h
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireDartController.h
rename to Controllers/HyperXMouseController/HyperXPulsefireDartController/HyperXPulsefireDartController.h
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp b/Controllers/HyperXMouseController/HyperXPulsefireDartController/RGBController_HyperXPulsefireDart.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireDartController/RGBController_HyperXPulsefireDart.cpp
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h b/Controllers/HyperXMouseController/HyperXPulsefireDartController/RGBController_HyperXPulsefireDart.h
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h
rename to Controllers/HyperXMouseController/HyperXPulsefireDartController/RGBController_HyperXPulsefireDart.h
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController/HyperXPulsefireFPSProController.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireFPSProController/HyperXPulsefireFPSProController.cpp
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.h b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController/HyperXPulsefireFPSProController.h
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireFPSProController.h
rename to Controllers/HyperXMouseController/HyperXPulsefireFPSProController/HyperXPulsefireFPSProController.h
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController/RGBController_HyperXPulsefireFPSPro.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireFPSProController/RGBController_HyperXPulsefireFPSPro.cpp
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController/RGBController_HyperXPulsefireFPSPro.h
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h
rename to Controllers/HyperXMouseController/HyperXPulsefireFPSProController/RGBController_HyperXPulsefireFPSPro.h
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireHasteController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireHasteController/HyperXPulsefireHasteController.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireHasteController.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireHasteController/HyperXPulsefireHasteController.cpp
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireHasteController.h b/Controllers/HyperXMouseController/HyperXPulsefireHasteController/HyperXPulsefireHasteController.h
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireHasteController.h
rename to Controllers/HyperXMouseController/HyperXPulsefireHasteController/HyperXPulsefireHasteController.h
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp b/Controllers/HyperXMouseController/HyperXPulsefireHasteController/RGBController_HyperXPulsefireHaste.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireHasteController/RGBController_HyperXPulsefireHaste.cpp
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h b/Controllers/HyperXMouseController/HyperXPulsefireHasteController/RGBController_HyperXPulsefireHaste.h
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h
rename to Controllers/HyperXMouseController/HyperXPulsefireHasteController/RGBController_HyperXPulsefireHaste.h
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireRaidController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireRaidController.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.cpp
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireRaidController.h b/Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.h
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireRaidController.h
rename to Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.h
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp b/Controllers/HyperXMouseController/HyperXPulsefireRaidController/RGBController_HyperXPulsefireRaid.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireRaidController/RGBController_HyperXPulsefireRaid.cpp
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h b/Controllers/HyperXMouseController/HyperXPulsefireRaidController/RGBController_HyperXPulsefireRaid.h
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h
rename to Controllers/HyperXMouseController/HyperXPulsefireRaidController/RGBController_HyperXPulsefireRaid.h
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController/HyperXPulsefireSurgeController.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireSurgeController/HyperXPulsefireSurgeController.cpp
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.h b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController/HyperXPulsefireSurgeController.h
similarity index 100%
rename from Controllers/HyperXMouseController/HyperXPulsefireSurgeController.h
rename to Controllers/HyperXMouseController/HyperXPulsefireSurgeController/HyperXPulsefireSurgeController.h
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController/RGBController_HyperXPulsefireSurge.cpp
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp
rename to Controllers/HyperXMouseController/HyperXPulsefireSurgeController/RGBController_HyperXPulsefireSurge.cpp
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController/RGBController_HyperXPulsefireSurge.h
similarity index 100%
rename from Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h
rename to Controllers/HyperXMouseController/HyperXPulsefireSurgeController/RGBController_HyperXPulsefireSurge.h
diff --git a/Controllers/LenovoControllers/Lenovo4ZoneUSBController.cpp b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBController.cpp
similarity index 100%
rename from Controllers/LenovoControllers/Lenovo4ZoneUSBController.cpp
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBController.cpp
diff --git a/Controllers/LenovoControllers/Lenovo4ZoneUSBController.h b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBController.h
similarity index 100%
rename from Controllers/LenovoControllers/Lenovo4ZoneUSBController.h
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBController.h
diff --git a/Controllers/LenovoControllers/Lenovo4ZoneUSBDetect.cpp b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBDetect.cpp
similarity index 100%
rename from Controllers/LenovoControllers/Lenovo4ZoneUSBDetect.cpp
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/Lenovo4ZoneUSBDetect.cpp
diff --git a/Controllers/LenovoControllers/LenovoDevices4Zone.h b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/LenovoDevices4Zone.h
similarity index 100%
rename from Controllers/LenovoControllers/LenovoDevices4Zone.h
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/LenovoDevices4Zone.h
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo4ZoneUSB.cpp b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/RGBController_Lenovo4ZoneUSB.cpp
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo4ZoneUSB.cpp
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/RGBController_Lenovo4ZoneUSB.cpp
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo4ZoneUSB.h b/Controllers/LenovoControllers/Lenovo4ZoneUSBController/RGBController_Lenovo4ZoneUSB.h
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo4ZoneUSB.h
rename to Controllers/LenovoControllers/Lenovo4ZoneUSBController/RGBController_Lenovo4ZoneUSB.h
diff --git a/Controllers/LenovoControllers/LenovoGen7USBController.cpp b/Controllers/LenovoControllers/LenovoGen7USBController/LenovoGen7USBController.cpp
similarity index 100%
rename from Controllers/LenovoControllers/LenovoGen7USBController.cpp
rename to Controllers/LenovoControllers/LenovoGen7USBController/LenovoGen7USBController.cpp
diff --git a/Controllers/LenovoControllers/LenovoGen7USBController.h b/Controllers/LenovoControllers/LenovoGen7USBController/LenovoGen7USBController.h
similarity index 100%
rename from Controllers/LenovoControllers/LenovoGen7USBController.h
rename to Controllers/LenovoControllers/LenovoGen7USBController/LenovoGen7USBController.h
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp b/Controllers/LenovoControllers/LenovoGen7USBController/RGBController_Lenovo_Gen7USB.cpp
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.cpp
rename to Controllers/LenovoControllers/LenovoGen7USBController/RGBController_Lenovo_Gen7USB.cpp
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.h b/Controllers/LenovoControllers/LenovoGen7USBController/RGBController_Lenovo_Gen7USB.h
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo_Gen7USB.h
rename to Controllers/LenovoControllers/LenovoGen7USBController/RGBController_Lenovo_Gen7USB.h
diff --git a/Controllers/LenovoControllers/LenovoM300Controller.cpp b/Controllers/LenovoControllers/LenovoM300Controller/LenovoM300Controller.cpp
similarity index 100%
rename from Controllers/LenovoControllers/LenovoM300Controller.cpp
rename to Controllers/LenovoControllers/LenovoM300Controller/LenovoM300Controller.cpp
diff --git a/Controllers/LenovoControllers/LenovoM300Controller.h b/Controllers/LenovoControllers/LenovoM300Controller/LenovoM300Controller.h
similarity index 100%
rename from Controllers/LenovoControllers/LenovoM300Controller.h
rename to Controllers/LenovoControllers/LenovoM300Controller/LenovoM300Controller.h
diff --git a/Controllers/LenovoControllers/LenovoMouseDetect.cpp b/Controllers/LenovoControllers/LenovoM300Controller/LenovoMouseDetect.cpp
similarity index 100%
rename from Controllers/LenovoControllers/LenovoMouseDetect.cpp
rename to Controllers/LenovoControllers/LenovoM300Controller/LenovoMouseDetect.cpp
diff --git a/Controllers/LenovoControllers/RGBController_LenovoM300.cpp b/Controllers/LenovoControllers/LenovoM300Controller/RGBController_LenovoM300.cpp
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_LenovoM300.cpp
rename to Controllers/LenovoControllers/LenovoM300Controller/RGBController_LenovoM300.cpp
diff --git a/Controllers/LenovoControllers/RGBController_LenovoM300.h b/Controllers/LenovoControllers/LenovoM300Controller/RGBController_LenovoM300.h
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_LenovoM300.h
rename to Controllers/LenovoControllers/LenovoM300Controller/RGBController_LenovoM300.h
diff --git a/Controllers/LenovoControllers/LenovoUSBController.cpp b/Controllers/LenovoControllers/LenovoUSBController/LenovoUSBController.cpp
similarity index 100%
rename from Controllers/LenovoControllers/LenovoUSBController.cpp
rename to Controllers/LenovoControllers/LenovoUSBController/LenovoUSBController.cpp
diff --git a/Controllers/LenovoControllers/LenovoUSBController.h b/Controllers/LenovoControllers/LenovoUSBController/LenovoUSBController.h
similarity index 100%
rename from Controllers/LenovoControllers/LenovoUSBController.h
rename to Controllers/LenovoControllers/LenovoUSBController/LenovoUSBController.h
diff --git a/Controllers/LenovoControllers/RGBController_LenovoUSB.cpp b/Controllers/LenovoControllers/LenovoUSBController/RGBController_LenovoUSB.cpp
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_LenovoUSB.cpp
rename to Controllers/LenovoControllers/LenovoUSBController/RGBController_LenovoUSB.cpp
diff --git a/Controllers/LenovoControllers/RGBController_LenovoUSB.h b/Controllers/LenovoControllers/LenovoUSBController/RGBController_LenovoUSB.h
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_LenovoUSB.h
rename to Controllers/LenovoControllers/LenovoUSBController/RGBController_LenovoUSB.h
diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp
similarity index 100%
rename from Controllers/LenovoControllers/LenovoUSBController_Gen7_8.cpp
rename to Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp
diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h
similarity index 100%
rename from Controllers/LenovoControllers/LenovoUSBController_Gen7_8.h
rename to Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.cpp b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.cpp
rename to Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp
diff --git a/Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.h b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h
similarity index 100%
rename from Controllers/LenovoControllers/RGBController_Lenovo_Gen7_8.h
rename to Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController.cpp b/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiGAIITrinityController.cpp
rename to Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController.h b/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.h
similarity index 100%
rename from Controllers/LianLiController/LianLiGAIITrinityController.h
rename to Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.h
diff --git a/Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp
rename to Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiGAIITrinity.h b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiGAIITrinity.h
rename to Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
diff --git a/Controllers/LianLiController/LianLiUniHubALController.cpp b/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubALController.cpp
rename to Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp
diff --git a/Controllers/LianLiController/LianLiUniHubALController.h b/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.h
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubALController.h
rename to Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.h
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubAL.cpp b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubAL.cpp
rename to Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubAL.h b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubAL.h
rename to Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
diff --git a/Controllers/LianLiController/LianLiUniHubController.cpp b/Controllers/LianLiController/LianLiUniHubController/LianLiUniHubController.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubController.cpp
rename to Controllers/LianLiController/LianLiUniHubController/LianLiUniHubController.cpp
diff --git a/Controllers/LianLiController/LianLiUniHubController.h b/Controllers/LianLiController/LianLiUniHubController/LianLiUniHubController.h
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubController.h
rename to Controllers/LianLiController/LianLiUniHubController/LianLiUniHubController.h
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub.cpp b/Controllers/LianLiController/LianLiUniHubController/RGBController_LianLiUniHub.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHub.cpp
rename to Controllers/LianLiController/LianLiUniHubController/RGBController_LianLiUniHub.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub.h b/Controllers/LianLiController/LianLiUniHubController/RGBController_LianLiUniHub.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHub.h
rename to Controllers/LianLiController/LianLiUniHubController/RGBController_LianLiUniHub.h
diff --git a/Controllers/LianLiController/LianLiUniHubSLInfinityController.cpp b/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubSLInfinityController.cpp
rename to Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp
diff --git a/Controllers/LianLiController/LianLiUniHubSLInfinityController.h b/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.h
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubSLInfinityController.h
rename to Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.h
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubSLInfinity.cpp b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubSLInfinity.cpp
rename to Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubSLInfinity.h b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubSLInfinity.h
rename to Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
diff --git a/Controllers/LianLiController/LianLiUniHubSLV2Controller.cpp b/Controllers/LianLiController/LianLiUniHubSLV2Controller/LianLiUniHubSLV2Controller.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubSLV2Controller.cpp
rename to Controllers/LianLiController/LianLiUniHubSLV2Controller/LianLiUniHubSLV2Controller.cpp
diff --git a/Controllers/LianLiController/LianLiUniHubSLV2Controller.h b/Controllers/LianLiController/LianLiUniHubSLV2Controller/LianLiUniHubSLV2Controller.h
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHubSLV2Controller.h
rename to Controllers/LianLiController/LianLiUniHubSLV2Controller/LianLiUniHubSLV2Controller.h
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubSLV2.cpp
rename to Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHubSLV2.h b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHubSLV2.h
rename to Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
diff --git a/Controllers/LianLiController/LianLiUniHub_AL10Controller.cpp b/Controllers/LianLiController/LianLiUniHub_AL10Controller/LianLiUniHub_AL10Controller.cpp
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHub_AL10Controller.cpp
rename to Controllers/LianLiController/LianLiUniHub_AL10Controller/LianLiUniHub_AL10Controller.cpp
diff --git a/Controllers/LianLiController/LianLiUniHub_AL10Controller.h b/Controllers/LianLiController/LianLiUniHub_AL10Controller/LianLiUniHub_AL10Controller.h
similarity index 100%
rename from Controllers/LianLiController/LianLiUniHub_AL10Controller.h
rename to Controllers/LianLiController/LianLiUniHub_AL10Controller/LianLiUniHub_AL10Controller.h
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub_AL10.cpp b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHub_AL10.cpp
rename to Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub_AL10.h b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_LianLiUniHub_AL10.h
rename to Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
diff --git a/Controllers/LianLiController/RGBController_StrimerLConnect.cpp b/Controllers/LianLiController/StrimerLConnectController/RGBController_StrimerLConnect.cpp
similarity index 100%
rename from Controllers/LianLiController/RGBController_StrimerLConnect.cpp
rename to Controllers/LianLiController/StrimerLConnectController/RGBController_StrimerLConnect.cpp
diff --git a/Controllers/LianLiController/RGBController_StrimerLConnect.h b/Controllers/LianLiController/StrimerLConnectController/RGBController_StrimerLConnect.h
similarity index 100%
rename from Controllers/LianLiController/RGBController_StrimerLConnect.h
rename to Controllers/LianLiController/StrimerLConnectController/RGBController_StrimerLConnect.h
diff --git a/Controllers/LianLiController/StrimerLConnectController.cpp b/Controllers/LianLiController/StrimerLConnectController/StrimerLConnectController.cpp
similarity index 100%
rename from Controllers/LianLiController/StrimerLConnectController.cpp
rename to Controllers/LianLiController/StrimerLConnectController/StrimerLConnectController.cpp
diff --git a/Controllers/LianLiController/StrimerLConnectController.h b/Controllers/LianLiController/StrimerLConnectController/StrimerLConnectController.h
similarity index 100%
rename from Controllers/LianLiController/StrimerLConnectController.h
rename to Controllers/LianLiController/StrimerLConnectController/StrimerLConnectController.h
diff --git a/Controllers/MSIGPUController/MSIGPUController.cpp b/Controllers/MSIGPUController/MSIGPUController/MSIGPUController.cpp
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUController.cpp
rename to Controllers/MSIGPUController/MSIGPUController/MSIGPUController.cpp
diff --git a/Controllers/MSIGPUController/MSIGPUController.h b/Controllers/MSIGPUController/MSIGPUController/MSIGPUController.h
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUController.h
rename to Controllers/MSIGPUController/MSIGPUController/MSIGPUController.h
diff --git a/Controllers/MSIGPUController/MSIGPUControllerDetect.cpp b/Controllers/MSIGPUController/MSIGPUController/MSIGPUControllerDetect.cpp
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUControllerDetect.cpp
rename to Controllers/MSIGPUController/MSIGPUController/MSIGPUControllerDetect.cpp
diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp b/Controllers/MSIGPUController/MSIGPUController/RGBController_MSIGPU.cpp
similarity index 100%
rename from Controllers/MSIGPUController/RGBController_MSIGPU.cpp
rename to Controllers/MSIGPUController/MSIGPUController/RGBController_MSIGPU.cpp
diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.h b/Controllers/MSIGPUController/MSIGPUController/RGBController_MSIGPU.h
similarity index 100%
rename from Controllers/MSIGPUController/RGBController_MSIGPU.h
rename to Controllers/MSIGPUController/MSIGPUController/RGBController_MSIGPU.h
diff --git a/Controllers/MSIGPUController/MSIGPUv2Controller.cpp b/Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2Controller.cpp
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUv2Controller.cpp
rename to Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2Controller.cpp
diff --git a/Controllers/MSIGPUController/MSIGPUv2Controller.h b/Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2Controller.h
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUv2Controller.h
rename to Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2Controller.h
diff --git a/Controllers/MSIGPUController/MSIGPUv2ControllerDetect.cpp b/Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2ControllerDetect.cpp
similarity index 100%
rename from Controllers/MSIGPUController/MSIGPUv2ControllerDetect.cpp
rename to Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2ControllerDetect.cpp
diff --git a/Controllers/MSIGPUController/RGBController_MSIGPUv2.cpp b/Controllers/MSIGPUController/MSIGPUv2Controller/RGBController_MSIGPUv2.cpp
similarity index 100%
rename from Controllers/MSIGPUController/RGBController_MSIGPUv2.cpp
rename to Controllers/MSIGPUController/MSIGPUv2Controller/RGBController_MSIGPUv2.cpp
diff --git a/Controllers/MSIGPUController/RGBController_MSIGPUv2.h b/Controllers/MSIGPUController/MSIGPUv2Controller/RGBController_MSIGPUv2.h
similarity index 100%
rename from Controllers/MSIGPUController/RGBController_MSIGPUv2.h
rename to Controllers/MSIGPUController/MSIGPUv2Controller/RGBController_MSIGPUv2.h
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight112Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight112Controller.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.cpp
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight112Controller.h b/Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.h
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight112Controller.h
rename to Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.h
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight112.cpp b/Controllers/MSIMysticLightController/MSIMysticLight112Controller/RGBController_MSIMysticLight112.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight112.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight112Controller/RGBController_MSIMysticLight112.cpp
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight112.h b/Controllers/MSIMysticLightController/MSIMysticLight112Controller/RGBController_MSIMysticLight112.h
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight112.h
rename to Controllers/MSIMysticLightController/MSIMysticLight112Controller/RGBController_MSIMysticLight112.h
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.cpp
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight162Controller.h b/Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.h
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight162Controller.h
rename to Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.h
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp b/Controllers/MSIMysticLightController/MSIMysticLight162Controller/RGBController_MSIMysticLight162.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight162Controller/RGBController_MSIMysticLight162.cpp
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h b/Controllers/MSIMysticLightController/MSIMysticLight162Controller/RGBController_MSIMysticLight162.h
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h
rename to Controllers/MSIMysticLightController/MSIMysticLight162Controller/RGBController_MSIMysticLight162.h
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller.h b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight185Controller.h
rename to Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h
rename to Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight64Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight64Controller/MSIMysticLight64Controller.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight64Controller.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight64Controller/MSIMysticLight64Controller.cpp
diff --git a/Controllers/MSIMysticLightController/MSIMysticLight64Controller.h b/Controllers/MSIMysticLightController/MSIMysticLight64Controller/MSIMysticLight64Controller.h
similarity index 100%
rename from Controllers/MSIMysticLightController/MSIMysticLight64Controller.h
rename to Controllers/MSIMysticLightController/MSIMysticLight64Controller/MSIMysticLight64Controller.h
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight64.cpp b/Controllers/MSIMysticLightController/MSIMysticLight64Controller/RGBController_MSIMysticLight64.cpp
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight64.cpp
rename to Controllers/MSIMysticLightController/MSIMysticLight64Controller/RGBController_MSIMysticLight64.cpp
diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight64.h b/Controllers/MSIMysticLightController/MSIMysticLight64Controller/RGBController_MSIMysticLight64.h
similarity index 100%
rename from Controllers/MSIMysticLightController/RGBController_MSIMysticLight64.h
rename to Controllers/MSIMysticLightController/MSIMysticLight64Controller/RGBController_MSIMysticLight64.h
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/QMKOpenRGBRev9Controller.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/QMKOpenRGBRev9Controller.cpp
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/QMKOpenRGBRev9Controller.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/QMKOpenRGBRev9Controller.h
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/RGBController_QMKOpenRGBRev9.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/RGBController_QMKOpenRGBRev9.cpp
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/RGBController_QMKOpenRGBRev9.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller/RGBController_QMKOpenRGBRev9.h
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/QMKOpenRGBRevBController.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/QMKOpenRGBRevBController.cpp
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/QMKOpenRGBRevBController.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/QMKOpenRGBRevBController.h
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/RGBController_QMKOpenRGBRevB.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/RGBController_QMKOpenRGBRevB.cpp
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/RGBController_QMKOpenRGBRevB.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevBController/RGBController_QMKOpenRGBRevB.h
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/QMKOpenRGBRevDController.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/QMKOpenRGBRevDController.cpp
diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/QMKOpenRGBRevDController.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/QMKOpenRGBRevDController.h
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevD.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/RGBController_QMKOpenRGBRevD.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevD.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/RGBController_QMKOpenRGBRevD.cpp
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevD.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/RGBController_QMKOpenRGBRevD.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevD.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevDController/RGBController_QMKOpenRGBRevD.h
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevE.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevEController/RGBController_QMKOpenRGBRevE.cpp
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevE.cpp
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevEController/RGBController_QMKOpenRGBRevE.cpp
diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevE.h b/Controllers/QMKOpenRGBController/QMKOpenRGBRevEController/RGBController_QMKOpenRGBRevE.h
similarity index 100%
rename from Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevE.h
rename to Controllers/QMKOpenRGBController/QMKOpenRGBRevEController/RGBController_QMKOpenRGBRevE.h
diff --git a/Controllers/RazerController/RGBController_Razer.cpp b/Controllers/RazerController/RazerController/RGBController_Razer.cpp
similarity index 100%
rename from Controllers/RazerController/RGBController_Razer.cpp
rename to Controllers/RazerController/RazerController/RGBController_Razer.cpp
diff --git a/Controllers/RazerController/RGBController_Razer.h b/Controllers/RazerController/RazerController/RGBController_Razer.h
similarity index 100%
rename from Controllers/RazerController/RGBController_Razer.h
rename to Controllers/RazerController/RazerController/RGBController_Razer.h
diff --git a/Controllers/RazerController/RGBController_RazerAddressable.cpp b/Controllers/RazerController/RazerController/RGBController_RazerAddressable.cpp
similarity index 100%
rename from Controllers/RazerController/RGBController_RazerAddressable.cpp
rename to Controllers/RazerController/RazerController/RGBController_RazerAddressable.cpp
diff --git a/Controllers/RazerController/RGBController_RazerAddressable.h b/Controllers/RazerController/RazerController/RGBController_RazerAddressable.h
similarity index 100%
rename from Controllers/RazerController/RGBController_RazerAddressable.h
rename to Controllers/RazerController/RazerController/RGBController_RazerAddressable.h
diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController/RazerController.cpp
similarity index 100%
rename from Controllers/RazerController/RazerController.cpp
rename to Controllers/RazerController/RazerController/RazerController.cpp
diff --git a/Controllers/RazerController/RazerController.h b/Controllers/RazerController/RazerController/RazerController.h
similarity index 100%
rename from Controllers/RazerController/RazerController.h
rename to Controllers/RazerController/RazerController/RazerController.h
diff --git a/Controllers/RazerController/RGBController_RazerKraken.cpp b/Controllers/RazerController/RazerKrakenController/RGBController_RazerKraken.cpp
similarity index 100%
rename from Controllers/RazerController/RGBController_RazerKraken.cpp
rename to Controllers/RazerController/RazerKrakenController/RGBController_RazerKraken.cpp
diff --git a/Controllers/RazerController/RGBController_RazerKraken.h b/Controllers/RazerController/RazerKrakenController/RGBController_RazerKraken.h
similarity index 100%
rename from Controllers/RazerController/RGBController_RazerKraken.h
rename to Controllers/RazerController/RazerKrakenController/RGBController_RazerKraken.h
diff --git a/Controllers/RazerController/RazerKrakenController.cpp b/Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp
similarity index 100%
rename from Controllers/RazerController/RazerKrakenController.cpp
rename to Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp
diff --git a/Controllers/RazerController/RazerKrakenController.h b/Controllers/RazerController/RazerKrakenController/RazerKrakenController.h
similarity index 100%
rename from Controllers/RazerController/RazerKrakenController.h
rename to Controllers/RazerController/RazerKrakenController/RazerKrakenController.h
diff --git a/Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.cpp b/Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RGBController_RedSquareKeyrox.cpp
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.cpp
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RGBController_RedSquareKeyrox.cpp
diff --git a/Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.h b/Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RGBController_RedSquareKeyrox.h
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.h
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RGBController_RedSquareKeyrox.h
diff --git a/Controllers/RedSquareKeyroxController/RedSquareKeyroxController.cpp b/Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RedSquareKeyroxController.cpp
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RedSquareKeyroxController.cpp
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RedSquareKeyroxController.cpp
diff --git a/Controllers/RedSquareKeyroxController/RedSquareKeyroxController.h b/Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RedSquareKeyroxController.h
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RedSquareKeyroxController.h
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxController/RedSquareKeyroxController.h
diff --git a/Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.cpp b/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RGBController_RedSquareKeyroxTKLClassic.cpp
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.cpp
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RGBController_RedSquareKeyroxTKLClassic.cpp
diff --git a/Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.h b/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RGBController_RedSquareKeyroxTKLClassic.h
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.h
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RGBController_RedSquareKeyroxTKLClassic.h
diff --git a/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController.cpp b/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RedSquareKeyroxTKLClassicController.cpp
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController.cpp
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RedSquareKeyroxTKLClassicController.cpp
diff --git a/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController.h b/Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RedSquareKeyroxTKLClassicController.h
similarity index 100%
rename from Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController.h
rename to Controllers/RedSquareKeyroxController/RedSquareKeyroxTKLClassicController/RedSquareKeyroxTKLClassicController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatBurst.cpp b/Controllers/RoccatController/RoccatBurstController/RGBController_RoccatBurst.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatBurst.cpp
rename to Controllers/RoccatController/RoccatBurstController/RGBController_RoccatBurst.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatBurst.h b/Controllers/RoccatController/RoccatBurstController/RGBController_RoccatBurst.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatBurst.h
rename to Controllers/RoccatController/RoccatBurstController/RGBController_RoccatBurst.h
diff --git a/Controllers/RoccatController/RoccatBurstController.cpp b/Controllers/RoccatController/RoccatBurstController/RoccatBurstController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatBurstController.cpp
rename to Controllers/RoccatController/RoccatBurstController/RoccatBurstController.cpp
diff --git a/Controllers/RoccatController/RoccatBurstController.h b/Controllers/RoccatController/RoccatBurstController/RoccatBurstController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatBurstController.h
rename to Controllers/RoccatController/RoccatBurstController/RoccatBurstController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatBurstProAir.cpp b/Controllers/RoccatController/RoccatBurstProAirController/RGBController_RoccatBurstProAir.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatBurstProAir.cpp
rename to Controllers/RoccatController/RoccatBurstProAirController/RGBController_RoccatBurstProAir.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatBurstProAir.h b/Controllers/RoccatController/RoccatBurstProAirController/RGBController_RoccatBurstProAir.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatBurstProAir.h
rename to Controllers/RoccatController/RoccatBurstProAirController/RGBController_RoccatBurstProAir.h
diff --git a/Controllers/RoccatController/RoccatBurstProAirController.cpp b/Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatBurstProAirController.cpp
rename to Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.cpp
diff --git a/Controllers/RoccatController/RoccatBurstProAirController.h b/Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatBurstProAirController.h
rename to Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatElo.cpp b/Controllers/RoccatController/RoccatEloController/RGBController_RoccatElo.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatElo.cpp
rename to Controllers/RoccatController/RoccatEloController/RGBController_RoccatElo.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatElo.h b/Controllers/RoccatController/RoccatEloController/RGBController_RoccatElo.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatElo.h
rename to Controllers/RoccatController/RoccatEloController/RGBController_RoccatElo.h
diff --git a/Controllers/RoccatController/RoccatEloController.cpp b/Controllers/RoccatController/RoccatEloController/RoccatEloController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatEloController.cpp
rename to Controllers/RoccatController/RoccatEloController/RoccatEloController.cpp
diff --git a/Controllers/RoccatController/RoccatEloController.h b/Controllers/RoccatController/RoccatEloController/RoccatEloController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatEloController.h
rename to Controllers/RoccatController/RoccatEloController/RoccatEloController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp b/Controllers/RoccatController/RoccatHordeAimoController/RGBController_RoccatHordeAimo.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp
rename to Controllers/RoccatController/RoccatHordeAimoController/RGBController_RoccatHordeAimo.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatHordeAimo.h b/Controllers/RoccatController/RoccatHordeAimoController/RGBController_RoccatHordeAimo.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatHordeAimo.h
rename to Controllers/RoccatController/RoccatHordeAimoController/RGBController_RoccatHordeAimo.h
diff --git a/Controllers/RoccatController/RoccatHordeAimoController.cpp b/Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatHordeAimoController.cpp
rename to Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.cpp
diff --git a/Controllers/RoccatController/RoccatHordeAimoController.h b/Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatHordeAimoController.h
rename to Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp b/Controllers/RoccatController/RoccatKoneAimoController/RGBController_RoccatKoneAimo.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp
rename to Controllers/RoccatController/RoccatKoneAimoController/RGBController_RoccatKoneAimo.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.h b/Controllers/RoccatController/RoccatKoneAimoController/RGBController_RoccatKoneAimo.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKoneAimo.h
rename to Controllers/RoccatController/RoccatKoneAimoController/RGBController_RoccatKoneAimo.h
diff --git a/Controllers/RoccatController/RoccatKoneAimoController.cpp b/Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatKoneAimoController.cpp
rename to Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.cpp
diff --git a/Controllers/RoccatController/RoccatKoneAimoController.h b/Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatKoneAimoController.h
rename to Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatKonePro.cpp b/Controllers/RoccatController/RoccatKoneProController/RGBController_RoccatKonePro.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKonePro.cpp
rename to Controllers/RoccatController/RoccatKoneProController/RGBController_RoccatKonePro.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatKonePro.h b/Controllers/RoccatController/RoccatKoneProController/RGBController_RoccatKonePro.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKonePro.h
rename to Controllers/RoccatController/RoccatKoneProController/RGBController_RoccatKonePro.h
diff --git a/Controllers/RoccatController/RoccatKoneProController.cpp b/Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatKoneProController.cpp
rename to Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.cpp
diff --git a/Controllers/RoccatController/RoccatKoneProController.h b/Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatKoneProController.h
rename to Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatKova.cpp b/Controllers/RoccatController/RoccatKovaController/RGBController_RoccatKova.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKova.cpp
rename to Controllers/RoccatController/RoccatKovaController/RGBController_RoccatKova.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatKova.h b/Controllers/RoccatController/RoccatKovaController/RGBController_RoccatKova.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatKova.h
rename to Controllers/RoccatController/RoccatKovaController/RGBController_RoccatKova.h
diff --git a/Controllers/RoccatController/RoccatKovaController.cpp b/Controllers/RoccatController/RoccatKovaController/RoccatKovaController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatKovaController.cpp
rename to Controllers/RoccatController/RoccatKovaController/RoccatKovaController.cpp
diff --git a/Controllers/RoccatController/RoccatKovaController.h b/Controllers/RoccatController/RoccatKovaController/RoccatKovaController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatKovaController.h
rename to Controllers/RoccatController/RoccatKovaController/RoccatKovaController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatSenseAimo.cpp b/Controllers/RoccatController/RoccatSenseAimoController/RGBController_RoccatSenseAimo.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatSenseAimo.cpp
rename to Controllers/RoccatController/RoccatSenseAimoController/RGBController_RoccatSenseAimo.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatSenseAimo.h b/Controllers/RoccatController/RoccatSenseAimoController/RGBController_RoccatSenseAimo.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatSenseAimo.h
rename to Controllers/RoccatController/RoccatSenseAimoController/RGBController_RoccatSenseAimo.h
diff --git a/Controllers/RoccatController/RoccatSenseAimoController.cpp b/Controllers/RoccatController/RoccatSenseAimoController/RoccatSenseAimoController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatSenseAimoController.cpp
rename to Controllers/RoccatController/RoccatSenseAimoController/RoccatSenseAimoController.cpp
diff --git a/Controllers/RoccatController/RoccatSenseAimoController.h b/Controllers/RoccatController/RoccatSenseAimoController/RoccatSenseAimoController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatSenseAimoController.h
rename to Controllers/RoccatController/RoccatSenseAimoController/RoccatSenseAimoController.h
diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.cpp
rename to Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.cpp
diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.h
similarity index 100%
rename from Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.h
rename to Controllers/RoccatController/RoccatVulcanKeyboardController/RGBController_RoccatVulcanKeyboard.h
diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController.cpp b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp
similarity index 100%
rename from Controllers/RoccatController/RoccatVulcanKeyboardController.cpp
rename to Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp
diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardController.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h
similarity index 100%
rename from Controllers/RoccatController/RoccatVulcanKeyboardController.h
rename to Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.h
diff --git a/Controllers/RoccatController/RoccatVulcanKeyboardLayouts.h b/Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h
similarity index 100%
rename from Controllers/RoccatController/RoccatVulcanKeyboardLayouts.h
rename to Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardLayouts.h
diff --git a/Controllers/SRGBmodsController/RGBController_SRGBmodsLEDControllerV1.cpp b/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/RGBController_SRGBmodsLEDControllerV1.cpp
similarity index 100%
rename from Controllers/SRGBmodsController/RGBController_SRGBmodsLEDControllerV1.cpp
rename to Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/RGBController_SRGBmodsLEDControllerV1.cpp
diff --git a/Controllers/SRGBmodsController/RGBController_SRGBmodsLEDControllerV1.h b/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/RGBController_SRGBmodsLEDControllerV1.h
similarity index 100%
rename from Controllers/SRGBmodsController/RGBController_SRGBmodsLEDControllerV1.h
rename to Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/RGBController_SRGBmodsLEDControllerV1.h
diff --git a/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1.cpp b/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/SRGBmodsLEDControllerV1.cpp
similarity index 100%
rename from Controllers/SRGBmodsController/SRGBmodsLEDControllerV1.cpp
rename to Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/SRGBmodsLEDControllerV1.cpp
diff --git a/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1.h b/Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/SRGBmodsLEDControllerV1.h
similarity index 100%
rename from Controllers/SRGBmodsController/SRGBmodsLEDControllerV1.h
rename to Controllers/SRGBmodsController/SRGBmodsLEDControllerV1/SRGBmodsLEDControllerV1.h
diff --git a/Controllers/SRGBmodsController/RGBController_SRGBmodsPico.cpp b/Controllers/SRGBmodsController/SRGBmodsPicoController/RGBController_SRGBmodsPico.cpp
similarity index 100%
rename from Controllers/SRGBmodsController/RGBController_SRGBmodsPico.cpp
rename to Controllers/SRGBmodsController/SRGBmodsPicoController/RGBController_SRGBmodsPico.cpp
diff --git a/Controllers/SRGBmodsController/RGBController_SRGBmodsPico.h b/Controllers/SRGBmodsController/SRGBmodsPicoController/RGBController_SRGBmodsPico.h
similarity index 100%
rename from Controllers/SRGBmodsController/RGBController_SRGBmodsPico.h
rename to Controllers/SRGBmodsController/SRGBmodsPicoController/RGBController_SRGBmodsPico.h
diff --git a/Controllers/SRGBmodsController/SRGBmodsPicoController.cpp b/Controllers/SRGBmodsController/SRGBmodsPicoController/SRGBmodsPicoController.cpp
similarity index 100%
rename from Controllers/SRGBmodsController/SRGBmodsPicoController.cpp
rename to Controllers/SRGBmodsController/SRGBmodsPicoController/SRGBmodsPicoController.cpp
diff --git a/Controllers/SRGBmodsController/SRGBmodsPicoController.h b/Controllers/SRGBmodsController/SRGBmodsPicoController/SRGBmodsPicoController.h
similarity index 100%
rename from Controllers/SRGBmodsController/SRGBmodsPicoController.h
rename to Controllers/SRGBmodsController/SRGBmodsPicoController/SRGBmodsPicoController.h
diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp b/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/RGBController_SapphireNitroGlowV1.cpp
similarity index 100%
rename from Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp
rename to Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/RGBController_SapphireNitroGlowV1.cpp
diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h b/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/RGBController_SapphireNitroGlowV1.h
similarity index 100%
rename from Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h
rename to Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/RGBController_SapphireNitroGlowV1.h
diff --git a/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller.cpp b/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/SapphireNitroGlowV1Controller.cpp
similarity index 100%
rename from Controllers/SapphireGPUController/SapphireNitroGlowV1Controller.cpp
rename to Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/SapphireNitroGlowV1Controller.cpp
diff --git a/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller.h b/Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/SapphireNitroGlowV1Controller.h
similarity index 100%
rename from Controllers/SapphireGPUController/SapphireNitroGlowV1Controller.h
rename to Controllers/SapphireGPUController/SapphireNitroGlowV1Controller/SapphireNitroGlowV1Controller.h
diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/RGBController_SapphireNitroGlowV3.cpp
similarity index 100%
rename from Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp
rename to Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/RGBController_SapphireNitroGlowV3.cpp
diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/RGBController_SapphireNitroGlowV3.h
similarity index 100%
rename from Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h
rename to Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/RGBController_SapphireNitroGlowV3.h
diff --git a/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/SapphireNitroGlowV3Controller.cpp
similarity index 100%
rename from Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp
rename to Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/SapphireNitroGlowV3Controller.cpp
diff --git a/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.h b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/SapphireNitroGlowV3Controller.h
similarity index 100%
rename from Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.h
rename to Controllers/SapphireGPUController/SapphireNitroGlowV3Controller/SapphireNitroGlowV3Controller.h
diff --git a/Controllers/SonyGamepadController/RGBController_SonyDS4.cpp b/Controllers/SonyGamepadController/SonyDS4Controller/RGBController_SonyDS4.cpp
similarity index 100%
rename from Controllers/SonyGamepadController/RGBController_SonyDS4.cpp
rename to Controllers/SonyGamepadController/SonyDS4Controller/RGBController_SonyDS4.cpp
diff --git a/Controllers/SonyGamepadController/RGBController_SonyDS4.h b/Controllers/SonyGamepadController/SonyDS4Controller/RGBController_SonyDS4.h
similarity index 100%
rename from Controllers/SonyGamepadController/RGBController_SonyDS4.h
rename to Controllers/SonyGamepadController/SonyDS4Controller/RGBController_SonyDS4.h
diff --git a/Controllers/SonyGamepadController/SonyDS4Controller.cpp b/Controllers/SonyGamepadController/SonyDS4Controller/SonyDS4Controller.cpp
similarity index 100%
rename from Controllers/SonyGamepadController/SonyDS4Controller.cpp
rename to Controllers/SonyGamepadController/SonyDS4Controller/SonyDS4Controller.cpp
diff --git a/Controllers/SonyGamepadController/SonyDS4Controller.h b/Controllers/SonyGamepadController/SonyDS4Controller/SonyDS4Controller.h
similarity index 100%
rename from Controllers/SonyGamepadController/SonyDS4Controller.h
rename to Controllers/SonyGamepadController/SonyDS4Controller/SonyDS4Controller.h
diff --git a/Controllers/SonyGamepadController/RGBController_SonyDualSense.cpp b/Controllers/SonyGamepadController/SonyDualSenseController/RGBController_SonyDualSense.cpp
similarity index 100%
rename from Controllers/SonyGamepadController/RGBController_SonyDualSense.cpp
rename to Controllers/SonyGamepadController/SonyDualSenseController/RGBController_SonyDualSense.cpp
diff --git a/Controllers/SonyGamepadController/RGBController_SonyDualSense.h b/Controllers/SonyGamepadController/SonyDualSenseController/RGBController_SonyDualSense.h
similarity index 100%
rename from Controllers/SonyGamepadController/RGBController_SonyDualSense.h
rename to Controllers/SonyGamepadController/SonyDualSenseController/RGBController_SonyDualSense.h
diff --git a/Controllers/SonyGamepadController/SonyDualSenseController.cpp b/Controllers/SonyGamepadController/SonyDualSenseController/SonyDualSenseController.cpp
similarity index 100%
rename from Controllers/SonyGamepadController/SonyDualSenseController.cpp
rename to Controllers/SonyGamepadController/SonyDualSenseController/SonyDualSenseController.cpp
diff --git a/Controllers/SonyGamepadController/SonyDualSenseController.h b/Controllers/SonyGamepadController/SonyDualSenseController/SonyDualSenseController.h
similarity index 100%
rename from Controllers/SonyGamepadController/SonyDualSenseController.h
rename to Controllers/SonyGamepadController/SonyDualSenseController/SonyDualSenseController.h
diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp
similarity index 100%
rename from Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp
diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h
similarity index 100%
rename from Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h
diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController/ThermaltakeRiingController.cpp
similarity index 100%
rename from Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingController/ThermaltakeRiingController.cpp
diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController/ThermaltakeRiingController.h
similarity index 100%
rename from Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingController/ThermaltakeRiingController.h
diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/RGBController_ThermaltakeRiingQuad.cpp
similarity index 100%
rename from Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/RGBController_ThermaltakeRiingQuad.cpp
diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.h b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/RGBController_ThermaltakeRiingQuad.h
similarity index 100%
rename from Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.h
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/RGBController_ThermaltakeRiingQuad.h
diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp
similarity index 100%
rename from Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController.cpp
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp
diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController.h b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.h
similarity index 100%
rename from Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController.h
rename to Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.h
diff --git a/Controllers/TrustController/RGBController_TrustGXT114.cpp b/Controllers/TrustController/TrustGXT114Controller/RGBController_TrustGXT114.cpp
similarity index 100%
rename from Controllers/TrustController/RGBController_TrustGXT114.cpp
rename to Controllers/TrustController/TrustGXT114Controller/RGBController_TrustGXT114.cpp
diff --git a/Controllers/TrustController/RGBController_TrustGXT114.h b/Controllers/TrustController/TrustGXT114Controller/RGBController_TrustGXT114.h
similarity index 100%
rename from Controllers/TrustController/RGBController_TrustGXT114.h
rename to Controllers/TrustController/TrustGXT114Controller/RGBController_TrustGXT114.h
diff --git a/Controllers/TrustController/TrustGXT114Controller.cpp b/Controllers/TrustController/TrustGXT114Controller/TrustGXT114Controller.cpp
similarity index 100%
rename from Controllers/TrustController/TrustGXT114Controller.cpp
rename to Controllers/TrustController/TrustGXT114Controller/TrustGXT114Controller.cpp
diff --git a/Controllers/TrustController/TrustGXT114Controller.h b/Controllers/TrustController/TrustGXT114Controller/TrustGXT114Controller.h
similarity index 100%
rename from Controllers/TrustController/TrustGXT114Controller.h
rename to Controllers/TrustController/TrustGXT114Controller/TrustGXT114Controller.h
diff --git a/Controllers/TrustController/RGBController_TrustGXT180.cpp b/Controllers/TrustController/TrustGXT180Controller/RGBController_TrustGXT180.cpp
similarity index 100%
rename from Controllers/TrustController/RGBController_TrustGXT180.cpp
rename to Controllers/TrustController/TrustGXT180Controller/RGBController_TrustGXT180.cpp
diff --git a/Controllers/TrustController/RGBController_TrustGXT180.h b/Controllers/TrustController/TrustGXT180Controller/RGBController_TrustGXT180.h
similarity index 100%
rename from Controllers/TrustController/RGBController_TrustGXT180.h
rename to Controllers/TrustController/TrustGXT180Controller/RGBController_TrustGXT180.h
diff --git a/Controllers/TrustController/TrustGXT180Controller.cpp b/Controllers/TrustController/TrustGXT180Controller/TrustGXT180Controller.cpp
similarity index 100%
rename from Controllers/TrustController/TrustGXT180Controller.cpp
rename to Controllers/TrustController/TrustGXT180Controller/TrustGXT180Controller.cpp
diff --git a/Controllers/TrustController/TrustGXT180Controller.h b/Controllers/TrustController/TrustGXT180Controller/TrustGXT180Controller.h
similarity index 100%
rename from Controllers/TrustController/TrustGXT180Controller.h
rename to Controllers/TrustController/TrustGXT180Controller/TrustGXT180Controller.h
diff --git a/Controllers/WootingKeyboardController/WootingOneKeyboardController.cpp b/Controllers/WootingKeyboardController/WootingOneKeyboardController/WootingOneKeyboardController.cpp
similarity index 100%
rename from Controllers/WootingKeyboardController/WootingOneKeyboardController.cpp
rename to Controllers/WootingKeyboardController/WootingOneKeyboardController/WootingOneKeyboardController.cpp
diff --git a/Controllers/WootingKeyboardController/WootingOneKeyboardController.h b/Controllers/WootingKeyboardController/WootingOneKeyboardController/WootingOneKeyboardController.h
similarity index 100%
rename from Controllers/WootingKeyboardController/WootingOneKeyboardController.h
rename to Controllers/WootingKeyboardController/WootingOneKeyboardController/WootingOneKeyboardController.h
diff --git a/Controllers/WootingKeyboardController/WootingTwoKeyboardController.cpp b/Controllers/WootingKeyboardController/WootingTwoKeyboardController/WootingTwoKeyboardController.cpp
similarity index 100%
rename from Controllers/WootingKeyboardController/WootingTwoKeyboardController.cpp
rename to Controllers/WootingKeyboardController/WootingTwoKeyboardController/WootingTwoKeyboardController.cpp
diff --git a/Controllers/WootingKeyboardController/WootingTwoKeyboardController.h b/Controllers/WootingKeyboardController/WootingTwoKeyboardController/WootingTwoKeyboardController.h
similarity index 100%
rename from Controllers/WootingKeyboardController/WootingTwoKeyboardController.h
rename to Controllers/WootingKeyboardController/WootingTwoKeyboardController/WootingTwoKeyboardController.h