diff --git a/Controllers/LogitechController/LogitechG815Controller.cpp b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp
similarity index 94%
rename from Controllers/LogitechController/LogitechG815Controller.cpp
rename to Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp
index f9946b1a..cddf5946 100644
--- a/Controllers/LogitechController/LogitechG815Controller.cpp
+++ b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp
@@ -1,14 +1,16 @@
-/*-----------------------------------------*\
-|  LogitechG815Controller.cpp               |
-|                                           |
-|  Generic RGB Interface for Logitech G815  |
-|  RGB Mechanical Gaming Keyboard           |
-|                                           |
-|  Cheerpipe      3/20/2021                 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechG815Controller.cpp                                |
+|                                                           |
+|   Driver for Logitech G815                                |
+|                                                           |
+|   Cheerpipe                                   20 Mar 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "LogitechG815Controller.h"
 #include <cstring>
+#include "LogitechG815Controller.h"
 
 LogitechG815Controller::LogitechG815Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12)
 {
diff --git a/Controllers/LogitechController/LogitechG815Controller.h b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.h
similarity index 84%
rename from Controllers/LogitechController/LogitechG815Controller.h
rename to Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.h
index 1fd29f2d..715bee37 100644
--- a/Controllers/LogitechController/LogitechG815Controller.h
+++ b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.h
@@ -1,22 +1,23 @@
-/*-----------------------------------------*\
-|  LogitechG815Controller.h                 |
-|                                           |
-|  Generic RGB Interface for Logitech G815  |
-|  RGB Mechanical Gaming Keyboard           |
-|                                           |
-|  Cheerpipe      3/20/2021                 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechG815Controller.h                                  |
+|                                                           |
+|   Driver for Logitech G815                                |
+|                                                           |
+|   Cheerpipe                                   20 Mar 2021 |
+|                                                           |
+|   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>
+#include "RGBController.h"
 
 #define LOGITECH_G815_COMMIT_BYTE       0x7F
 #define LOGITECH_READ_TIMEOUT           300     //Timeout in ms
 
-#pragma once
-
 enum
 {
     LOGITECH_G815_ZONE_MODE_KEYBOARD        = 0x00,
diff --git a/Controllers/LogitechController/RGBController_LogitechG815.cpp b/Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.cpp
similarity index 97%
rename from Controllers/LogitechController/RGBController_LogitechG815.cpp
rename to Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.cpp
index 0635c526..fec2bf3b 100644
--- a/Controllers/LogitechController/RGBController_LogitechG815.cpp
+++ b/Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.cpp
@@ -1,17 +1,19 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechG815.cpp           |
-|                                           |
-|  Generic RGB Interface for Logitech G815  |
-|  RGB Mechanical Gaming Keyboard           |
-|                                           |
-|  Cheerpipe      3/20/2021                 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechG815.cpp                            |
+|                                                           |
+|   RGBController for Logitech G815                         |
+|                                                           |
+|   Cheerpipe                                   20 Mar 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBControllerKeyNames.h"
-#include "RGBController_LogitechG815.h"
 #include <cstring>
 #include <iterator>
 #include <map>
+#include "RGBControllerKeyNames.h"
+#include "RGBController_LogitechG815.h"
 
 #define NA  0xFFFFFFFF
 const size_t max_key_per_color  = 13;
diff --git a/Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.h b/Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.h
new file mode 100644
index 00000000..44d4711a
--- /dev/null
+++ b/Controllers/LogitechController/LogitechG815Controller/RGBController_LogitechG815.h
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechG815.h                              |
+|                                                           |
+|   RGBController for Logitech G815                         |
+|                                                           |
+|   Cheerpipe                                   20 Mar 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechG815Controller.h"
+
+class RGBController_LogitechG815 : public RGBController
+{
+public:
+    RGBController_LogitechG815(LogitechG815Controller* controller_ptr);
+    ~RGBController_LogitechG815();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    LogitechG815Controller* controller;
+    std::vector<RGBColor>   current_colors;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechG815.h b/Controllers/LogitechController/RGBController_LogitechG815.h
deleted file mode 100644
index 30e08bd5..00000000
--- a/Controllers/LogitechController/RGBController_LogitechG815.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechG815.h             |
-|                                           |
-|  Generic RGB Interface for Logitech G815  |
-|  RGB Mechanical Gaming Keyboard           |
-|                                           |
-|  Cheerpipe      3/20/2021                 |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "LogitechG815Controller.h"
-
-class RGBController_LogitechG815 : public RGBController
-{
-public:
-    RGBController_LogitechG815(LogitechG815Controller* controller_ptr);
-    ~RGBController_LogitechG815();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-    
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    LogitechG815Controller* controller;
-    std::vector<RGBColor>   current_colors;
-};