diff --git a/Controllers/SinowealthController/GenesisXenon200Controller.cpp b/Controllers/SinowealthController/GenesisXenon200Controller/GenesisXenon200Controller.cpp
similarity index 100%
rename from Controllers/SinowealthController/GenesisXenon200Controller.cpp
rename to Controllers/SinowealthController/GenesisXenon200Controller/GenesisXenon200Controller.cpp
diff --git a/Controllers/SinowealthController/GenesisXenon200Controller.h b/Controllers/SinowealthController/GenesisXenon200Controller/GenesisXenon200Controller.h
similarity index 100%
rename from Controllers/SinowealthController/GenesisXenon200Controller.h
rename to Controllers/SinowealthController/GenesisXenon200Controller/GenesisXenon200Controller.h
diff --git a/Controllers/SinowealthController/RGBController_GenesisXenon200.cpp b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_GenesisXenon200.cpp
rename to Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
diff --git a/Controllers/SinowealthController/RGBController_GenesisXenon200.h b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_GenesisXenon200.h
rename to Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
diff --git a/Controllers/SinowealthController/RGBController_Sinowealth1007.cpp b/Controllers/SinowealthController/Sinowealth1007Controller/RGBController_Sinowealth1007.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_Sinowealth1007.cpp
rename to Controllers/SinowealthController/Sinowealth1007Controller/RGBController_Sinowealth1007.cpp
diff --git a/Controllers/SinowealthController/RGBController_Sinowealth1007.h b/Controllers/SinowealthController/Sinowealth1007Controller/RGBController_Sinowealth1007.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_Sinowealth1007.h
rename to Controllers/SinowealthController/Sinowealth1007Controller/RGBController_Sinowealth1007.h
diff --git a/Controllers/SinowealthController/SinowealthController1007.cpp b/Controllers/SinowealthController/Sinowealth1007Controller/SinowealthController1007.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthController1007.cpp
rename to Controllers/SinowealthController/Sinowealth1007Controller/SinowealthController1007.cpp
diff --git a/Controllers/SinowealthController/SinowealthController1007.h b/Controllers/SinowealthController/Sinowealth1007Controller/SinowealthController1007.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthController1007.h
rename to Controllers/SinowealthController/Sinowealth1007Controller/SinowealthController1007.h
diff --git a/Controllers/SinowealthController/RGBController_Sinowealth.cpp b/Controllers/SinowealthController/SinowealthController/RGBController_Sinowealth.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_Sinowealth.cpp
rename to Controllers/SinowealthController/SinowealthController/RGBController_Sinowealth.cpp
diff --git a/Controllers/SinowealthController/RGBController_Sinowealth.h b/Controllers/SinowealthController/SinowealthController/RGBController_Sinowealth.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_Sinowealth.h
rename to Controllers/SinowealthController/SinowealthController/RGBController_Sinowealth.h
diff --git a/Controllers/SinowealthController/SinowealthController.cpp b/Controllers/SinowealthController/SinowealthController/SinowealthController.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthController.cpp
rename to Controllers/SinowealthController/SinowealthController/SinowealthController.cpp
diff --git a/Controllers/SinowealthController/SinowealthController.h b/Controllers/SinowealthController/SinowealthController/SinowealthController.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthController.h
rename to Controllers/SinowealthController/SinowealthController/SinowealthController.h
diff --git a/Controllers/SinowealthController/RGBController_SinowealthGMOW.cpp b/Controllers/SinowealthController/SinowealthGMOWController/RGBController_SinowealthGMOW.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthGMOW.cpp
rename to Controllers/SinowealthController/SinowealthGMOWController/RGBController_SinowealthGMOW.cpp
diff --git a/Controllers/SinowealthController/RGBController_SinowealthGMOW.h b/Controllers/SinowealthController/SinowealthGMOWController/RGBController_SinowealthGMOW.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthGMOW.h
rename to Controllers/SinowealthController/SinowealthGMOWController/RGBController_SinowealthGMOW.h
diff --git a/Controllers/SinowealthController/SinowealthGMOWController.cpp b/Controllers/SinowealthController/SinowealthGMOWController/SinowealthGMOWController.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthGMOWController.cpp
rename to Controllers/SinowealthController/SinowealthGMOWController/SinowealthGMOWController.cpp
diff --git a/Controllers/SinowealthController/SinowealthGMOWController.h b/Controllers/SinowealthController/SinowealthGMOWController/SinowealthGMOWController.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthGMOWController.h
rename to Controllers/SinowealthController/SinowealthGMOWController/SinowealthGMOWController.h
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp b/Controllers/SinowealthController/SinowealthKeyboard16Controller/RGBController_SinowealthKeyboard16.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp
rename to Controllers/SinowealthController/SinowealthKeyboard16Controller/RGBController_SinowealthKeyboard16.cpp
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.h b/Controllers/SinowealthController/SinowealthKeyboard16Controller/RGBController_SinowealthKeyboard16.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard16.h
rename to Controllers/SinowealthController/SinowealthKeyboard16Controller/RGBController_SinowealthKeyboard16.h
diff --git a/Controllers/SinowealthController/SinowealthKeyboard16Controller.cpp b/Controllers/SinowealthController/SinowealthKeyboard16Controller/SinowealthKeyboard16Controller.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboard16Controller.cpp
rename to Controllers/SinowealthController/SinowealthKeyboard16Controller/SinowealthKeyboard16Controller.cpp
diff --git a/Controllers/SinowealthController/SinowealthKeyboard16Controller.h b/Controllers/SinowealthController/SinowealthKeyboard16Controller/SinowealthKeyboard16Controller.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboard16Controller.h
rename to Controllers/SinowealthController/SinowealthKeyboard16Controller/SinowealthKeyboard16Controller.h
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard90.cpp b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard90.cpp
rename to Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard90.h b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard90.h
rename to Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
diff --git a/Controllers/SinowealthController/SinowealthKeyboard90Controller.cpp b/Controllers/SinowealthController/SinowealthKeyboard90Controller/SinowealthKeyboard90Controller.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboard90Controller.cpp
rename to Controllers/SinowealthController/SinowealthKeyboard90Controller/SinowealthKeyboard90Controller.cpp
diff --git a/Controllers/SinowealthController/SinowealthKeyboard90Controller.h b/Controllers/SinowealthController/SinowealthKeyboard90Controller/SinowealthKeyboard90Controller.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboard90Controller.h
rename to Controllers/SinowealthController/SinowealthKeyboard90Controller/SinowealthKeyboard90Controller.h
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp b/Controllers/SinowealthController/SinowealthKeyboardController/RGBController_SinowealthKeyboard.cpp
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp
rename to Controllers/SinowealthController/SinowealthKeyboardController/RGBController_SinowealthKeyboard.cpp
diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.h b/Controllers/SinowealthController/SinowealthKeyboardController/RGBController_SinowealthKeyboard.h
similarity index 100%
rename from Controllers/SinowealthController/RGBController_SinowealthKeyboard.h
rename to Controllers/SinowealthController/SinowealthKeyboardController/RGBController_SinowealthKeyboard.h
diff --git a/Controllers/SinowealthController/SinowealthKeyboardController.cpp b/Controllers/SinowealthController/SinowealthKeyboardController/SinowealthKeyboardController.cpp
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboardController.cpp
rename to Controllers/SinowealthController/SinowealthKeyboardController/SinowealthKeyboardController.cpp
diff --git a/Controllers/SinowealthController/SinowealthKeyboardController.h b/Controllers/SinowealthController/SinowealthKeyboardController/SinowealthKeyboardController.h
similarity index 100%
rename from Controllers/SinowealthController/SinowealthKeyboardController.h
rename to Controllers/SinowealthController/SinowealthKeyboardController/SinowealthKeyboardController.h