diff --git a/right/build/kds/.cproject b/right/build/kds/.cproject
index 08e0013..b3fd128 100644
--- a/right/build/kds/.cproject
+++ b/right/build/kds/.cproject
@@ -72,8 +72,8 @@
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1397207158" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<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="../../../include/usb"/>
-									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_FRDM-K22F/devices/MK22F51212/utilities"/>
+									<listOptionValue builtIn="false" value="../../../src"/>
+									<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"/>
@@ -212,7 +212,8 @@
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.955273220" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<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="../../../include/usb"/>
+									<listOptionValue builtIn="false" value="../../../src"/>
+									<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"/>
@@ -275,6 +276,9 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.869377978" name="usb_device_ch9.c" rcbsApplicability="disable" resourcePath="usb/device/source/usb_device_ch9.c" toolsToInvoke="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.955273220.137659836">
+						<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.955273220.137659836" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.955273220"/>
+					</fileInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
diff --git a/right/build/kds/.project b/right/build/kds/.project
index 8872b63..4ade08d 100644
--- a/right/build/kds/.project
+++ b/right/build/kds/.project
@@ -30,66 +30,26 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
-		<link>
-			<name>board</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
 		<link>
 			<name>drivers</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
-		<link>
-			<name>lufa</name>
-			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/lufa</locationURI>
-		</link>
 		<link>
 			<name>osa</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
-			<name>sources</name>
+			<name>src</name>
 			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src</locationURI>
 		</link>
 		<link>
 			<name>startup</name>
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
-		<link>
-			<name>board/board.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/board.c</locationURI>
-		</link>
-		<link>
-			<name>board/board.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/board.h</locationURI>
-		</link>
-		<link>
-			<name>board/clock_config.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/clock_config.c</locationURI>
-		</link>
-		<link>
-			<name>board/clock_config.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/clock_config.h</locationURI>
-		</link>
-		<link>
-			<name>board/pin_mux.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/pin_mux.c</locationURI>
-		</link>
-		<link>
-			<name>board/pin_mux.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/board/pin_mux.h</locationURI>
-		</link>
 		<link>
 			<name>drivers/fsl_clock.c</name>
 			<type>1</type>
@@ -145,166 +105,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa/usb_osa_bm.h</locationURI>
 		</link>
-		<link>
-			<name>sources/action.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/action.h</locationURI>
-		</link>
-		<link>
-			<name>sources/i2c.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/include/i2c.h</locationURI>
-		</link>
-		<link>
-			<name>sources/layer.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/layer.h</locationURI>
-		</link>
-		<link>
-			<name>sources/main.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/main.c</locationURI>
-		</link>
-		<link>
-			<name>sources/main.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/main.h</locationURI>
-		</link>
-		<link>
-			<name>sources/module.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/module.h</locationURI>
-		</link>
-		<link>
-			<name>sources/slot.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/slot.h</locationURI>
-		</link>
-		<link>
-			<name>sources/test_led.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/test_led.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_api.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_api.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_composite_device.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_composite_device.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_composite_device.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_composite_device.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_configuration.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_configuration.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_configuration.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_configuration.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_device.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_device.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_device.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_device.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_generic_hid_report.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_generic_hid_report.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_generic_hid_report.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_generic_hid_report.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_hid.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_hid.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_hid.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_hid.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_keyboard_report.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_keyboard_report.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_keyboard_report.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_keyboard_report.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_mouse_report.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_mouse_report.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_mouse_report.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_mouse_report.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_strings.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_strings.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_descriptor_strings.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_descriptor_strings.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_device_config.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_device_config.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_generic_hid.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_generic_hid.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_generic_hid.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_generic_hid.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_keyboard.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_keyboard.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_keyboard.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_keyboard.h</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_mouse.c</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_mouse.c</locationURI>
-		</link>
-		<link>
-			<name>sources/usb_interface_mouse.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_mouse.h</locationURI>
-		</link>
 		<link>
 			<name>startup/startup_MK22F51212.S</name>
 			<type>1</type>
@@ -353,12 +153,12 @@
 		<link>
 			<name>usb/device/class/usb_device_class.c</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_class.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_class.c</locationURI>
 		</link>
 		<link>
 			<name>usb/device/class/usb_device_class.h</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_class.h</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_class.h</locationURI>
 		</link>
 		<link>
 			<name>usb/device/include/usb_device.h</name>
@@ -373,12 +173,12 @@
 		<link>
 			<name>usb/device/source/usb_device_ch9.c</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_ch9.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_ch9.c</locationURI>
 		</link>
 		<link>
 			<name>usb/device/source/usb_device_ch9.h</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_ch9.h</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_ch9.h</locationURI>
 		</link>
 		<link>
 			<name>usb/device/source/usb_device_dci.c</name>
@@ -393,12 +193,12 @@
 		<link>
 			<name>usb/device/class/hid/usb_device_hid.c</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_hid.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_hid.c</locationURI>
 		</link>
 		<link>
 			<name>usb/device/class/hid/usb_device_hid.h</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/include/usb/usb_device_hid.h</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/include/usb/usb_device_hid.h</locationURI>
 		</link>
 		<link>
 			<name>usb/device/source/khci/usb_device_khci.c</name>
