diff --git a/tests/.cproject b/tests/.cproject
index 5d69fa71..7bec32a6 100644
--- a/tests/.cproject
+++ b/tests/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="com.crt.advproject.toolchain.exe.debug.1281391870">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.toolchain.exe.debug.1281391870" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -57,123 +55,6 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-			<storageModule moduleId="scannerConfiguration"/>
-			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-				<buildTargets>
-					<target name="clean" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>clean</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="clobber" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>clobber</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="release" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>release</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>test:all</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test delta" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>test:delta</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test verbose" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>verbosity[4] test:all</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test verbose delta" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>verbosity[4] test:delta</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="clean" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>clean</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="clobber" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>clobber</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="release" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>release</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>test:all</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test delta" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>test:delta</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test verbose" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>verbosity[4] test:all</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="test verbose delta" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-						<buildCommand>rake.bat</buildCommand>
-						<buildArguments/>
-						<buildTarget>verbosity[4] test:delta</buildTarget>
-						<stopOnError>true</stopOnError>
-						<useDefaultCommand>false</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-				</buildTargets>
-			</storageModule>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -487,7 +368,7 @@
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 		<buildTargets>
-			<target name="clean" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="clean" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
@@ -495,7 +376,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="clobber" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="clobber" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>clobber</buildTarget>
@@ -503,7 +384,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="release" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="release" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>release</buildTarget>
@@ -511,7 +392,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="test" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="test" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>test:all</buildTarget>
@@ -519,7 +400,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="test delta" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="test delta" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>test:delta</buildTarget>
@@ -527,7 +408,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="test verbose" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="test verbose" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>verbosity[4] test:all</buildTarget>
@@ -535,7 +416,63 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="test verbose delta" path="tests/lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="test verbose delta" path="lpc18xx_43xx" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>verbosity[4] test:delta</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clean" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clobber" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>clobber</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="release" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>release</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="test" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>test:all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="test delta" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>test:delta</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="test verbose" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
+				<buildTarget>verbosity[4] test:all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>false</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="test verbose delta" path="lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
 				<buildArguments/>
 				<buildTarget>verbosity[4] test:delta</buildTarget>
@@ -545,6 +482,7 @@
 			</target>
 			<target name="clean" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -552,6 +490,7 @@
 			</target>
 			<target name="clobber" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>clobber</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -559,6 +498,7 @@
 			</target>
 			<target name="release" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>release</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -566,6 +506,7 @@
 			</target>
 			<target name="test" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>test:all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -573,6 +514,7 @@
 			</target>
 			<target name="test delta" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>test:delta</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -580,6 +522,7 @@
 			</target>
 			<target name="test verbose" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>verbosity[4] test:all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -587,6 +530,7 @@
 			</target>
 			<target name="test verbose delta" path="tests/lpc175x_6x" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>rake.bat</buildCommand>
+				<buildArguments/>
 				<buildTarget>verbosity[4] test:delta</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
diff --git a/tests/.project b/tests/.project
index c59396d0..e1b62486 100644
--- a/tests/.project
+++ b/tests/.project
@@ -67,9 +67,26 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>demo_vendor</name>
+			<type>2</type>
+			<location>C:/Users/hathach/Dropbox/tinyusb/workspace/tinyusb/vendor</location>
+		</link>
+		<link>
+			<name>demos</name>
+			<type>2</type>
+			<location>C:/Users/hathach/Dropbox/tinyusb/workspace/tinyusb/demos</location>
+		</link>
+		<link>
+			<name>tinyusb</name>
+			<type>2</type>
+			<location>C:/Users/hathach/Dropbox/tinyusb/workspace/tinyusb/tinyusb</location>
+		</link>
+	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1380304047311</id>
+			<id>1381816373996</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
@@ -78,7 +95,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1380304047319</id>
+			<id>1381816374006</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
@@ -87,16 +104,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1380304047327</id>
-			<name></name>
-			<type>10</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-docs</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1380304047336</id>
+			<id>1381816374017</id>
 			<name></name>
 			<type>26</type>
 			<matcher>