diff --git a/Controllers/LogitechController/LogitechGLightsyncController.cpp b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp
similarity index 89%
rename from Controllers/LogitechController/LogitechGLightsyncController.cpp
rename to Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp
index 6d7f88746..0e7150817 100644
--- a/Controllers/LogitechController/LogitechGLightsyncController.cpp
+++ b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp
@@ -1,15 +1,16 @@
-/*-----------------------------------------*\
-|  LogitechGLightsyncController.cpp         |
-|                                           |
-|  Driver for Logitech G Lightsync          |
-|  lighting controllers                     |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
-
-#include "LogitechGLightsyncController.h"
+/*---------------------------------------------------------*\
+| LogitechGLightsyncController.cpp                          |
+|                                                           |
+|   Driver for Logitech Lightsync                           |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "LogitechGLightsyncController.h"
 
 LogitechGLightsyncController::LogitechGLightsyncController(hid_device* dev_cmd_handle, hid_device *dev_handle, const char *path, unsigned char hid_dev_index, unsigned char hid_feature_index, unsigned char hid_fctn_ase_id)
 {
diff --git a/Controllers/LogitechController/LogitechGLightsyncController.h b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.h
similarity index 75%
rename from Controllers/LogitechController/LogitechGLightsyncController.h
rename to Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.h
index 0ba30e875..7c25c023e 100644
--- a/Controllers/LogitechController/LogitechGLightsyncController.h
+++ b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.h
@@ -1,20 +1,21 @@
-/*-----------------------------------------*\
-|  LogitechGLightsyncController.h           |
-|                                           |
-|  Definitions and types for Logitech       |
-|  Lightsync lighting controllers           |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-
-#include <string>
-#include <hidapi/hidapi.h>
-#include <memory>
+/*---------------------------------------------------------*\
+| LogitechGLightsyncController.h                            |
+|                                                           |
+|   Driver for Logitech Lightsync                           |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <hidapi/hidapi.h>
+#include "RGBController.h"
+
 enum
 {
     LOGITECH_G_LIGHTSYNC_MODE_OFF               = 0x00,
@@ -28,7 +29,7 @@ enum
 | Values are multiplied by 100 later to give lots of GUI steps.                                 |
 \*---------------------------------------------------------------------------------------------*/
 enum