diff --git a/right/action.h b/right/src/action.h
similarity index 100%
rename from right/action.h
rename to right/src/action.h
diff --git a/right/include/README.md b/right/src/include/README.md
similarity index 100%
rename from right/include/README.md
rename to right/src/include/README.md
diff --git a/right/include/board/README.md b/right/src/include/board/README.md
similarity index 100%
rename from right/include/board/README.md
rename to right/src/include/board/README.md
diff --git a/right/include/board/board.c b/right/src/include/board/board.c
similarity index 100%
rename from right/include/board/board.c
rename to right/src/include/board/board.c
diff --git a/right/include/board/board.h b/right/src/include/board/board.h
similarity index 100%
rename from right/include/board/board.h
rename to right/src/include/board/board.h
diff --git a/right/include/board/clock_config.c b/right/src/include/board/clock_config.c
similarity index 100%
rename from right/include/board/clock_config.c
rename to right/src/include/board/clock_config.c
diff --git a/right/include/board/clock_config.h b/right/src/include/board/clock_config.h
similarity index 100%
rename from right/include/board/clock_config.h
rename to right/src/include/board/clock_config.h
diff --git a/right/include/board/pin_mux.c b/right/src/include/board/pin_mux.c
similarity index 100%
rename from right/include/board/pin_mux.c
rename to right/src/include/board/pin_mux.c
diff --git a/right/include/board/pin_mux.h b/right/src/include/board/pin_mux.h
similarity index 100%
rename from right/include/board/pin_mux.h
rename to right/src/include/board/pin_mux.h
diff --git a/right/include/lufa/Common.h b/right/src/include/lufa/Common.h
similarity index 100%
rename from right/include/lufa/Common.h
rename to right/src/include/lufa/Common.h
diff --git a/right/include/lufa/HIDClassCommon.h b/right/src/include/lufa/HIDClassCommon.h
similarity index 100%
rename from right/include/lufa/HIDClassCommon.h
rename to right/src/include/lufa/HIDClassCommon.h
diff --git a/right/include/lufa/HIDReportData.h b/right/src/include/lufa/HIDReportData.h
similarity index 100%
rename from right/include/lufa/HIDReportData.h
rename to right/src/include/lufa/HIDReportData.h
diff --git a/right/include/lufa/README.md b/right/src/include/lufa/README.md
similarity index 100%
rename from right/include/lufa/README.md
rename to right/src/include/lufa/README.md
diff --git a/right/include/usb/README.md b/right/src/include/usb/README.md
similarity index 100%
rename from right/include/usb/README.md
rename to right/src/include/usb/README.md
diff --git a/right/include/usb/usb_device_ch9.c b/right/src/include/usb/usb_device_ch9.c
similarity index 100%
rename from right/include/usb/usb_device_ch9.c
rename to right/src/include/usb/usb_device_ch9.c
diff --git a/right/include/usb/usb_device_ch9.h b/right/src/include/usb/usb_device_ch9.h
similarity index 100%
rename from right/include/usb/usb_device_ch9.h
rename to right/src/include/usb/usb_device_ch9.h
diff --git a/right/include/usb/usb_device_class.c b/right/src/include/usb/usb_device_class.c
similarity index 100%
rename from right/include/usb/usb_device_class.c
rename to right/src/include/usb/usb_device_class.c
diff --git a/right/include/usb/usb_device_class.h b/right/src/include/usb/usb_device_class.h
similarity index 100%
rename from right/include/usb/usb_device_class.h
rename to right/src/include/usb/usb_device_class.h
diff --git a/right/include/usb/usb_device_hid.c b/right/src/include/usb/usb_device_hid.c
similarity index 100%
rename from right/include/usb/usb_device_hid.c
rename to right/src/include/usb/usb_device_hid.c
diff --git a/right/include/usb/usb_device_hid.h b/right/src/include/usb/usb_device_hid.h
similarity index 100%
rename from right/include/usb/usb_device_hid.h
rename to right/src/include/usb/usb_device_hid.h
diff --git a/right/layer.h b/right/src/layer.h
similarity index 100%
rename from right/layer.h
rename to right/src/layer.h
diff --git a/right/main.c b/right/src/main.c
similarity index 100%
rename from right/main.c
rename to right/src/main.c
diff --git a/right/main.h b/right/src/main.h
similarity index 100%
rename from right/main.h
rename to right/src/main.h
diff --git a/right/module.h b/right/src/module.h
similarity index 100%
rename from right/module.h
rename to right/src/module.h
diff --git a/right/slot.h b/right/src/slot.h
similarity index 100%
rename from right/slot.h
rename to right/src/slot.h
diff --git a/right/test_led.h b/right/src/test_led.h
similarity index 100%
rename from right/test_led.h
rename to right/src/test_led.h
diff --git a/right/usb_api.h b/right/src/usb_api.h
similarity index 100%
rename from right/usb_api.h
rename to right/src/usb_api.h
diff --git a/right/usb_composite_device.c b/right/src/usb_composite_device.c
similarity index 100%
rename from right/usb_composite_device.c
rename to right/src/usb_composite_device.c
diff --git a/right/usb_composite_device.h b/right/src/usb_composite_device.h
similarity index 100%
rename from right/usb_composite_device.h
rename to right/src/usb_composite_device.h
diff --git a/right/usb_descriptor_configuration.c b/right/src/usb_descriptor_configuration.c
similarity index 100%
rename from right/usb_descriptor_configuration.c
rename to right/src/usb_descriptor_configuration.c
diff --git a/right/usb_descriptor_configuration.h b/right/src/usb_descriptor_configuration.h
similarity index 100%
rename from right/usb_descriptor_configuration.h
rename to right/src/usb_descriptor_configuration.h
diff --git a/right/usb_descriptor_device.c b/right/src/usb_descriptor_device.c
similarity index 100%
rename from right/usb_descriptor_device.c
rename to right/src/usb_descriptor_device.c
diff --git a/right/usb_descriptor_device.h b/right/src/usb_descriptor_device.h
similarity index 100%
rename from right/usb_descriptor_device.h
rename to right/src/usb_descriptor_device.h
diff --git a/right/usb_descriptor_generic_hid_report.c b/right/src/usb_descriptor_generic_hid_report.c
similarity index 100%
rename from right/usb_descriptor_generic_hid_report.c
rename to right/src/usb_descriptor_generic_hid_report.c
diff --git a/right/usb_descriptor_generic_hid_report.h b/right/src/usb_descriptor_generic_hid_report.h
similarity index 100%
rename from right/usb_descriptor_generic_hid_report.h
rename to right/src/usb_descriptor_generic_hid_report.h
diff --git a/right/usb_descriptor_hid.c b/right/src/usb_descriptor_hid.c
similarity index 100%
rename from right/usb_descriptor_hid.c
rename to right/src/usb_descriptor_hid.c
diff --git a/right/usb_descriptor_hid.h b/right/src/usb_descriptor_hid.h
similarity index 100%
rename from right/usb_descriptor_hid.h
rename to right/src/usb_descriptor_hid.h
diff --git a/right/usb_descriptor_keyboard_report.c b/right/src/usb_descriptor_keyboard_report.c
similarity index 100%
rename from right/usb_descriptor_keyboard_report.c
rename to right/src/usb_descriptor_keyboard_report.c
diff --git a/right/usb_descriptor_keyboard_report.h b/right/src/usb_descriptor_keyboard_report.h
similarity index 100%
rename from right/usb_descriptor_keyboard_report.h
rename to right/src/usb_descriptor_keyboard_report.h
diff --git a/right/usb_descriptor_mouse_report.c b/right/src/usb_descriptor_mouse_report.c
similarity index 100%
rename from right/usb_descriptor_mouse_report.c
rename to right/src/usb_descriptor_mouse_report.c
diff --git a/right/usb_descriptor_mouse_report.h b/right/src/usb_descriptor_mouse_report.h
similarity index 100%
rename from right/usb_descriptor_mouse_report.h
rename to right/src/usb_descriptor_mouse_report.h
diff --git a/right/usb_descriptor_strings.c b/right/src/usb_descriptor_strings.c
similarity index 100%
rename from right/usb_descriptor_strings.c
rename to right/src/usb_descriptor_strings.c
diff --git a/right/usb_descriptor_strings.h b/right/src/usb_descriptor_strings.h
similarity index 100%
rename from right/usb_descriptor_strings.h
rename to right/src/usb_descriptor_strings.h
diff --git a/right/usb_device_config.h b/right/src/usb_device_config.h
similarity index 100%
rename from right/usb_device_config.h
rename to right/src/usb_device_config.h
diff --git a/right/usb_interface_generic_hid.c b/right/src/usb_interface_generic_hid.c
similarity index 100%
rename from right/usb_interface_generic_hid.c
rename to right/src/usb_interface_generic_hid.c
diff --git a/right/usb_interface_generic_hid.h b/right/src/usb_interface_generic_hid.h
similarity index 100%
rename from right/usb_interface_generic_hid.h
rename to right/src/usb_interface_generic_hid.h
diff --git a/right/usb_interface_keyboard.c b/right/src/usb_interface_keyboard.c
similarity index 100%
rename from right/usb_interface_keyboard.c
rename to right/src/usb_interface_keyboard.c
diff --git a/right/usb_interface_keyboard.h b/right/src/usb_interface_keyboard.h
similarity index 100%
rename from right/usb_interface_keyboard.h
rename to right/src/usb_interface_keyboard.h
diff --git a/right/usb_interface_mouse.c b/right/src/usb_interface_mouse.c
similarity index 100%
rename from right/usb_interface_mouse.c
rename to right/src/usb_interface_mouse.c
diff --git a/right/usb_interface_mouse.h b/right/src/usb_interface_mouse.h
similarity index 100%
rename from right/usb_interface_mouse.h
rename to right/src/usb_interface_mouse.h