diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/M451Series.h b/targets/TARGET_NUVOTON/TARGET_M451/device/M451Series.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/M451Series.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/M451Series.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_acmp.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_acmp.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_acmp.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_acmp.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_acmp.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_acmp.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_acmp.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_acmp.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_can.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_can.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_can.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_can.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_can.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_can.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_can.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_can.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_clk.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_clk.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_clk.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_clk.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_clk.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_clk.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_clk.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_clk.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_crc.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_crc.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_crc.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_crc.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_crc.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_crc.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_crc.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_crc.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_dac.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_dac.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_dac.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_dac.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_dac.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_dac.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_dac.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_dac.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_eadc.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_eadc.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_eadc.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_eadc.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_eadc.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_eadc.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_eadc.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_eadc.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_ebi.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_ebi.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_ebi.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_ebi.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_ebi.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_ebi.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_ebi.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_ebi.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_fmc.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_fmc.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_fmc.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_fmc.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_fmc.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_fmc.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_fmc.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_fmc.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_gpio.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_gpio.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_gpio.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_gpio.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_gpio.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_gpio.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_gpio.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_gpio.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_i2c.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_i2c.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_i2c.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_i2c.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_i2c.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_i2c.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_i2c.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_i2c.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_otg.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_otg.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_otg.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_otg.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pdma.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pdma.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pdma.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pdma.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pdma.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pdma.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pdma.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pdma.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pwm.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pwm.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pwm.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_pwm.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_rtc.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_rtc.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_rtc.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_rtc.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_rtc.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_rtc.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_rtc.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_rtc.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sc.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sc.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sc.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sc.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sc.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sc.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sc.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sc.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_scuart.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_scuart.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_scuart.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_scuart.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_scuart.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_scuart.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_scuart.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_scuart.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_spi.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_spi.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_spi.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_spi.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_spi.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_spi.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_spi.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_spi.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sys.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sys.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sys.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sys.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sys.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sys.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_sys.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_sys.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_timer.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_timer.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_timer.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_timer.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_timer.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_timer.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_timer.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_timer.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_tk.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_tk.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_tk.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_tk.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_tk.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_tk.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_tk.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_tk.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_uart.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_uart.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_uart.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_uart.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_uart.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_uart.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_uart.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_uart.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_usbd.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_usbd.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_usbd.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_usbd.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_usbd.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_usbd.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_usbd.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_usbd.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wdt.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wdt.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wdt.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wdt.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wdt.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wdt.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wdt.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wdt.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wwdt.c b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wwdt.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wwdt.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wwdt.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wwdt.h b/targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wwdt.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/StdDriver/m451_wwdt.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_wwdt.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_MICRO/M453.sct b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/M453.sct
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_MICRO/M453.sct
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/M453.sct
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/sys.cpp
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_MICRO/sys.cpp
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/sys.cpp
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_STD/M453.sct b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/M453.sct
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_STD/M453.sct
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/M453.sct
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_ARM_STD/sys.cpp
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_GCC_ARM/M453.ld b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/M453.ld
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_GCC_ARM/M453.ld
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/M453.ld
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_GCC_ARM/retarget.c b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/retarget.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_GCC_ARM/retarget.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/retarget.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_IAR/M453.icf b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_IAR/M453.icf
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/TOOLCHAIN_IAR/M453.icf
rename to targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_IAR/M453.icf
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis.h b/targets/TARGET_NUVOTON/TARGET_M451/device/cmsis.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/cmsis.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis_nvic.c b/targets/TARGET_NUVOTON/TARGET_M451/device/cmsis_nvic.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis_nvic.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/cmsis_nvic.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis_nvic.h b/targets/TARGET_NUVOTON/TARGET_M451/device/cmsis_nvic.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/cmsis_nvic.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/cmsis_nvic.h
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/startup_M451Series.c b/targets/TARGET_NUVOTON/TARGET_M451/device/startup_M451Series.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/startup_M451Series.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/startup_M451Series.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/system_M451Series.c b/targets/TARGET_NUVOTON/TARGET_M451/device/system_M451Series.c
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/system_M451Series.c
rename to targets/TARGET_NUVOTON/TARGET_M451/device/system_M451Series.c
diff --git a/targets/cmsis/TARGET_NUVOTON/TARGET_M451/system_M451Series.h b/targets/TARGET_NUVOTON/TARGET_M451/device/system_M451Series.h
similarity index 100%
rename from targets/cmsis/TARGET_NUVOTON/TARGET_M451/system_M451Series.h
rename to targets/TARGET_NUVOTON/TARGET_M451/device/system_M451Series.h