diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index 67589b0c8..3f8a7e54b 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -73,7 +73,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <DllOpt>
@@ -793,7 +793,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <Books>
@@ -858,7 +858,7 @@
         <tDllPa></tDllPa>
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
-        <tIfile>..\..\bsp\lpc43xx\keil_ram.ini</tIfile>
+        <tIfile>..\..\..\mcu\lpc43xx\keil_ram.ini</tIfile>
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
@@ -930,10 +930,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
+      <ColumnNumber>3</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>79</TopLine>
-      <CurrentLine>86</CurrentLine>
+      <TopLine>71</TopLine>
+      <CurrentLine>78</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -964,7 +964,7 @@
       <Focus>0</Focus>
       <ColumnNumber>23</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>127</TopLine>
+      <TopLine>98</TopLine>
       <CurrentLine>128</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\keyboardd_app.c</PathWithFileName>
@@ -1066,10 +1066,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
+      <ColumnNumber>68</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
+      <TopLine>35</TopLine>
+      <CurrentLine>37</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\tusb.c</PathWithFileName>
       <FilenameWithoutPath>tusb.c</FilenameWithoutPath>
@@ -1386,10 +1386,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
+      <ColumnNumber>5</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>225</TopLine>
-      <CurrentLine>229</CurrentLine>
+      <TopLine>228</TopLine>
+      <CurrentLine>232</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\device\usbd.c</PathWithFileName>
       <FilenameWithoutPath>usbd.c</FilenameWithoutPath>
@@ -1463,7 +1463,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\board.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\board.c</PathWithFileName>
       <FilenameWithoutPath>board.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1479,7 +1479,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</PathWithFileName>
       <FilenameWithoutPath>board_ea4357.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1495,7 +1495,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\printf_retarget.c</PathWithFileName>
       <FilenameWithoutPath>printf_retarget.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1506,12 +1506,12 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>25</ColumnNumber>
+      <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</PathWithFileName>
       <FilenameWithoutPath>pca9532.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1527,7 +1527,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\ngx\board_ngx4330.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\ngx\board_ngx4330.c</PathWithFileName>
       <FilenameWithoutPath>board_ngx4330.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1543,7 +1543,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\microbuilder\board_lpc4357usb.c</PathWithFileName>
       <FilenameWithoutPath>board_lpc4357usb.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1559,7 +1559,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\microbuilder\board_rf1ghznode.c</PathWithFileName>
       <FilenameWithoutPath>board_rf1ghznode.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1575,7 +1575,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</PathWithFileName>
       <FilenameWithoutPath>board_lpcxpresso1769.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1591,7 +1591,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</PathWithFileName>
       <FilenameWithoutPath>board_lpcxpresso1347.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1607,7 +1607,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\boards\keil\board_mcb4300.c</PathWithFileName>
+      <PathWithFileName>..\..\..\boards\keil\board_mcb4300.c</PathWithFileName>
       <FilenameWithoutPath>board_mcb4300.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1631,8 +1631,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</PathWithFileName>
-      <FilenameWithoutPath>core_cm0.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_LPC11Uxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1647,8 +1647,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_LPC11Uxx.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>lpc11uxx_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1660,33 +1660,17 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>1</TopLine>
-      <CurrentLine>1</CurrentLine>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>lpc11uxx_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>1</TopLine>
-      <CurrentLine>1</CurrentLine>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</PathWithFileName>
       <FilenameWithoutPath>lpc11uxx_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <FileNumber>46</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
@@ -1695,7 +1679,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC11Uxx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1710,7 +1694,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <FileNumber>47</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
@@ -1719,11 +1703,27 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</PathWithFileName>
       <FilenameWithoutPath>startup_LPC13Uxx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <ColumnNumber>0</ColumnNumber>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_LPC13Uxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>5</GroupNumber>
       <FileNumber>49</FileNumber>
@@ -1735,8 +1735,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_LPC13Uxx.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</PathWithFileName>
+      <FilenameWithoutPath>gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1751,23 +1751,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</PathWithFileName>
-      <FilenameWithoutPath>gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>51</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</PathWithFileName>
       <FilenameWithoutPath>uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1780,6 +1764,22 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <ColumnNumber>0</ColumnNumber>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</PathWithFileName>
