fix segger embbeded studio compile issue

11 files changed, 227 insertions, 217 deletions

diff --git a/examples/device/cdc_msc_hid/ses/lpc11u6x/lpc11u6x.emProject b/examples/device/cdc_msc_hid/ses/lpc11u6x/lpc11u6x.emProject
index fce8041e7..ea47e0db6 100644
--- a/examples/device/cdc_msc_hid/ses/lpc11u6x/lpc11u6x.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc11u6x/lpc11u6x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="__LPC11U68__;__LPC1100_FAMILY;__LPC11U00_SUBFAMILY;ARM_MATH_CM0PLUS;FLASH_PLACEMENT=1;CORE_M0PLUS;CFG_TUSB_MCU=OPT_MCU_LPC11UXX;CFG_TUSB_MEM_SECTION= __attribute__((section(".bss3")));CFG_TUSB_MEM_ALIGN=__attribute__ ((aligned(64)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc;$(rootDir)/src"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc;$(rootDir)/src"
       debug_register_definition_file="$(ProjectDir)/LPC11U6x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -63,35 +63,37 @@
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc_chip_11u6x">
-            <folder Name="inc">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/chip.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/clock_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/cmsis.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cm0.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cm0plus.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cm3.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cm4.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cm4_simd.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cmFunc.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/core_cmInstr.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/error.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/gpio_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/gpiogroup_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/iocon_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/lpc_types.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/sys_config.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/syscon_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/uart_0_11u6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/inc/usbd_11u6x.h" />
-            </folder>
-            <folder Name="src">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/chip_11u6x.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/clock_11u6x.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/gpio_11u6x.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/syscon_11u6x.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/sysinit_11u6x.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_11u6x/src/iocon_11u6x.c" />
+          <folder Name="lpc_driver">
+            <folder Name="lpc_chip_11u6x">
+              <folder Name="inc">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/clock_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cm0.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cm0plus.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cm3.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cm4.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cm4_simd.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/error.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/gpio_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/gpiogroup_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/iocon_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/lpc_types.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/sys_config.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/syscon_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/uart_0_11u6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/inc/usbd_11u6x.h" />
+              </folder>
+              <folder Name="src">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/chip_11u6x.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/clock_11u6x.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/gpio_11u6x.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/syscon_11u6x.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/sysinit_11u6x.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_11u6x/src/iocon_11u6x.c" />
+              </folder>
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject b/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
index 791944a16..d07cc68ff 100644
--- a/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
@@ -19,7 +19,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="__LPC1347FBD64__;__LPC1300_FAMILY;__LPC134x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC13XX;CFG_TUSB_MEM_SECTION= __attribute__((section(&quot;.bss3&quot;)));CFG_TUSB_MEM_ALIGN=__attribute__ ((aligned(64)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc;$(rootDir)/src"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc;$(rootDir)/src"
       debug_register_definition_file="$(ProjectDir)/LPC13Uxx_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -53,35 +53,37 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="lpcxpresso1347">
-          <file file_name="../../../../../hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c" />
+          <file file_name="../../../../../hw/bsp/lpcxpresso1347/lpcxpresso1347.c" />
         </folder>
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc_chip_13xx">
-            <folder Name="inc">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/chip.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/clock_13xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/cmsis.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/cmsis_1347.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/core_cm3.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/core_cmFunc.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/core_cmInstr.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/gpio_13xx_1.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/gpio_13xx_2.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/iocon_13xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/lpc_types.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/sys_config.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/sysctl_13xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/inc/uart_13xx.h" />
-            </folder>
-            <folder Name="src">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/chip_13xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/clock_13xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/gpio_13xx_1.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/sysctl_13xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/sysinit_13xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_13xx/src/iocon_13xx.c" />
+          <folder Name="lpc_driver">
+            <folder Name="lpc_chip_13xx">
+              <folder Name="inc">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/clock_13xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/cmsis_1347.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/core_cm3.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/gpio_13xx_1.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/gpio_13xx_2.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/iocon_13xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/lpc_types.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/sys_config.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/sysctl_13xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc/uart_13xx.h" />
+              </folder>
+              <folder Name="src">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/chip_13xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/clock_13xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/gpio_13xx_1.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/sysctl_13xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/sysinit_13xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_13xx/src/iocon_13xx.c" />
+              </folder>
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/ses/lpc175x_6x/lpc175x_6x.emProject b/examples/device/cdc_msc_hid/ses/lpc175x_6x/lpc175x_6x.emProject
index d0b065370..7d49a90d7 100644
--- a/examples/device/cdc_msc_hid/ses/lpc175x_6x/lpc175x_6x.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc175x_6x/lpc175x_6x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="LPC175x_6x;__LPC1700_FAMILY;__LPC176x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC175X_6X"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc;$(rootDir)/src"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/src"
       debug_register_definition_file="LPC176x5x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -46,40 +46,40 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="lpcxpresso1769">
