diff --git a/right/build/kds/.cproject b/right/build/kds/.cproject
index 166d2ca..2476976 100644
--- a/right/build/kds/.cproject
+++ b/right/build/kds/.cproject
@@ -73,6 +73,7 @@
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.336878990" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
+									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../src/include/usb"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa"/>
@@ -213,6 +214,7 @@
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.767758500" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../.."/>
 									<listOptionValue builtIn="false" value="../../../src"/>
+									<listOptionValue builtIn="false" value="../../../src/usb_descriptors"/>
 									<listOptionValue builtIn="false" value="../../../src/include/usb"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa"/>
diff --git a/right/src/usb_descriptor_configuration.c b/right/src/usb_descriptors/usb_descriptor_configuration.c
similarity index 100%
rename from right/src/usb_descriptor_configuration.c
rename to right/src/usb_descriptors/usb_descriptor_configuration.c
diff --git a/right/src/usb_descriptor_configuration.h b/right/src/usb_descriptors/usb_descriptor_configuration.h
similarity index 100%
rename from right/src/usb_descriptor_configuration.h
rename to right/src/usb_descriptors/usb_descriptor_configuration.h
diff --git a/right/src/usb_descriptor_device.c b/right/src/usb_descriptors/usb_descriptor_device.c
similarity index 100%
rename from right/src/usb_descriptor_device.c
rename to right/src/usb_descriptors/usb_descriptor_device.c
diff --git a/right/src/usb_descriptor_device.h b/right/src/usb_descriptors/usb_descriptor_device.h
similarity index 100%
rename from right/src/usb_descriptor_device.h
rename to right/src/usb_descriptors/usb_descriptor_device.h
diff --git a/right/src/usb_descriptor_generic_hid_report.c b/right/src/usb_descriptors/usb_descriptor_generic_hid_report.c
similarity index 100%
rename from right/src/usb_descriptor_generic_hid_report.c
rename to right/src/usb_descriptors/usb_descriptor_generic_hid_report.c
diff --git a/right/src/usb_descriptor_generic_hid_report.h b/right/src/usb_descriptors/usb_descriptor_generic_hid_report.h
similarity index 100%
rename from right/src/usb_descriptor_generic_hid_report.h
rename to right/src/usb_descriptors/usb_descriptor_generic_hid_report.h
diff --git a/right/src/usb_descriptor_hid.c b/right/src/usb_descriptors/usb_descriptor_hid.c
similarity index 100%
rename from right/src/usb_descriptor_hid.c
rename to right/src/usb_descriptors/usb_descriptor_hid.c
diff --git a/right/src/usb_descriptor_hid.h b/right/src/usb_descriptors/usb_descriptor_hid.h
similarity index 100%
rename from right/src/usb_descriptor_hid.h
rename to right/src/usb_descriptors/usb_descriptor_hid.h
diff --git a/right/src/usb_descriptor_keyboard_report.c b/right/src/usb_descriptors/usb_descriptor_keyboard_report.c
similarity index 100%
rename from right/src/usb_descriptor_keyboard_report.c
rename to right/src/usb_descriptors/usb_descriptor_keyboard_report.c
diff --git a/right/src/usb_descriptor_keyboard_report.h b/right/src/usb_descriptors/usb_descriptor_keyboard_report.h
similarity index 100%
rename from right/src/usb_descriptor_keyboard_report.h
rename to right/src/usb_descriptors/usb_descriptor_keyboard_report.h
diff --git a/right/src/usb_descriptor_mouse_report.c b/right/src/usb_descriptors/usb_descriptor_mouse_report.c
similarity index 100%
rename from right/src/usb_descriptor_mouse_report.c
rename to right/src/usb_descriptors/usb_descriptor_mouse_report.c
diff --git a/right/src/usb_descriptor_mouse_report.h b/right/src/usb_descriptors/usb_descriptor_mouse_report.h
similarity index 100%
rename from right/src/usb_descriptor_mouse_report.h
rename to right/src/usb_descriptors/usb_descriptor_mouse_report.h
diff --git a/right/src/usb_descriptor_strings.c b/right/src/usb_descriptors/usb_descriptor_strings.c
similarity index 100%
rename from right/src/usb_descriptor_strings.c
rename to right/src/usb_descriptors/usb_descriptor_strings.c
diff --git a/right/src/usb_descriptor_strings.h b/right/src/usb_descriptors/usb_descriptor_strings.h
similarity index 100%
rename from right/src/usb_descriptor_strings.h
rename to right/src/usb_descriptors/usb_descriptor_strings.h