diff --git a/Controllers/LogitechController/LogitechLightspeedController.cpp b/Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.cpp
similarity index 72%
rename from Controllers/LogitechController/LogitechLightspeedController.cpp
rename to Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.cpp
index 14856c7d..c790d3eb 100644
--- a/Controllers/LogitechController/LogitechLightspeedController.cpp
+++ b/Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.cpp
@@ -1,15 +1,16 @@
-/*-----------------------------------------*\
-|  LogitechLightspeedController.cpp         |
-|                                           |
-|  Driver for Logitech Lightspeed Wireless  |
-|  Gaming Mice lighting controller          |
-|                                           |
-|  TheRogueZeta   8/5/2020                  |
-\*-----------------------------------------*/
-
-#include "LogitechLightspeedController.h"
+/*---------------------------------------------------------*\
+| LogitechLightspeedController.cpp                          |
+|                                                           |
+|   Driver for Logitech Lightspeed                          |
+|                                                           |
+|   TheRogueZeta                                05 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "LogitechLightspeedController.h"
 
 LogitechLightspeedController::LogitechLightspeedController(hid_device* dev_handle, const char* path)
 {
diff --git a/Controllers/LogitechController/LogitechLightspeedController.h b/Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.h
similarity index 73%
rename from Controllers/LogitechController/LogitechLightspeedController.h
rename to Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.h
index 1915cd66..b460cc96 100644
--- a/Controllers/LogitechController/LogitechLightspeedController.h
+++ b/Controllers/LogitechController/LogitechLightspeedController/LogitechLightspeedController.h
@@ -1,21 +1,22 @@
-/*-----------------------------------------*\
-|  LogitechLightspeedController.h           |
-|                                           |
-|  Definitions and types for Logitech G     |
-|  Lightsync Wireless Gaming Mice lighting  |
-|  controller                               |
-|                                           |
-|  TheRogueZeta   8/5/2020                  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| LogitechLightspeedController.h                            |
+|                                                           |
+|   Driver for Logitech Lightspeed                          |
+|                                                           |
+|   TheRogueZeta                                05 Aug 2020 |
+|                                                           |
+|   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"
 #include "LogManager.h"
 #include "LogitechProtocolCommon.h"
 
-#include <string>
-#include <hidapi/hidapi.h>
-
-#pragma once
 #define LOGITECH_G_PRO_WIRELESS_BRIGHTNESS_MIN      0x01
 #define LOGITECH_G_PRO_WIRELESS_BRIGHTNESS_MAX      0x64
 
diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp b/Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.cpp
similarity index 94%
rename from Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
rename to Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.cpp
index ac3ad350..41156497 100644
--- a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
+++ b/Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechLightspeed.cpp     |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech Lightspeed Gaming Mice          |
-|                                           |
-|  TheRogueZeta   8/5/2020                  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechLightspeed.cpp                      |
+|                                                           |
+|   RGBController for Logitech Lightspeed                   |
+|                                                           |
+|   TheRogueZeta                                05 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_LogitechLightspeed.h"
 
diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.h b/Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.h
similarity index 52%
rename from Controllers/LogitechController/RGBController_LogitechLightspeed.h
rename to Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.h
index 0b3e325b..3d57b0fb 100644
--- a/Controllers/LogitechController/RGBController_LogitechLightspeed.h
+++ b/Controllers/LogitechController/LogitechLightspeedController/RGBController_LogitechLightspeed.h
@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  RGBController_LogitechLightspeed.h       |
-|                                           |
-|  Generic RGB Interface for                |
-|  Logitech Lightspeed Gaming Mice          |
-|                                           |
-|  TheRogueZeta   8/5/2020                  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_LogitechLightspeed.h                        |
+|                                                           |
+|   RGBController for Logitech Lightspeed                   |
+|                                                           |
+|   TheRogueZeta                                05 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
+
 #include "RGBController.h"
 #include "LogitechLightspeedController.h"