diff --git a/demos/device/device_os_none/.project b/demos/device/device_os_none/.project
index 406c4de7c..4f17e67a1 100644
--- a/demos/device/device_os_none/.project
+++ b/demos/device/device_os_none/.project
@@ -103,21 +103,21 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1394632197708</id>
-			<name></name>
+			<id>1394686778466</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_keil</arguments>
+				<arguments>1.0-name-matches-false-false-iar</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1394632197724</id>
-			<name></name>
+			<id>1394686778491</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_iar</arguments>
+				<arguments>1.0-name-matches-false-false-keil</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index 3f8a7e54b..ee540d5ec 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -932,7 +932,7 @@
       <Focus>0</Focus>
       <ColumnNumber>3</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>71</TopLine>
+      <TopLine>72</TopLine>
       <CurrentLine>78</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
@@ -964,7 +964,7 @@
       <Focus>0</Focus>
       <ColumnNumber>23</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>98</TopLine>
+      <TopLine>119</TopLine>
       <CurrentLine>128</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\keyboardd_app.c</PathWithFileName>
@@ -1068,7 +1068,7 @@
       <Focus>0</Focus>
       <ColumnNumber>68</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>35</TopLine>
+      <TopLine>36</TopLine>
       <CurrentLine>37</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\tusb.c</PathWithFileName>
@@ -1388,7 +1388,7 @@
       <Focus>0</Focus>
       <ColumnNumber>5</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>228</TopLine>
+      <TopLine>229</TopLine>
       <CurrentLine>232</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\device\usbd.c</PathWithFileName>
@@ -1679,7 +1679,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC11Uxx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1703,7 +1703,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC13Uxx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1855,7 +1855,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1991,7 +1991,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj
index b54217a07..d1be63cb7 100644
--- a/demos/device/device_os_none/device_os_none.uvproj
+++ b/demos/device/device_os_none/device_os_none.uvproj
@@ -690,7 +690,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -756,7 +756,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -862,7 +862,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -907,7 +907,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1637,7 +1637,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1703,7 +1703,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -1809,7 +1809,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1854,7 +1854,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2232,7 +2232,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x1A000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
-            <ScatterFile>..\..\..\mcu\lpc13uxx\startup_keil\lpc13uxx.sct</ScatterFile>
+            <ScatterFile>..\..\..\mcu\lpc13uxx\keil\lpc13uxx.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>
@@ -2544,7 +2544,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2554,7 +2554,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -2660,7 +2660,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2761,7 +2761,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3451,7 +3451,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3517,7 +3517,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -3567,7 +3567,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3668,7 +3668,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4046,7 +4046,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x1A000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
-            <ScatterFile>..\..\..\mcu\lpc11uxx\startup_keil\lpc11uxx.sct</ScatterFile>
+            <ScatterFile>..\..\..\mcu\lpc11uxx\keil\lpc11uxx.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>
@@ -4342,7 +4342,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4408,7 +4408,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -4514,7 +4514,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4615,7 +4615,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -5305,7 +5305,7 @@
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -5371,7 +5371,7 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
@@ -5477,7 +5477,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -5522,7 +5522,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject
index f6e871ba0..1c7b8cc77 100644
--- a/demos/host/host_freertos/.cproject
+++ b/demos/host/host_freertos/.cproject
@@ -2761,8 +2761,8 @@
 	<storageModule moduleId="com.crt.config">
 		<projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;
 &lt;TargetConfig&gt;&#13;
-&lt;Properties property_0="" property_3="NXP" property_4="LPC4330" property_count="5" version="1"/&gt;&#13;
-&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC4330" match_id="0x0" name="LPC4330" resetscript="LPC18LPC43ExternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"&gt;&lt;chip&gt;&lt;name&gt;LPC4330&lt;/name&gt;&#13;
+&lt;Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="1"/&gt;&#13;
+&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" resetscript="LPC18LPC43InternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"&gt;&lt;chip&gt;&lt;name&gt;LPC4357&lt;/name&gt;&#13;
 &lt;family&gt;LPC43xx&lt;/family&gt;&#13;
 &lt;vendor&gt;NXP (formerly Philips)&lt;/vendor&gt;&#13;
 &lt;reset board="None" core="Real" sys="Real"/&gt;&#13;
