diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_STD/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_STD/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_MICRO/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_ARM_STD/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_MICRO/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_MICRO/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_STD/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_ARM_STD/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_STD/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_STD/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_MICRO/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_MICRO/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_STD/sys.cpp
deleted file mode 100644
index abf213c62b..0000000000
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_ARM_STD/sys.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* mbed Microcontroller Library - stackheap
- * Copyright (C) 2009-2011 ARM Limited. All rights reserved.
- *
- * Setup a fixed single stack/heap memory model,
- *  between the top of the RW/ZI region and the stackpointer
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#include <arm_compat.h>
-#endif
-
-#include <rt_misc.h>
-#include <stdint.h>
-
-extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
-extern char Image$$ARM_LIB_HEAP$$Base[];
-extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
-extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
-
-    struct __initial_stackheap r;
-    r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;
-    r.heap_limit = (uint32_t)Image$$ARM_LIB_HEAP$$ZI$$Limit;
-    return r;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_MICRO/sys.cpp b/targets/TARGET_NUVOTON/TOOLCHAIN_ARM/sys.cpp
similarity index 100%
rename from targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_MICRO/sys.cpp
rename to targets/TARGET_NUVOTON/TOOLCHAIN_ARM/sys.cpp