-          <file file_name="../../../../../hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c" />
+          <file file_name="../../../../../hw/bsp/lpcxpresso1769/lpcxpresso1769.c" />
         </folder>
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpcopen">
+          <folder Name="lpc_driver">
             <folder Name="lpc_chip_175x_6x">
               <folder Name="inc">
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/chip.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/chip_lpc175x_6x.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/chip_lpc177x_8x.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/chip_lpc407x_8x.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/clock_17xx_40xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/cmsis.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/cmsis_175x_6x.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/core_cm3.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/core_cmFunc.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/core_cmInstr.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/gpio_17xx_40xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/gpioint_17xx_40xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/iocon_17xx_40xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/lpc_types.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/sys_config.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/sysctl_17xx_40xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc/uart_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/chip_lpc175x_6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/chip_lpc177x_8x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/chip_lpc407x_8x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/clock_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/cmsis_175x_6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/core_cm3.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/gpio_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/gpioint_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/iocon_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/lpc_types.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/sys_config.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/sysctl_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc/uart_17xx_40xx.h" />
               </folder>
               <folder Name="src">
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/chip_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/clock_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/gpio_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/iocon_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/sysctl_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/sysinit_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/uart_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/chip_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/clock_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/gpio_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/iocon_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/sysctl_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/sysinit_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/uart_17xx_40xx.c" />
               </folder>
             </folder>
           </folder>
diff --git a/examples/device/cdc_msc_hid/ses/lpc18xx/lpc18xx.emProject b/examples/device/cdc_msc_hid/ses/lpc18xx/lpc18xx.emProject
index e7ce7a02a..8f7d91b2a 100644
--- a/examples/device/cdc_msc_hid/ses/lpc18xx/lpc18xx.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc18xx/lpc18xx.emProject
@@ -19,7 +19,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="LPC18xx;__LPC1800_FAMILY;__LPC185x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC18XX;CFG_TUSB_MEM_SECTION= __attribute__((section(&quot;.bss2&quot;)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/config_18xx;$(rootDir)/src"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/config_18xx;$(rootDir)/src"
       debug_register_definition_file="$(ProjectDir)/LPC18xx_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -53,51 +53,53 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="mcb1800">
-          <file file_name="../../../../../hw/bsp/mcb1800/board_mcb1800.c" />
+          <file file_name="../../../../../hw/bsp/mcb1800/mcb1800.c" />
         </folder>
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc_chip_18xx">
-            <folder Name="inc">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/arm_common_tables.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/arm_math.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cguccu_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/chip.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/chip_clocks.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/chip_lpc18xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/chip_lpc43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/clock_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cmsis.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cmsis_18xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cmsis_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cmsis_43xx_m0app.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/cmsis_43xx_m0sub.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cm0.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cm0plus.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cm3.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cm4.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cm4_simd.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cmFunc.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_cmInstr.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_sc000.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/core_sc300.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/creg_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/gpio_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/lpc_types.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/uart_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/usbhs_18xx_43xx.h" />
-              <folder Name="config_18xx">
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/config_18xx/cmsis_18xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/inc/config_18xx/sys_config.h" />
+          <folder Name="lpc_driver">
+            <folder Name="lpc_chip_18xx">
+              <folder Name="inc">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/arm_common_tables.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/arm_math.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cguccu_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/chip_clocks.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/chip_lpc18xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/chip_lpc43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/clock_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cmsis_18xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cmsis_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cmsis_43xx_m0app.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/cmsis_43xx_m0sub.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cm0.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cm0plus.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cm3.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cm4.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cm4_simd.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_sc000.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/core_sc300.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/creg_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/gpio_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/lpc_types.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/uart_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/usbhs_18xx_43xx.h" />
+                <folder Name="config_18xx">
+                  <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/config_18xx/cmsis_18xx.h" />
+                  <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/inc/config_18xx/sys_config.h" />
+                </folder>
+              </folder>
+              <folder Name="src">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/src/chip_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/src/clock_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/src/gpio_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/src/sysinit_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_18xx/src/uart_18xx_43xx.c" />
               </folder>