@@ -2770,11 +2770,17 @@
 &lt;memory can_program="true" id="Flash" is_ro="true" type="Flash"/&gt;&#13;
 &lt;memory id="RAM" type="RAM"/&gt;&#13;
 &lt;memory id="Periph" is_volatile="true" type="Peripheral"/&gt;&#13;
-&lt;memoryInstance derived_from="RAM" id="RamLoc128" location="0x10000000" size="0x20000"/&gt;&#13;
-&lt;memoryInstance derived_from="RAM" id="RamLoc72" location="0x10080000" size="0x12000"/&gt;&#13;
+&lt;memoryInstance derived_from="Flash" id="MFlashA512" location="0x1a000000" size="0x80000"/&gt;&#13;
+&lt;memoryInstance derived_from="Flash" id="MFlashB512" location="0x1b000000" size="0x80000"/&gt;&#13;
+&lt;memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/&gt;&#13;
+&lt;memoryInstance derived_from="RAM" id="RamLoc40" location="0x10080000" size="0xa000"/&gt;&#13;
 &lt;memoryInstance derived_from="RAM" id="RamAHB32" location="0x20000000" size="0x8000"/&gt;&#13;
 &lt;memoryInstance derived_from="RAM" id="RamAHB16" location="0x20008000" size="0x4000"/&gt;&#13;
 &lt;memoryInstance derived_from="RAM" id="RamAHB_ETB16" location="0x2000c000" size="0x4000"/&gt;&#13;
+&lt;prog_flash blocksz="0x2000" location="0x1a000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/&gt;&#13;
+&lt;prog_flash blocksz="0x10000" location="0x1a010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/&gt;&#13;
+&lt;prog_flash blocksz="0x2000" location="0x1b000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/&gt;&#13;
+&lt;prog_flash blocksz="0x10000" location="0x1b010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/&gt;&#13;
 &lt;peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/&gt;&#13;
 &lt;peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/&gt;&#13;
 &lt;peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/&gt;&#13;
@@ -2786,6 +2792,7 @@
 &lt;peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/&gt;&#13;
 &lt;peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/&gt;&#13;
 &lt;peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/&gt;&#13;
+&lt;peripheralInstance derived_from="LCD" id="LCD" location="0x40008000"/&gt;&#13;
 &lt;peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/&gt;&#13;
 &lt;peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/&gt;&#13;
 &lt;peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/&gt;&#13;
diff --git a/demos/host/host_freertos/.project b/demos/host/host_freertos/.project
index cac4c13a0..6f6b180e6 100644
--- a/demos/host/host_freertos/.project
+++ b/demos/host/host_freertos/.project
@@ -113,21 +113,21 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1394642985711</id>
-			<name></name>
+			<id>1394684566713</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_keil</arguments>
+				<arguments>1.0-name-matches-false-false-iar</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1394642985721</id>
-			<name></name>
+			<id>1394684566728</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_iar</arguments>
+				<arguments>1.0-name-matches-false-false-keil</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt
index 253d6d8ba..ea04b496e 100644
--- a/demos/host/host_freertos/host_freertos.uvopt
+++ b/demos/host/host_freertos/host_freertos.uvopt
@@ -73,7 +73,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <DllOpt>
@@ -555,7 +555,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <Books>
@@ -620,7 +620,7 @@
         <tDllPa></tDllPa>
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
-        <tIfile>..\..\..\mcu\lpc43xx\keil_ram.ini</tIfile>
+        <tIfile>..\..\..\mcu\lpc43xx\keil\keil_ram.ini</tIfile>
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
@@ -706,7 +706,7 @@
       <Focus>0</Focus>
       <ColumnNumber>9</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>3</TopLine>
+      <TopLine>5</TopLine>
       <CurrentLine>11</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
@@ -1168,10 +1168,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>37</ColumnNumber>
+      <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>22</TopLine>
-      <CurrentLine>39</CurrentLine>
+      <TopLine>41</TopLine>
+      <CurrentLine>49</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName>
       <FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath>
