diff --git a/Controllers/LogitechController/LogitechG810Controller.cpp b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp
similarity index 90%
rename from Controllers/LogitechController/LogitechG810Controller.cpp
rename to Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp
index 124028e2..ef7d5ec7 100644
--- a/Controllers/LogitechController/LogitechG810Controller.cpp
+++ b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp
@@ -1,14 +1,16 @@
-/*-----------------------------------------*\
-|  LogitechG810Controller.cpp               |
-|                                           |
-|  Driver for Logitech G810 Orion Spectrum  |
-|  keyboard light controller                |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/11/2020   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechG810Controller.cpp                                |
+|                                                           |
+|   Driver for Logitech G810 Orion Spectrum                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                11 Jun 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "LogitechG810Controller.h"
 #include <cstring>
+#include "LogitechG810Controller.h"
 
 LogitechG810Controller::LogitechG810Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12)
 {
diff --git a/Controllers/LogitechController/LogitechG810Controller.h b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.h
similarity index 81%
rename from Controllers/LogitechController/LogitechG810Controller.h
rename to Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.h
index 18b91666..329227b3 100644
--- a/Controllers/LogitechController/LogitechG810Controller.h
+++ b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.h
@@ -1,18 +1,19 @@
-/*-----------------------------------------*\
-|  LogitechG810Controller.h                 |
-|                                           |
-|  Definitions and types for Logitech G810  |
-|  Orion Spectrum keyboard light controller |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/11/2020   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechG810Controller.h                                  |
+|                                                           |
+|   Driver for Logitech G810 Orion Spectrum                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                11 Jun 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBController.h"
+#pragma once
 
 #include <string>
 #include <hidapi/hidapi.h>
-
-#pragma once
+#include "RGBController.h"
 
 enum
 {
@@ -57,7 +58,7 @@ public:
     std::string GetSerialString();
 
     void        Commit();
-    
+
     void        SetDirect
                     (
                     unsigned char       zone,
diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.cpp
similarity index 94%
rename from Controllers/LogitechController/RGBController_LogitechG810.cpp
rename to Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.cpp
index 761584fe..d68d9eef 100644
--- a/Controllers/LogitechController/RGBController_LogitechG810.cpp
+++ b/Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechG810.cpp           |
-|                                           |
-|  Generic RGB Interface for Logitech G810  |
-|  Orion Spectrum Keyboard                  |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/12/2020   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechG810.cpp                            |
+|                                                           |
+|   RGBController for Logitech G810 Orion Spectrum          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                12 Jun 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBControllerKeyNames.h"
 #include "RGBController_LogitechG810.h"
diff --git a/Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.h b/Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.h
new file mode 100644
index 00000000..eae16c56
--- /dev/null
+++ b/Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.h
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechG810.h                              |
+|                                                           |
+|   RGBController for Logitech G810 Orion Spectrum          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                12 Jun 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechG810Controller.h"
+
+class RGBController_LogitechG810 : public RGBController
+{
+public:
+    RGBController_LogitechG810(LogitechG810Controller* controller_ptr);
+    ~RGBController_LogitechG810();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    LogitechG810Controller* controller;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechG810.h b/Controllers/LogitechController/RGBController_LogitechG810.h
deleted file mode 100644
index 3228cb21..00000000
--- a/Controllers/LogitechController/RGBController_LogitechG810.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechG810.h             |
-|                                           |
-|  Generic RGB Interface for Logitech G810  |
-|  Orion Spectrum keyboard                  |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/12/2020   |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "LogitechG810Controller.h"
-
-class RGBController_LogitechG810 : public RGBController
-{
-public:
-    RGBController_LogitechG810(LogitechG810Controller* controller_ptr);
-    ~RGBController_LogitechG810();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-    
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    LogitechG810Controller* controller;
-};