-            </folder>
-            <folder Name="src">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/src/chip_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/src/clock_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/src/gpio_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/src/sysinit_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_18xx/src/uart_18xx_43xx.c" />
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/ses/lpc40xx/lpc40xx.emProject b/examples/device/cdc_msc_hid/ses/lpc40xx/lpc40xx.emProject
index 5a1cbe52b..4a61181ca 100644
--- a/examples/device/cdc_msc_hid/ses/lpc40xx/lpc40xx.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc40xx/lpc40xx.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="CORE_M4;__LPC4000_FAMILY;__LPC408x_SUBFAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_LPC40XX;CFG_TUSB_MEM_SECTION= __attribute__((section(&quot;.bss2&quot;)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc;$(rootDir)/src"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc;$(rootDir)/src"
       debug_register_definition_file="$(ProjectDir)/LPC408x_7x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -55,39 +55,41 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="ea4088qs">
-          <file file_name="../../../../../hw/bsp/ea4088qs/board_ea4088qs.c" />
+          <file file_name="../../../../../hw/bsp/ea4088qs/ea4088qs.c" />
         </folder>
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc_chip_40xx">
-            <folder Name="inc">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/chip.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/chip_lpc175x_6x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/chip_lpc177x_8x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/chip_lpc407x_8x.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/clock_17xx_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/cmsis.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/cmsis_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/core_cm4.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/core_cm4_simd.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/core_cmFunc.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/core_cmInstr.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/gpio_17xx_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/sys_config.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/sysctl_17xx_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/uart_17xx_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/usb_17xx_40xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/inc/iocon_17xx_40xx.h" />
-            </folder>
-            <folder Name="src">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/chip_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/clock_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/gpio_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/iocon_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/sysctl_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/sysinit_17xx_40xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_40xx/src/uart_17xx_40xx.c" />
+          <folder Name="lpc_driver">
+            <folder Name="lpc_chip_40xx">
+              <folder Name="inc">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/chip_lpc175x_6x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/chip_lpc177x_8x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/chip_lpc407x_8x.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/clock_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/cmsis_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/core_cm4.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/core_cm4_simd.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/gpio_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/sys_config.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/sysctl_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/uart_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/usb_17xx_40xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/inc/iocon_17xx_40xx.h" />
+              </folder>
+              <folder Name="src">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/chip_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/clock_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/gpio_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/iocon_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/sysctl_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/sysinit_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_40xx/src/uart_17xx_40xx.c" />
+              </folder>
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/ses/lpc43xx/lpc43xx.emProject b/examples/device/cdc_msc_hid/ses/lpc43xx/lpc43xx.emProject
index 26444c469..f751a4323 100644
--- a/examples/device/cdc_msc_hid/ses/lpc43xx/lpc43xx.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc43xx/lpc43xx.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="CORE_M4;__LPC4300_FAMILY;__LPC435x_SUBFAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_LPC43XX;CFG_TUSB_MEM_SECTION= __attribute__((section(&quot;.bss2&quot;)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/config_43xx;$(rootDir)/src;$(lpcDir)//inc"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/config_43xx;$(rootDir)/src;$(lpcDir)//inc"
       debug_register_definition_file="LPC43xx_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -46,61 +46,63 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="ea4357">
-          <file file_name="../../../../../hw/bsp/ea4357/board_ea4357.c" />
           <file file_name="../../../../../hw/bsp/ea4357/pca9532.c" />
           <file file_name="../../../../../hw/bsp/ea4357/pca9532.h" />
+          <file file_name="../../../../../hw/bsp/ea4357/ea4357.c" />
         </folder>
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc_chip_43xx">
-            <folder Name="inc">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/arm_common_tables.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/arm_math.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cguccu_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/chip.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/chip_clocks.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/chip_lpc18xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/chip_lpc43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/clock_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cmsis.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cmsis_18xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cmsis_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cmsis_43xx_m0app.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/cmsis_43xx_m0sub.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cm0.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cm0plus.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cm3.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cm4.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cm4_simd.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cmFunc.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_cmInstr.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_sc000.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/core_sc300.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/creg_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/fpu_init.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/gpio_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/i2c_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/i2c_common_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/i2cm_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/lpc_types.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/packing.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/uart_18xx_43xx.h" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/usbhs_18xx_43xx.h" />
-              <folder Name="config_43xx">
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/config_43xx/cmsis_43xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/inc/config_43xx/sys_config.h" />
+          <folder Name="lpc_driver">
+            <folder Name="lpc_chip_43xx">
+              <folder Name="inc">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/arm_common_tables.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/arm_math.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cguccu_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/chip.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/chip_clocks.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/chip_lpc18xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/chip_lpc43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/clock_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cmsis.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cmsis_18xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cmsis_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cmsis_43xx_m0app.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/cmsis_43xx_m0sub.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cm0.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cm0plus.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cm3.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cm4.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cm4_simd.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cmFunc.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_cmInstr.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_sc000.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/core_sc300.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/creg_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/fpu_init.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/gpio_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/i2c_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/i2c_common_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/i2cm_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/lpc_types.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/packing.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/uart_18xx_43xx.h" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/usbhs_18xx_43xx.h" />
+                <folder Name="config_43xx">
+                  <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/config_43xx/cmsis_43xx.h" />
+                  <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/inc/config_43xx/sys_config.h" />
+                </folder>
+              </folder>
+              <folder Name="src">
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/chip_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/clock_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/fpu_init.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/gpio_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/i2c_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/i2cm_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/sysinit_18xx_43xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_43xx/src/uart_18xx_43xx.c" />
               </folder>
