diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox3Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesAerox3Controller/SteelSeriesAerox3Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox3Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesAerox3Controller/SteelSeriesAerox3Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox3Controller.h b/Controllers/SteelSeriesController/SteelSeriesAerox3Controller/SteelSeriesAerox3Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox3Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesAerox3Controller/SteelSeriesAerox3Controller.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox5Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesAerox5Controller/SteelSeriesAerox5Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox5Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesAerox5Controller/SteelSeriesAerox5Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox5Controller.h b/Controllers/SteelSeriesController/SteelSeriesAerox5Controller/SteelSeriesAerox5Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox5Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesAerox5Controller/SteelSeriesAerox5Controller.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox9Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesAerox9Controller/SteelSeriesAerox9Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox9Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesAerox9Controller/SteelSeriesAerox9Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesAerox9Controller.h b/Controllers/SteelSeriesController/SteelSeriesAerox9Controller/SteelSeriesAerox9Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesAerox9Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesAerox9Controller/SteelSeriesAerox9Controller.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex3.cpp b/Controllers/SteelSeriesController/SteelSeriesApex3Controller/RGBController_SteelSeriesApex3.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesApex3.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApex3Controller/RGBController_SteelSeriesApex3.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex3.h b/Controllers/SteelSeriesController/SteelSeriesApex3Controller/RGBController_SteelSeriesApex3.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesApex3.h
rename to Controllers/SteelSeriesController/SteelSeriesApex3Controller/RGBController_SteelSeriesApex3.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesApex3Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesApex3Controller/SteelSeriesApex3Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApex3Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApex3Controller/SteelSeriesApex3Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesApex3Controller.h b/Controllers/SteelSeriesController/SteelSeriesApex3Controller/SteelSeriesApex3Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApex3Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesApex3Controller/SteelSeriesApex3Controller.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesApex8ZoneController.cpp b/Controllers/SteelSeriesController/SteelSeriesApex8ZoneController/SteelSeriesApex8ZoneController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApex8ZoneController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApex8ZoneController/SteelSeriesApex8ZoneController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesApex8ZoneController.h b/Controllers/SteelSeriesController/SteelSeriesApex8ZoneController/SteelSeriesApex8ZoneController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApex8ZoneController.h
rename to Controllers/SteelSeriesController/SteelSeriesApex8ZoneController/SteelSeriesApex8ZoneController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp b/Controllers/SteelSeriesController/SteelSeriesApexController/RGBController_SteelSeriesApex.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApexController/RGBController_SteelSeriesApex.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.h b/Controllers/SteelSeriesController/SteelSeriesApexController/RGBController_SteelSeriesApex.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesApex.h
rename to Controllers/SteelSeriesController/SteelSeriesApexController/RGBController_SteelSeriesApex.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexController/SteelSeriesApexController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApexController/SteelSeriesApexController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexController.h b/Controllers/SteelSeriesController/SteelSeriesApexController/SteelSeriesApexController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexController.h
rename to Controllers/SteelSeriesController/SteelSeriesApexController/SteelSeriesApexController.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexMController/SteelSeriesApexMController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexMController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApexMController/SteelSeriesApexMController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexMController.h b/Controllers/SteelSeriesController/SteelSeriesApexMController/SteelSeriesApexMController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexMController.h
rename to Controllers/SteelSeriesController/SteelSeriesApexMController/SteelSeriesApexMController.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexTZoneController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexTZoneController/SteelSeriesApexTZoneController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexTZoneController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesApexTZoneController/SteelSeriesApexTZoneController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexTZoneController.h b/Controllers/SteelSeriesController/SteelSeriesApexTZoneController/SteelSeriesApexTZoneController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesApexTZoneController.h
rename to Controllers/SteelSeriesController/SteelSeriesApexTZoneController/SteelSeriesApexTZoneController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp b/Controllers/SteelSeriesController/SteelSeriesArctis5Controller/RGBController_SteelSeriesArctis5.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp
rename to Controllers/SteelSeriesController/SteelSeriesArctis5Controller/RGBController_SteelSeriesArctis5.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.h b/Controllers/SteelSeriesController/SteelSeriesArctis5Controller/RGBController_SteelSeriesArctis5.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.h
rename to Controllers/SteelSeriesController/SteelSeriesArctis5Controller/RGBController_SteelSeriesArctis5.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesArctis5Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesArctis5Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesArctis5Controller.h b/Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesArctis5Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesMouseController.cpp b/Controllers/SteelSeriesController/SteelSeriesMouseController/SteelSeriesMouseController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesMouseController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesMouseController/SteelSeriesMouseController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesMouseController.h b/Controllers/SteelSeriesController/SteelSeriesMouseController/SteelSeriesMouseController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesMouseController.h
rename to Controllers/SteelSeriesController/SteelSeriesMouseController/SteelSeriesMouseController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/SteelSeriesOldApexController/RGBController_SteelSeriesOldApex.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp
rename to Controllers/SteelSeriesController/SteelSeriesOldApexController/RGBController_SteelSeriesOldApex.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h b/Controllers/SteelSeriesController/SteelSeriesOldApexController/RGBController_SteelSeriesOldApex.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h
rename to Controllers/SteelSeriesController/SteelSeriesOldApexController/RGBController_SteelSeriesOldApex.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesOldApexController/SteelSeriesOldApexController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesOldApexController/SteelSeriesOldApexController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesOldApexController.h b/Controllers/SteelSeriesController/SteelSeriesOldApexController/SteelSeriesOldApexController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesOldApexController.h
rename to Controllers/SteelSeriesController/SteelSeriesOldApexController/SteelSeriesOldApexController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp b/Controllers/SteelSeriesController/SteelSeriesQCKMatController/RGBController_SteelSeriesQCKMat.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp
rename to Controllers/SteelSeriesController/SteelSeriesQCKMatController/RGBController_SteelSeriesQCKMat.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.h b/Controllers/SteelSeriesController/SteelSeriesQCKMatController/RGBController_SteelSeriesQCKMat.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.h
rename to Controllers/SteelSeriesController/SteelSeriesQCKMatController/RGBController_SteelSeriesQCKMat.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesQCKMatController.cpp b/Controllers/SteelSeriesController/SteelSeriesQCKMatController/SteelSeriesQCKMatController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesQCKMatController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesQCKMatController/SteelSeriesQCKMatController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesQCKMatController.h b/Controllers/SteelSeriesController/SteelSeriesQCKMatController/SteelSeriesQCKMatController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesQCKMatController.h
rename to Controllers/SteelSeriesController/SteelSeriesQCKMatController/SteelSeriesQCKMatController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp b/Controllers/SteelSeriesController/SteelSeriesRival3Controller/RGBController_SteelSeriesRival3.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp
rename to Controllers/SteelSeriesController/SteelSeriesRival3Controller/RGBController_SteelSeriesRival3.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.h b/Controllers/SteelSeriesController/SteelSeriesRival3Controller/RGBController_SteelSeriesRival3.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.h
rename to Controllers/SteelSeriesController/SteelSeriesRival3Controller/RGBController_SteelSeriesRival3.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesRival3Controller.cpp b/Controllers/SteelSeriesController/SteelSeriesRival3Controller/SteelSeriesRival3Controller.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesRival3Controller.cpp
rename to Controllers/SteelSeriesController/SteelSeriesRival3Controller/SteelSeriesRival3Controller.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesRival3Controller.h b/Controllers/SteelSeriesController/SteelSeriesRival3Controller/SteelSeriesRival3Controller.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesRival3Controller.h
rename to Controllers/SteelSeriesController/SteelSeriesRival3Controller/SteelSeriesRival3Controller.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController/RGBController_SteelSeriesRival.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp
rename to Controllers/SteelSeriesController/SteelSeriesRivalController/RGBController_SteelSeriesRival.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h b/Controllers/SteelSeriesController/SteelSeriesRivalController/RGBController_SteelSeriesRival.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h
rename to Controllers/SteelSeriesController/SteelSeriesRivalController/RGBController_SteelSeriesRival.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController/SteelSeriesRivalController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesRivalController/SteelSeriesRivalController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.h b/Controllers/SteelSeriesController/SteelSeriesRivalController/SteelSeriesRivalController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesRivalController.h
rename to Controllers/SteelSeriesController/SteelSeriesRivalController/SteelSeriesRivalController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp b/Controllers/SteelSeriesController/SteelSeriesSenseiController/RGBController_SteelSeriesSensei.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp
rename to Controllers/SteelSeriesController/SteelSeriesSenseiController/RGBController_SteelSeriesSensei.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.h b/Controllers/SteelSeriesController/SteelSeriesSenseiController/RGBController_SteelSeriesSensei.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.h
rename to Controllers/SteelSeriesController/SteelSeriesSenseiController/RGBController_SteelSeriesSensei.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesSenseiController.cpp b/Controllers/SteelSeriesController/SteelSeriesSenseiController/SteelSeriesSenseiController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesSenseiController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesSenseiController/SteelSeriesSenseiController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesSenseiController.h b/Controllers/SteelSeriesController/SteelSeriesSenseiController/SteelSeriesSenseiController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesSenseiController.h
rename to Controllers/SteelSeriesController/SteelSeriesSenseiController/SteelSeriesSenseiController.h
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp b/Controllers/SteelSeriesController/SteelSeriesSiberiaController/RGBController_SteelSeriesSiberia.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp
rename to Controllers/SteelSeriesController/SteelSeriesSiberiaController/RGBController_SteelSeriesSiberia.cpp
diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h b/Controllers/SteelSeriesController/SteelSeriesSiberiaController/RGBController_SteelSeriesSiberia.h
similarity index 100%
rename from Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h
rename to Controllers/SteelSeriesController/SteelSeriesSiberiaController/RGBController_SteelSeriesSiberia.h
diff --git a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp b/Controllers/SteelSeriesController/SteelSeriesSiberiaController/SteelSeriesSiberiaController.cpp
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp
rename to Controllers/SteelSeriesController/SteelSeriesSiberiaController/SteelSeriesSiberiaController.cpp
diff --git a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.h b/Controllers/SteelSeriesController/SteelSeriesSiberiaController/SteelSeriesSiberiaController.h
similarity index 100%
rename from Controllers/SteelSeriesController/SteelSeriesSiberiaController.h
rename to Controllers/SteelSeriesController/SteelSeriesSiberiaController/SteelSeriesSiberiaController.h