+      <FilenameWithoutPath>system_LPC17xx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>6</GroupNumber>
       <FileNumber>52</FileNumber>
@@ -1791,8 +1791,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</PathWithFileName>
-      <FilenameWithoutPath>core_cm3.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</PathWithFileName>
+      <FilenameWithoutPath>lpc17xx_clkpwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1807,8 +1807,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</PathWithFileName>
-      <FilenameWithoutPath>system_LPC17xx.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>lpc17xx_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1823,8 +1823,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</PathWithFileName>
-      <FilenameWithoutPath>lpc17xx_clkpwr.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</PathWithFileName>
+      <FilenameWithoutPath>lpc17xx_pinsel.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1839,15 +1839,15 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>lpc17xx_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</PathWithFileName>
+      <FilenameWithoutPath>lpc17xx_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
       <FileNumber>56</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
@@ -1855,13 +1855,21 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</PathWithFileName>
-      <FilenameWithoutPath>lpc17xx_pinsel.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
+      <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>bsp lpc43xx</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -1871,15 +1879,15 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</PathWithFileName>
-      <FilenameWithoutPath>lpc17xx_uart.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_cgu.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>58</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
@@ -1887,19 +1895,11 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
-      <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>bsp lpc43xx</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
       <FileNumber>59</FileNumber>
@@ -1911,8 +1911,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_cgu.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_i2c.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1927,8 +1927,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_nvic.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1943,8 +1943,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_i2c.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_scu.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1959,8 +1959,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_nvic.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</PathWithFileName>
+      <FilenameWithoutPath>lpc43xx_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1975,55 +1975,23 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_scu.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>64</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</PathWithFileName>
-      <FilenameWithoutPath>lpc43xx_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>65</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName>
       <FilenameWithoutPath>system_LPC43xx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>66</FileNumber>
+      <FileNumber>64</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>26</ColumnNumber>
+      <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>153</TopLine>
-      <CurrentLine>154</CurrentLine>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName>
+      <PathWithFileName>..\..\..\mcu\lpc43xx\startup_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 d36ccc3fe..b54217a07 100644
--- a/demos/device/device_os_none/device_os_none.uvproj
+++ b/demos/device/device_os_none/device_os_none.uvproj
@@ -350,7 +350,7 @@
               <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls>
               <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
+              <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -564,52 +564,52 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
             </File>
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -672,30 +672,25 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -761,22 +756,22 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -839,40 +834,35 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -882,42 +872,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1267,7 +1257,7 @@
               <MiscControls>--gnu --c99</MiscControls>
               <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_LPC4357USB TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
+              <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -1481,22 +1471,22 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
               <FileOption>
                 <CommonProperty>
                   <UseCPPCompiler>2</UseCPPCompiler>
@@ -1541,32 +1531,32 @@
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1629,30 +1619,25 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1718,22 +1703,22 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1796,40 +1781,35 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -1839,42 +1819,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2224,7 +2204,7 @@
               <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls>
               <Define>TUSB_CFG_MCU=MCU_LPC13UXX BOARD=BOARD_LPCXPRESSO1347 TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\inc;..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\inc;..\src;..\..\bsp;..\..\..\tinyusb</IncludePath>
+              <IncludePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\inc;..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\inc;..\src;..\..\..\boards;..\..\..\tinyusb</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -2252,7 +2232,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x1A000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
-            <ScatterFile>..\..\bsp\lpc13uxx\startup_keil\lpc13uxx.sct</ScatterFile>
+            <ScatterFile>..\..\..\mcu\lpc13uxx\startup_keil\lpc13uxx.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>
@@ -2438,52 +2418,52 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
             </File>
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -2546,30 +2526,25 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2579,22 +2554,22 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -2657,40 +2632,35 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -2756,42 +2726,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3141,7 +3111,7 @@
               <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls>
               <Define>TUSB_CFG_MCU=MCU_LPC175X_6X BOARD=BOARD_LPCXPRESSO1769 TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\inc;..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\include;..\src;..\..\bsp;..\..\..\tinyusb</IncludePath>