-{   
+{
     LOGITECH_G_LIGHTSYNC_SPEED_SLOWEST          = 0xC8,  /* Slowest speed                   */
     LOGITECH_G_LIGHTSYNC_SPEED_NORMAL           = 0x32,  /* Normal speed                    */
     LOGITECH_G_LIGHTSYNC_SPEED_FASTEST          = 0x0A,  /* Fastest speed                   */
@@ -39,10 +40,10 @@ class LogitechGLightsyncController
 public:
     LogitechGLightsyncController(
             hid_device* dev_cmd_handle,
-            hid_device* dev_handle, 
-            const char* path, 
-            unsigned char hid_dev_index, 
-            unsigned char hid_feature_index, 
+            hid_device* dev_handle,
+            const char* path,
+            unsigned char hid_dev_index,
+            unsigned char hid_feature_index,
             unsigned char hid_fctn_ase_id);
     LogitechGLightsyncController(
             hid_device* dev_cmd_handle,
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.cpp
similarity index 90%
rename from Controllers/LogitechController/RGBController_LogitechGLightsync.cpp
rename to Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.cpp
index b771a407e..0bc004371 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGLightsync.cpp     |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech G Lightsync Devices             |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechGLightsync.cpp                      |
+|                                                           |
+|   RGBController for Logitech Lightsync                    |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_LogitechGLightsync.h"
 
diff --git a/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.h b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.h
new file mode 100644
index 000000000..b827e2d97
--- /dev/null
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync.h
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechGLightsync.h                        |
+|                                                           |
+|   RGBController for Logitech Lightsync                    |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechGLightsyncController.h"
+
+class RGBController_LogitechGLightsync : public RGBController
+{
+public:
+    RGBController_LogitechGLightsync(LogitechGLightsyncController* controller_ptr);
+    ~RGBController_LogitechGLightsync();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    LogitechGLightsyncController* controller;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.cpp
similarity index 89%
rename from Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp
rename to Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.cpp
index 2cd1b8f9a..382e873fa 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGLightsync1zone.cpp|
-|                                           |
-|  Generic RGB Interface for single zone    |
-|  Logitech G Lightsync Devices             |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechGLightsync1zone.cpp                 |
+|                                                           |
+|   RGBController for single zone Logitech Lightsync        |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_LogitechGLightsync1zone.h"
 
diff --git a/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.h b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.h
new file mode 100644
index 000000000..593d33df3
--- /dev/null
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGLightsync1zone.h
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechGLightsync1zone.h                   |
+|                                                           |
+|   RGBController for single zone Logitech Lightsync        |
+|                                                           |
+|   TheRogueZeta                                21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechGLightsyncController.h"
+
+class RGBController_LogitechGLightsync1zone : public RGBController
+{
+public:
+    RGBController_LogitechGLightsync1zone(LogitechGLightsyncController* controller_ptr);
+    ~RGBController_LogitechGLightsync1zone();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    LogitechGLightsyncController* controller;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.cpp
similarity index 86%
rename from Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp
rename to Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.cpp
index 50a1a6a9b..83ac4eafa 100644
--- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGPowerPlay.cpp     |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech G PowerPlay Wireless Mousemat   |
-|                                           |
-|  TheRogueZeta   8/31/2020                 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechGPowerPlay.cpp                      |
+|                                                           |
+|   RGBController for Logitech G PowerPlay                  |
+|                                                           |
+|   TheRogueZeta                                31 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_LogitechGPowerPlay.h"
 
diff --git a/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.h b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.h
new file mode 100644
index 000000000..7fd4d6194
--- /dev/null
+++ b/Controllers/LogitechController/LogitechGLightsyncController/RGBController_LogitechGPowerPlay.h
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechGPowerPlay.h                        |
+|                                                           |
+|   RGBController for Logitech G PowerPlay                  |
+|                                                           |
+|   TheRogueZeta                                31 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechGLightsyncController.h"
+
+class RGBController_LogitechGPowerPlay : public RGBController
+{
+public:
+    RGBController_LogitechGPowerPlay(LogitechGLightsyncController* controller_ptr);
+    ~RGBController_LogitechGPowerPlay();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    LogitechGLightsyncController* controller;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync.h b/Controllers/LogitechController/RGBController_LogitechGLightsync.h
deleted file mode 100644
index 00a488652..000000000
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGLightsync.h       |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech G Lightsync Devices             |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "LogitechGLightsyncController.h"
-
-class RGBController_LogitechGLightsync : public RGBController
-{
-public:
-    RGBController_LogitechGLightsync(LogitechGLightsyncController* controller_ptr);
-    ~RGBController_LogitechGLightsync();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    LogitechGLightsyncController* controller;
-};
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h
deleted file mode 100644
index 786dcccb2..000000000
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGLightsync1zone.h  |
-|                                           |
-|  Generic RGB Interface for single zone    |
-|  Logitech G Lightsync Devices             |
-|                                           |
-|  TheRogueZeta   04/21/2021                |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "LogitechGLightsyncController.h"
-
-class RGBController_LogitechGLightsync1zone : public RGBController
-{
-public:
-    RGBController_LogitechGLightsync1zone(LogitechGLightsyncController* controller_ptr);
-    ~RGBController_LogitechGLightsync1zone();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    LogitechGLightsyncController* controller;
-};
diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h
deleted file mode 100644
index a7ea95fa1..000000000
--- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechGPowerPlay.h       |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech G PowerPlay Wireless Mousemat   |
-|                                           |
-|  TheRogueZeta   8/31/2020                 |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "LogitechGLightsyncController.h"
-
-class RGBController_LogitechGPowerPlay : public RGBController
-{
-public:
-    RGBController_LogitechGPowerPlay(LogitechGLightsyncController* controller_ptr);
-    ~RGBController_LogitechGPowerPlay();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    LogitechGLightsyncController* controller;
-};