-            </folder>
-            <folder Name="src">
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/chip_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/clock_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/fpu_init.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/gpio_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/i2c_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/i2cm_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/sysinit_18xx_43xx.c" />
-              <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_43xx/src/uart_18xx_43xx.c" />
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject
index b3f23fbf4..55c5a4ec4 100644
--- a/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject
+++ b/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_NRF5X"
-      c_user_include_directories="../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
+      c_user_include_directories="../../src;$(rootDir)/hw/mcu/nordic/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
       debug_register_definition_file="nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -43,7 +43,7 @@
     <folder Name="hw">
       <folder Name="bsp">
         <folder Name="pca10056">
-          <file file_name="../../../../../hw/bsp/pca10056/board_pca10056.c" />
+          <file file_name="../../../../../hw/bsp/pca10056/pca10056.c" />
         </folder>
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
diff --git a/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject b/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject
index 30aad55ca..1536af9ab 100644
--- a/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject
+++ b/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject
@@ -45,7 +45,7 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="metro_m0_express">
-          <file file_name="../../../../../hw/bsp/metro_m0_express/board_metro_m0_express.c" />
+          <file file_name="../../../../../hw/bsp/metro_m0_express/metro_m0_express.c" />
         </folder>
       </folder>
       <folder Name="mcu">
diff --git a/examples/device/cdc_msc_hid/ses/samd51/samd51.emProject b/examples/device/cdc_msc_hid/ses/samd51/samd51.emProject
index cc34dc63d..ecb1e031b 100644
--- a/examples/device/cdc_msc_hid/ses/samd51/samd51.emProject
+++ b/examples/device/cdc_msc_hid/ses/samd51/samd51.emProject
@@ -46,7 +46,7 @@
         <file file_name="../../../../../hw/bsp/ansi_escape.h" />
         <file file_name="../../../../../hw/bsp/board.h" />
         <folder Name="metro_m4_express">
-          <file file_name="../../../../../hw/bsp/metro_m4_express/board_metro_m4_express.c" />
+          <file file_name="../../../../../hw/bsp/metro_m4_express/metro_m4_express.c" />
         </folder>
       </folder>
       <folder Name="mcu">
diff --git a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
index 6f6690d21..23b313471 100644
--- a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
+++ b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
@@ -62,7 +62,7 @@
     <folder Name="hw">
       <folder Name="bsp">
         <folder Name="stm32f407disco">
-          <file file_name="../../../../../hw/bsp/stm32f407disco/board_stm32f407disco.c" />
+          <file file_name="../../../../../hw/bsp/stm32f407disco/stm32f407disco.c" />
         </folder>
         <file file_name="../../../../../hw/bsp/board.h" />
       </folder>
diff --git a/examples/device/cdc_msc_hid_freertos/ses/lpc175x_6x/lpc175x_6x.emProject b/examples/device/cdc_msc_hid_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
index 5493af626..4dc111f2e 100644
--- a/examples/device/cdc_msc_hid_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
+++ b/examples/device/cdc_msc_hid_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="No"
       c_preprocessor_definitions="LPC175x_6x;__LPC1700_FAMILY;__LPC176x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC175X_6X"
-      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS/Source/include;$(rootDir)/lib/FreeRTOS/Source/portable/GCC/ARM_CM3"
+      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS/Source/include;$(rootDir)/lib/FreeRTOS/Source/portable/GCC/ARM_CM3"
       debug_register_definition_file="LPC176x5x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -50,16 +50,16 @@
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpcopen">
+          <folder Name="lpc_driver">
             <folder Name="lpc_chip_175x_6x">
               <folder Name="src">
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/chip_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/clock_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/gpio_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/iocon_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/sysctl_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/sysinit_17xx_40xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/uart_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/chip_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/clock_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/gpio_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/iocon_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/sysctl_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/sysinit_17xx_40xx.c" />
+                <file file_name="../../../../../hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/src/uart_17xx_40xx.c" />
               </folder>
             </folder>
           </folder>