diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject
index 7789f9a3..5f1d0766 100644
--- a/demos/device/device_os_none/.cproject
+++ b/demos/device/device_os_none/.cproject
@@ -86,7 +86,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1769/startup|hw/bsp/lpcxpresso11u68/startup|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc11uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/mcu/nxp/lpc11uxx|mcu/lpc175x_6x|hw/mcu/nxp/lpc13uxx/keil|hw/mcu/nxp/lpc43xx|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="mcu/lpc11uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/bsp/lpcxpresso11u68/startup|hw/mcu/nxp/lpc11uxx|mcu/lpc175x_6x|hw/bsp/lpcxpresso1769/startup|hw/mcu/nxp/lpc13uxx/keil|hw/mcu/nxp/lpc43xx|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -180,7 +180,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1769/startup|hw/bsp/lpcxpresso1347/startup|hw/mcu/nxp/lpc11uxx/keil|mcu/lpc13uxx|hw/mcu/nxp/lpc13uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|mcu/lpc175x_6x|hw/mcu/nxp/lpc43xx|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="hw/mcu/nxp/lpc11uxx/keil|mcu/lpc13uxx|hw/bsp/lpcxpresso1347/startup|hw/mcu/nxp/lpc13uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|mcu/lpc175x_6x|hw/bsp/lpcxpresso1769/startup|hw/mcu/nxp/lpc43xx|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -284,7 +284,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1769/startup|hw/bsp/lpcxpresso1347/startup|hw/bsp/lpcxpresso11u68/startup|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|hw/mcu/nxp/lpc43xx/keil|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc175x_6x|mcu/lpc11uxx|hw/mcu/nxp/lpc11uxx|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_can.c|hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc175x_6x|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rtc.c|hw/bsp/lpcxpresso1347/startup|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|hw/mcu/nxp/lpc43xx/keil|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc175x_6x|mcu/lpc11uxx|hw/mcu/nxp/lpc11uxx|hw/bsp/lpcxpresso1769/startup|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|hw/bsp/lpcxpresso11u68/startup|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_can.c|hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc175x_6x|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -377,7 +377,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1347/startup|hw/bsp/lpcxpresso11u68/startup|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_rtc.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_pwm.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_gpdma.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_exti.c|mcu/lpc13uxx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_timer.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_dac.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_qei.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_can.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_rit.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_spi.c|hw/mcu/nxp/lpc175x_6x/keil|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_iap.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_mcpwm.c|mcu/lpc11uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/mcu/nxp/lpc11uxx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_libcfg_default.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_i2c.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_adc.c|hw/mcu/nxp/lpc43xx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_i2s.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_ssp.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_emac.c|hw/mcu/nxp/lpc13uxx|boards/embedded_artists/oem_base_board|mcu/lpc175x_6x/LPC17xx_DriverLib/source/debug_frmwrk.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_wdt.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_rtc.c|hw/bsp/lpcxpresso1347/startup|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_pwm.c|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_gpdma.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_exti.c|mcu/lpc13uxx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_timer.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_dac.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_qei.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_can.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_rit.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_spi.c|hw/mcu/nxp/lpc175x_6x/keil|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_iap.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_mcpwm.c|mcu/lpc11uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/mcu/nxp/lpc11uxx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_libcfg_default.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_i2c.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_adc.c|hw/mcu/nxp/lpc43xx|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_i2s.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_ssp.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_emac.c|hw/mcu/nxp/lpc13uxx|hw/bsp/lpcxpresso11u68/startup|boards/embedded_artists/oem_base_board|mcu/lpc175x_6x/LPC17xx_DriverLib/source/debug_frmwrk.c|mcu/lpc175x_6x/LPC17xx_DriverLib/source/lpc17xx_wdt.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -474,7 +474,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1769/startup|hw/bsp/lpcxpresso1347/startup|hw/bsp/lpcxpresso11u68/startup|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|hw/mcu/nxp/lpc43xx/keil|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc175x_6x|mcu/lpc11uxx|hw/mcu/nxp/lpc11uxx|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_can.c|hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc175x_6x|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rtc.c|hw/bsp/lpcxpresso1347/startup|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|hw/mcu/nxp/lpc43xx/keil|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc175x_6x|mcu/lpc11uxx|hw/mcu/nxp/lpc11uxx|hw/bsp/lpcxpresso1769/startup|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc13uxx|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|hw/bsp/lpcxpresso11u68/startup|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_can.c|hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|hw/mcu/nxp/lpc175x_6x|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSISv2p10_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -567,7 +567,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="hw/bsp/lpcxpresso1769/startup|hw/bsp/lpcxpresso1347/startup|hw/bsp/lpcxpresso11u68/startup|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc13uxx|hw/mcu/nxp/lpc13uxx|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/mcu/nxp/lpc11uxx|mcu/lpc175x_6x|hw/mcu/nxp/lpc43xx|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="hw/bsp/lpcxpresso1347/startup|boards/embedded_artists/ea4357|mcu/lpc43xx|hw/mcu/nxp/lpc11uxx|hw/bsp/lpcxpresso1769/startup|hw/mcu/nxp/lpc43xx|hw/bsp/lpcxpresso11u68/startup/xpresso/cr_startup_lpc11u.c|mcu/lpc13uxx|hw/mcu/nxp/lpc13uxx|hw/bsp/lpcxpresso11u68/startup|mcu/lpc175x_6x|boards/embedded_artists/oem_base_board|hw/mcu/nxp/lpc175x_6x" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/hw/mcu/nxp/lpc11uxx/usb/hal_lpc11uxx.c b/hw/mcu/nxp/lpc11uxx/hal_mcu/hal_lpc11uxx.c
similarity index 100%
rename from hw/mcu/nxp/lpc11uxx/usb/hal_lpc11uxx.c
rename to hw/mcu/nxp/lpc11uxx/hal_mcu/hal_lpc11uxx.c
diff --git a/hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h b/hw/mcu/nxp/lpc11uxx/hal_mcu/hal_mcu.h
similarity index 100%
rename from hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h
rename to hw/mcu/nxp/lpc11uxx/hal_mcu/hal_mcu.h
diff --git a/hw/mcu/nxp/lpc13uxx/usb/hal_lpc13uxx.c b/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/usb/hal_lpc13uxx.c
rename to hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c
diff --git a/hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h b/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_mcu.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h
rename to hw/mcu/nxp/lpc13uxx/hal_mcu/hal_mcu.h
diff --git a/hw/mcu/nxp/lpc175x_6x/usb/hal_lpc175x_6x.c b/hw/mcu/nxp/lpc175x_6x/hal_mcu/hal_lpc175x_6x.c
similarity index 100%
rename from hw/mcu/nxp/lpc175x_6x/usb/hal_lpc175x_6x.c
rename to hw/mcu/nxp/lpc175x_6x/hal_mcu/hal_lpc175x_6x.c
diff --git a/hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h b/hw/mcu/nxp/lpc175x_6x/hal_mcu/hal_mcu.h
similarity index 100%
rename from hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h
rename to hw/mcu/nxp/lpc175x_6x/hal_mcu/hal_mcu.h
diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.c b/hw/mcu/nxp/lpc43xx/hal_mcu/hal_lpc43xx.c
similarity index 100%
rename from hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.c
rename to hw/mcu/nxp/lpc43xx/hal_mcu/hal_lpc43xx.c
diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_mcu.h b/hw/mcu/nxp/lpc43xx/hal_mcu/hal_mcu.h
similarity index 100%
rename from hw/mcu/nxp/lpc43xx/usb/hal_mcu.h
rename to hw/mcu/nxp/lpc43xx/hal_mcu/hal_mcu.h