diff --git a/Controllers/LogitechController/LogitechX56Controller.h b/Controllers/LogitechController/LogitechX56Controller.h
deleted file mode 100644
index 2d99f4dc..00000000
--- a/Controllers/LogitechController/LogitechX56Controller.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-----------------------------------------*\
-|  LogitechX56Controller.h                  |
-|                                           |
-|  Generic RGB Interface Logitech X56       |
-|  Class                                    |
-|                                           |
-|  Edbgon 11/06/2021                        |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <string>
-#include <hidapi/hidapi.h>
-
-#pragma once
-
-#define X56_CONTROLLER_PACKET_SIZE          64
-
-class LogitechX56Controller
-{
-public:
-    LogitechX56Controller(hid_device* dev_handle, const char* path);
-
-    ~LogitechX56Controller();
-
-    std::string GetDeviceLocation();
-    char*       GetDeviceName();
-    std::string GetSerialString();
-
-    void SetColor(RGBColor colors, uint8_t brightness);
-    void Save();
-
-private:
-    char                    device_name[32];
-    hid_device*             dev;
-    std::string             location;
-};
diff --git a/Controllers/LogitechController/LogitechX56Controller.cpp b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp
similarity index 82%
rename from Controllers/LogitechController/LogitechX56Controller.cpp
rename to Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp
index 40d4f802..cb65d737 100644
--- a/Controllers/LogitechController/LogitechX56Controller.cpp
+++ b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp
@@ -1,14 +1,16 @@
-/*-----------------------------------------*\
-|  LogitechX56Controller.cpp                |
-|                                           |
-|  Generic RGB Interface Logitech X56       |
-|  Class                                    |
-|                                           |
-|  Edbgon 11/06/2021                        |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechX56Controller.cpp                                 |
+|                                                           |
+|   Driver for Logitech X56                                 |
+|                                                           |
+|   Edbgon                                      11 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "LogitechX56Controller.h"
 #include <cstring>
+#include "LogitechX56Controller.h"
 
 LogitechX56Controller::LogitechX56Controller(hid_device* dev_handle, const char* path)
 {
diff --git a/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.h b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.h
new file mode 100644
index 00000000..a8b1e344
--- /dev/null
+++ b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.h
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------*\
+| LogitechX56Controller.h                                   |
+|                                                           |
+|   Driver for Logitech X56                                 |
+|                                                           |
+|   Edbgon                                      11 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <string>
+#include <hidapi/hidapi.h>
+#include "RGBController.h"
+
+#define X56_CONTROLLER_PACKET_SIZE          64
+
+class LogitechX56Controller
+{
+public:
+    LogitechX56Controller(hid_device* dev_handle, const char* path);
+
+    ~LogitechX56Controller();
+
+    std::string GetDeviceLocation();
+    char*       GetDeviceName();
+    std::string GetSerialString();
+
+    void SetColor(RGBColor colors, uint8_t brightness);
+    void Save();
+
+private:
+    char                    device_name[32];
+    hid_device*             dev;
+    std::string             location;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechX56.cpp b/Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.cpp
similarity index 83%
rename from Controllers/LogitechController/RGBController_LogitechX56.cpp
rename to Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.cpp
index dd995aad..7689cc5a 100644
--- a/Controllers/LogitechController/RGBController_LogitechX56.cpp
+++ b/Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechX56.cpp            |
-|                                           |
-|  Generic RGB Interface Logitech X56       |
-|  Class                                    |
-|                                           |
-|  Edbgon 11/06/2021                        |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechX56.cpp                             |
+|                                                           |
+|   RGBController for Logitech X56                          |
+|                                                           |
+|   Edbgon                                      11 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_LogitechX56.h"
 
diff --git a/Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.h b/Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.h
new file mode 100644
index 00000000..49fc5857
--- /dev/null
+++ b/Controllers/LogitechController/LogitechX56Controller/RGBController_LogitechX56.h
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------*\
+| RGBController_LogitechX56.h                               |
+|                                                           |
+|   RGBController for Logitech X56                          |
+|                                                           |
+|   Edbgon                                      11 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "LogitechX56Controller.h"
+
+class RGBController_LogitechX56 : public RGBController
+{
+public:
+    RGBController_LogitechX56(LogitechX56Controller* controller_ptr);
+    ~RGBController_LogitechX56();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+    void        DeviceSaveMode();
+
+private:
+    LogitechX56Controller*      controller;
+};
diff --git a/Controllers/LogitechController/RGBController_LogitechX56.h b/Controllers/LogitechController/RGBController_LogitechX56.h
deleted file mode 100644
index efc673f4..00000000
--- a/Controllers/LogitechController/RGBController_LogitechX56.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechX56.h              |
-|                                           |
-|  Generic RGB Interface Logitech X56       |
-|  Class                                    |
-|                                           |
-|  Edbgon 11/06/2021                        |
-\*-----------------------------------------*/
-
-#pragma once
-
-#include "RGBController.h"
-#include "LogitechX56Controller.h"
-
-class RGBController_LogitechX56 : public RGBController
-{
-public:
-    RGBController_LogitechX56(LogitechX56Controller* controller_ptr);
-    ~RGBController_LogitechX56();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-    void        DeviceSaveMode();
-
-private:
-    LogitechX56Controller*      controller;
-};