+              <IncludePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\inc;..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\include;..\src;..\..\..\boards;..\..\..\tinyusb</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -3355,52 +3325,52 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
             </File>
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -3463,30 +3433,25 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3552,62 +3517,57 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>bsp lpc175x_6x</GroupName>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -3673,42 +3633,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4058,7 +4018,7 @@
               <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls>
               <Define>TUSB_CFG_MCU=MCU_LPC11UXX BOARD=BOARD_RF1GHZNODE TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\inc;..\src;..\..\bsp;..\..\..\tinyusb</IncludePath>
+              <IncludePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\inc;..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib;..\src;..\..\..\boards;..\..\..\tinyusb</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -4086,7 +4046,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x1A000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
-            <ScatterFile>..\..\bsp\lpc11uxx\startup_keil\lpc11uxx.sct</ScatterFile>
+            <ScatterFile>..\..\..\mcu\lpc11uxx\startup_keil\lpc11uxx.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>
@@ -4272,22 +4232,22 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
               <FileOption>
                 <CommonProperty>
                   <UseCPPCompiler>2</UseCPPCompiler>
@@ -4332,62 +4292,57 @@
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>bsp lpc11uxx</GroupName>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4453,22 +4408,22 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -4531,40 +4486,35 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4630,42 +4580,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -4817,7 +4767,7 @@
             <CpuDllArguments></CpuDllArguments>
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile>..\..\bsp\lpc43xx\keil_ram.ini</InitializationFile>
+            <InitializationFile>..\..\..\mcu\lpc43xx\keil_ram.ini</InitializationFile>
             <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
@@ -5015,7 +4965,7 @@
               <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls>
               <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_NGX4330 TUSB_CFG_OS=TUSB_OS_NONE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
+              <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -5229,52 +5179,52 @@
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\board.c</FilePath>
+              <FilePath>..\..\..\boards\board.c</FilePath>
             </File>
             <File>
               <FileName>board_ea4357.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath>
             </File>
             <File>
               <FileName>printf_retarget.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath>
+              <FilePath>..\..\..\boards\printf_retarget.c</FilePath>
             </File>
             <File>
               <FileName>pca9532.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
+              <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath>
             </File>
             <File>
               <FileName>board_ngx4330.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath>
+              <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath>
             </File>
             <File>
               <FileName>board_lpc4357usb.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath>
             </File>
             <File>
               <FileName>board_rf1ghznode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath>
+              <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1769.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath>
             </File>
             <File>
               <FileName>board_lpcxpresso1347.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
+              <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath>
             </File>
             <File>
               <FileName>board_mcb4300.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath>
+              <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -5337,30 +5287,25 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm0.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC11Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc11uxx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC11Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -5426,22 +5371,22 @@
             <File>
               <FileName>startup_LPC13Uxx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s</FilePath>
             </File>
             <File>
               <FileName>system_LPC13Uxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</FilePath>
             </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</FilePath>
             </File>
             <File>
               <FileName>uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -5504,40 +5449,35 @@
             </GroupArmAds>
           </GroupOption>
           <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</FilePath>
-            </File>
             <File>
               <FileName>system_LPC17xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</FilePath>
             </File>
             <File>
               <FileName>lpc17xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC17xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s</FilePath>
             </File>
           </Files>
         </Group>
@@ -5547,42 +5487,42 @@
             <File>
               <FileName>lpc43xx_cgu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_i2c.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_nvic.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_scu.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath>
             </File>
             <File>
               <FileName>lpc43xx_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath>
             </File>
             <File>
               <FileName>system_LPC43xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath>
             </File>
             <File>
               <FileName>startup_LPC43xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
+              <FilePath>..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt
index 036321f7f..a1a5a8a66 100644
--- a/demos/host/host_freertos/host_freertos.uvopt
+++ b/demos/host/host_freertos/host_freertos.uvopt
@@ -706,7 +706,7 @@
       <Focus>0</Focus>
       <ColumnNumber>20</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>1</TopLine>
+      <TopLine>2</TopLine>
       <CurrentLine>6</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>