diff --git a/right/build/kds/.cproject b/right/build/kds/.cproject
index 2d4a519..b699477 100644
--- a/right/build/kds/.cproject
+++ b/right/build/kds/.cproject
@@ -76,7 +76,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -220,7 +219,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -364,7 +362,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -508,7 +505,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -650,7 +646,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -795,7 +790,6 @@
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
-									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -890,10 +884,10 @@
 		<configuration configurationName="v7-debug-srec">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
-		<configuration configurationName="release-v7"/>
 		<configuration configurationName="debug">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
+		<configuration configurationName="release-v7"/>
 		<configuration configurationName="release">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 35d62a5..d5e4116 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -1,8 +1,8 @@
 #include "fsl_common.h"
 #include "usb_api.h"
 #include "usb_composite_device.h"
-#include "usb_descriptor_hid.h"
-#include "usb_descriptor_strings.h"
+#include "usb_descriptors/usb_descriptor_hid.h"
+#include "usb_descriptors/usb_descriptor_strings.h"
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
 usb_composite_device_t UsbCompositeDevice;
diff --git a/right/src/usb_composite_device.h b/right/src/usb_composite_device.h
index 6f7f550..d256a8e 100644
--- a/right/src/usb_composite_device.h
+++ b/right/src/usb_composite_device.h
@@ -3,7 +3,7 @@
 
 // Includes:
 
-    #include "usb_descriptor_configuration.h"
+    #include "usb_descriptors/usb_descriptor_configuration.h"
 
 // Macros:
 
diff --git a/right/src/usb_interfaces/usb_interface_generic_hid.h b/right/src/usb_interfaces/usb_interface_generic_hid.h
index 8417eef..3bf4e97 100644
--- a/right/src/usb_interfaces/usb_interface_generic_hid.h
+++ b/right/src/usb_interfaces/usb_interface_generic_hid.h
@@ -4,7 +4,7 @@
 // Includes:
 
     #include "usb_api.h"
-    #include "usb_descriptor_device.h"
+    #include "usb_descriptors/usb_descriptor_device.h"
     #include "usb_protocol_handler.h"
 
 // Macros:
diff --git a/right/src/usb_interfaces/usb_interface_keyboard.h b/right/src/usb_interfaces/usb_interface_keyboard.h
index 5b94930..828c83c 100644
--- a/right/src/usb_interfaces/usb_interface_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_keyboard.h
@@ -4,7 +4,7 @@
 // Includes:
 
     #include "usb_api.h"
-    #include "usb_descriptor_keyboard_report.h"
+    #include "usb_descriptors/usb_descriptor_keyboard_report.h"
 
 // Macros:
 
diff --git a/right/src/usb_interfaces/usb_interface_mouse.h b/right/src/usb_interfaces/usb_interface_mouse.h
index 297e46b..41165bf 100644
--- a/right/src/usb_interfaces/usb_interface_mouse.h
+++ b/right/src/usb_interfaces/usb_interface_mouse.h
@@ -4,7 +4,7 @@
 // Includes:
 
     #include "usb_api.h"
-    #include "usb_descriptor_device.h"
+    #include "usb_descriptors/usb_descriptor_device.h"
 
 // Macros: