diff --git a/platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S b/cmsis/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
similarity index 100%
rename from platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
rename to cmsis/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
diff --git a/platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S b/cmsis/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
similarity index 100%
rename from platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
rename to cmsis/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
diff --git a/platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S b/cmsis/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
similarity index 100%
rename from platform/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
rename to cmsis/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
diff --git a/platform/TARGET_CORTEX/TARGET_CORTEX_M/mbed_fault_handler.c b/cmsis/TARGET_CORTEX_M/mbed_fault_handler.c
similarity index 100%
rename from platform/TARGET_CORTEX/TARGET_CORTEX_M/mbed_fault_handler.c
rename to cmsis/TARGET_CORTEX_M/mbed_fault_handler.c
diff --git a/platform/TARGET_CORTEX/TARGET_CORTEX_M/mbed_fault_handler.h b/cmsis/TARGET_CORTEX_M/mbed_fault_handler.h
similarity index 100%
rename from platform/TARGET_CORTEX/TARGET_CORTEX_M/mbed_fault_handler.h
rename to cmsis/TARGET_CORTEX_M/mbed_fault_handler.h