diff --git a/right/build/kds/.cproject b/right/build/kds/.cproject
index a808f87..acb7bb0 100644
--- a/right/build/kds/.cproject
+++ b/right/build/kds/.cproject
@@ -74,7 +74,6 @@
 									<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"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/include"/>
@@ -83,6 +82,7 @@
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/devices/MK22F51212/drivers"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/devices/MK22F51212"/>
 									<listOptionValue builtIn="false" value="../../../../include"/>
+									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.933718024" name="Language standard" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu99" valueType="enumerated"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.62587551" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -142,6 +142,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule moduleId="ilg.gnuarmeclipse.managedbuild.packs"/>
 		</cconfiguration>
 		<cconfiguration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834" moduleId="org.eclipse.cdt.core.settings" name="release">
@@ -214,8 +215,8 @@
 								<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/ksdk_usb"/>
 									<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"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/include"/>
diff --git a/right/src/include/usb/README.md b/right/src/ksdk_usb/README.md
similarity index 100%
rename from right/src/include/usb/README.md
rename to right/src/ksdk_usb/README.md
diff --git a/right/src/include/usb/usb_device_ch9.c b/right/src/ksdk_usb/usb_device_ch9.c
similarity index 100%
rename from right/src/include/usb/usb_device_ch9.c
rename to right/src/ksdk_usb/usb_device_ch9.c
diff --git a/right/src/include/usb/usb_device_ch9.h b/right/src/ksdk_usb/usb_device_ch9.h
similarity index 100%
rename from right/src/include/usb/usb_device_ch9.h
rename to right/src/ksdk_usb/usb_device_ch9.h
diff --git a/right/src/include/usb/usb_device_class.c b/right/src/ksdk_usb/usb_device_class.c
similarity index 100%
rename from right/src/include/usb/usb_device_class.c
rename to right/src/ksdk_usb/usb_device_class.c
diff --git a/right/src/include/usb/usb_device_class.h b/right/src/ksdk_usb/usb_device_class.h
similarity index 100%
rename from right/src/include/usb/usb_device_class.h
rename to right/src/ksdk_usb/usb_device_class.h
diff --git a/right/src/include/usb/usb_device_hid.c b/right/src/ksdk_usb/usb_device_hid.c
similarity index 100%
rename from right/src/include/usb/usb_device_hid.c
rename to right/src/ksdk_usb/usb_device_hid.c
diff --git a/right/src/include/usb/usb_device_hid.h b/right/src/ksdk_usb/usb_device_hid.h
similarity index 100%
rename from right/src/include/usb/usb_device_hid.h
rename to right/src/ksdk_usb/usb_device_hid.h
diff --git a/right/src/usb_api.h b/right/src/usb_api.h
index ae8797c..551037a 100644
--- a/right/src/usb_api.h
+++ b/right/src/usb_api.h
@@ -6,8 +6,8 @@
     #include "usb_device_config.h"
     #include "usb.h"
     #include "usb_device.h"
-    #include "include/usb/usb_device_class.h"
-    #include "include/usb/usb_device_hid.h"
+    #include "ksdk_usb/usb_device_class.h"
+    #include "ksdk_usb/usb_device_hid.h"
 
     #include "include/lufa/Common.h"
     #include "include/lufa/HIDClassCommon.h"