diff --git a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematControllerDetect_Linux.cpp b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematControllerDetect_Linux.cpp
similarity index 84%
rename from Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematControllerDetect_Linux.cpp
rename to Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematControllerDetect_Linux.cpp
index 57474010..21361747 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematControllerDetect_Linux.cpp
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematControllerDetect_Linux.cpp
@@ -1,6 +1,15 @@
-#include "Detector.h"
-#include "RGBController.h"
-#include "RGBController_HYTEMousemat.h"
+/*---------------------------------------------------------*\
+| HYTEMousematControllerDetect_Linux.cpp                    |
+|                                                           |
+|   Detector for HYTE mousemat (libusb implementation for   |
+|   Linux)                                                  |
+|                                                           |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include <vector>
 
 #ifdef __FreeBSD__
@@ -9,6 +18,10 @@
 #include <libusb-1.0/libusb.h>
 #endif
 
+#include "Detector.h"
+#include "RGBController.h"
+#include "RGBController_HYTEMousemat.h"
+
 /*-----------------------------------------------------*\
 | HYTE vendor ID                                        |
 \*-----------------------------------------------------*/
diff --git a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.cpp b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.cpp
similarity index 89%
rename from Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.cpp
rename to Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.cpp
index 0451b58e..684e3132 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.cpp
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.cpp
@@ -1,16 +1,19 @@
 /*---------------------------------------------------------*\
-|  HYTEMousematController.cpp                               |
+| HYTEMousematController_Linux.cpp                          |
 |                                                           |
-|  Driver for HYTE CNVS RGB mousemat controller             |
+|   Driver for HYTE mousemat (libusb implementation for     |
+|   Linux)                                                  |
 |                                                           |
-|  Adam Honse (calcprogrammer1@gmail.com), 7/18/2023        |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
-#include "HYTEMousematController_Linux.h"
-
 #include <cstring>
 #include <iomanip>
 #include <sstream>
+#include "HYTEMousematController_Linux.h"
 
 HYTEMousematController::HYTEMousematController(libusb_device_handle* dev_handle)
 {
diff --git a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.h b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.h
similarity index 70%
rename from Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.h
rename to Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.h
index 4ae19a05..dce2c88c 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.h
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Linux/HYTEMousematController_Linux.h
@@ -1,14 +1,17 @@
 /*---------------------------------------------------------*\
-|  HYTEMousematController.h                                 |
+| HYTEMousematController_Linux.h                            |
 |                                                           |
-|  Definitions for HYTE CNVS RGB mousemat controller        |
+|   Driver for HYTE mousemat (libusb implementation for     |
+|   Linux)                                                  |
 |                                                           |
-|  Adam Honse (calcprogrammer1@gmail.com), 7/18/2023        |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
 #pragma once
 
-#include "RGBController.h"
 #include <vector>
 
 #ifdef __FreeBSD__
@@ -17,6 +20,8 @@
 #include <libusb-1.0/libusb.h>
 #endif
 
+#include "RGBController.h"
+
 /*---------------------------------------------------------*\
 | HYTE CNVS endpoint values                                 |
 \*---------------------------------------------------------*/
diff --git a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematControllerDetect_Windows.cpp b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematControllerDetect_Windows.cpp
similarity index 80%
rename from Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematControllerDetect_Windows.cpp
rename to Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematControllerDetect_Windows.cpp
index 88549fc3..ec423d8d 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematControllerDetect_Windows.cpp
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematControllerDetect_Windows.cpp
@@ -1,9 +1,21 @@
+/*---------------------------------------------------------*\
+| HYTEMousematControllerDetect_Windows.cpp                  |
+|                                                           |
+|   Detector for HYTE mousemat (Serial implementation for   |
+|   Windows)                                                |
+|                                                           |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <vector>
 #include "Detector.h"
 #include "HYTEMousematController_Windows.h"
 #include "RGBController.h"
 #include "RGBController_HYTEMousemat.h"
 #include "find_usb_serial_port.h"
-#include <vector>
 
 #define HYTE_VID                0x3402
 
diff --git a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.cpp b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.cpp
similarity index 88%
rename from Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.cpp
rename to Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.cpp
index d6bc9c2c..c9ece09a 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.cpp
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.cpp
@@ -1,9 +1,13 @@
 /*---------------------------------------------------------*\
-|  HYTEMousematController.cpp                               |
+| HYTEMousematController_Windows.cpp                        |
 |                                                           |
-|  Driver for HYTE CNVS RGB mousemat controller             |
+|   Driver for HYTE mousemat (Serial implementation for     |
+|   Windows)                                                |
 |                                                           |
-|  Adam Honse (calcprogrammer1@gmail.com), 7/18/2023        |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
 #include "HYTEMousematController_Windows.h"
diff --git a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.h b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.h
similarity index 61%
rename from Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.h
rename to Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.h
index d767bc2f..d000b3ec 100644
--- a/Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.h
+++ b/Controllers/HYTEMousematController/HYTEMousematController_Windows/HYTEMousematController_Windows.h
@@ -1,16 +1,20 @@
 /*---------------------------------------------------------*\
-|  HYTEMousematController.h                                 |
+| HYTEMousematController_Windows.h                          |
 |                                                           |
-|  Definitions for HYTE CNVS RGB mousemat controller        |
+|   Driver for HYTE mousemat (Serial implementation for     |
+|   Windows)                                                |
 |                                                           |
-|  Adam Honse (calcprogrammer1@gmail.com), 7/18/2023        |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
 #pragma once
 
+#include <vector>
 #include "RGBController.h"
 #include "serial_port.h"
-#include <vector>
 
 class HYTEMousematController
 {
diff --git a/Controllers/HYTEMousematController/RGBController_HYTEMousemat.cpp b/Controllers/HYTEMousematController/RGBController_HYTEMousemat.cpp
index 6ef99cbd..371e98c7 100644
--- a/Controllers/HYTEMousematController/RGBController_HYTEMousemat.cpp
+++ b/Controllers/HYTEMousematController/RGBController_HYTEMousemat.cpp
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_HYTEMousemat.cpp           |
-|                                           |
-|  Generic RGB Interface for HYTE CNVS RGB  |
-|  mousemat                                 |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 7/18/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HYTEMousemat.cpp                            |
+|                                                           |
+|   RGBController for HYTE mousemat                         |
+|                                                           |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_HYTEMousemat.h"
 
diff --git a/Controllers/HYTEMousematController/RGBController_HYTEMousemat.h b/Controllers/HYTEMousematController/RGBController_HYTEMousemat.h
index 27b7d7c0..1db361ca 100644
--- a/Controllers/HYTEMousematController/RGBController_HYTEMousemat.h
+++ b/Controllers/HYTEMousematController/RGBController_HYTEMousemat.h
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_HYTEMousemat.h             |
-|                                           |
-|  Generic RGB Interface for HYTE CNVS RGB  |
-|  mousemat                                 |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 7/18/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HYTEMousemat.h                              |
+|                                                           |
+|   RGBController for HYTE mousemat                         |
+|                                                           |
+|   Adam Honse (calcprogrammer1@gmail.com)      18 Jul 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once