@@ -1549,7 +1549,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1749,7 +1749,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj
index 50875c793..e53f89641 100644
--- a/demos/host/host_freertos/host_freertos.uvproj
+++ b/demos/host/host_freertos/host_freertos.uvproj
@@ -709,7 +709,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
@@ -830,7 +830,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1539,7 +1539,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
@@ -1660,7 +1660,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2425,7 +2425,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
@@ -2490,7 +2490,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2642,7 +2642,7 @@
             <CpuDllArguments></CpuDllArguments>
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile>..\..\..\mcu\lpc43xx\keil_ram.ini</InitializationFile>
+            <InitializationFile>..\..\..\mcu\lpc43xx\keil\keil_ram.ini</InitializationFile>
             <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
@@ -3199,7 +3199,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
@@ -3320,7 +3320,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/demos/host/host_os_none/.project b/demos/host/host_os_none/.project
index b35d021e4..c73cfecb6 100644
--- a/demos/host/host_os_none/.project
+++ b/demos/host/host_os_none/.project
@@ -108,21 +108,21 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1394619722725</id>
-			<name></name>
+			<id>1394685086167</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_iar</arguments>
+				<arguments>1.0-name-matches-false-false-iar</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1394619722739</id>
-			<name></name>
+			<id>1394685086182</id>
+			<name>mcu</name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-startup_keil</arguments>
+				<arguments>1.0-name-matches-false-false-keil</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index f618fea97..5b7d18262 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -499,7 +499,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <Books>
@@ -713,7 +713,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <Books>
@@ -778,7 +778,7 @@
         <tDllPa></tDllPa>
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
-        <tIfile>..\..\..\mcu\lpc43xx\keil_ram.ini</tIfile>
+        <tIfile>..\..\..\mcu\lpc43xx\keil\keil_ram.ini</tIfile>
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
@@ -916,10 +916,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>6</ColumnNumber>
+      <ColumnNumber>1</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>103</TopLine>
-      <CurrentLine>115</CurrentLine>
+      <TopLine>106</TopLine>
+      <CurrentLine>114</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -934,7 +934,7 @@
       <Focus>0</Focus>
       <ColumnNumber>61</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>119</TopLine>
+      <TopLine>120</TopLine>
       <CurrentLine>121</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\cdc_serial_app.c</PathWithFileName>
@@ -998,7 +998,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>124</TopLine>
+      <TopLine>139</TopLine>
       <CurrentLine>149</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\msc_app.c</PathWithFileName>
@@ -1014,7 +1014,7 @@
       <Focus>0</Focus>
       <ColumnNumber>40</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>213</TopLine>
+      <TopLine>228</TopLine>
       <CurrentLine>238</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\cli.c</PathWithFileName>
@@ -1462,7 +1462,7 @@
       <Focus>0</Focus>
       <ColumnNumber>43</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>1</TopLine>
+      <TopLine>5</TopLine>
       <CurrentLine>15</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>
@@ -1674,7 +1674,7 @@
 
   <Group>
     <GroupName>bsp lpc43xx</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1684,12 +1684,12 @@
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>35</ColumnNumber>
+      <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>138</TopLine>
-      <CurrentLine>148</CurrentLine>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1889,7 +1889,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj
index e4fa643b5..4e639ebf4 100644
--- a/demos/host/host_os_none/host_os_none.uvproj
+++ b/demos/host/host_os_none/host_os_none.uvproj
@@ -644,7 +644,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
@@ -765,7 +765,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1409,7 +1409,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
@@ -1530,7 +1530,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2230,7 +2230,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
@@ -2295,7 +2295,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2447,7 +2447,7 @@
             <CpuDllArguments></CpuDllArguments>
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile>..\..\..\mcu\lpc43xx\keil_ram.ini</InitializationFile>
+            <InitializationFile>..\..\..\mcu\lpc43xx\keil\keil_ram.ini</InitializationFile>
             <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
@@ -2939,7 +2939,7 @@
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
@@ -3060,7 +3060,7 @@
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>