diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 528f493c6d7..d2bd9cc45c0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -91,7 +91,7 @@ endchoice
 
 endmenu
 
-source "arch/arm/bsp/CortexM/Kconfig"
+source "arch/arm/core/cortex_m/Kconfig"
 
 if PLATFORM_TI_LM3S6965
 source "arch/arm/platforms/ti_lm3s6965/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index de69a1000f2..8f12275bac1 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,5 +1,4 @@
 obj-y = core/
-obj-y += bsp/
 
 obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += platforms/fsl_frdm_k64f/
 obj-$(CONFIG_PLATFORM_TI_LM3S6965) += platforms/ti_lm3s6965/
diff --git a/arch/arm/bsp/Makefile b/arch/arm/bsp/Makefile
deleted file mode 100644
index d41a6ff5740..00000000000
--- a/arch/arm/bsp/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y = CortexM/
diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile
index 9eded144f9c..b8651f4d7d5 100644
--- a/arch/arm/core/Makefile
+++ b/arch/arm/core/Makefile
@@ -11,3 +11,5 @@ obj-y = atomic.o exc_exit.o ffs.o irq_init.o \
 	fatal.o sys_fatal_error_handler.o
 
 obj-$(CONFIG_MICROKERNEL) += task_abort.o
+
+obj-$(CONFIG_CPU_CORTEX_M) += cortex_m/
diff --git a/arch/arm/bsp/CortexM/Kconfig b/arch/arm/core/cortex_m/Kconfig
similarity index 100%
rename from arch/arm/bsp/CortexM/Kconfig
rename to arch/arm/core/cortex_m/Kconfig
diff --git a/arch/arm/bsp/CortexM/Makefile b/arch/arm/core/cortex_m/Makefile
similarity index 100%
rename from arch/arm/bsp/CortexM/Makefile
rename to arch/arm/core/cortex_m/Makefile
diff --git a/arch/arm/bsp/CortexM/nmi.c b/arch/arm/core/cortex_m/nmi.c
similarity index 100%
rename from arch/arm/bsp/CortexM/nmi.c
rename to arch/arm/core/cortex_m/nmi.c
diff --git a/arch/arm/bsp/CortexM/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
similarity index 100%
rename from arch/arm/bsp/CortexM/prep_c.c
rename to arch/arm/core/cortex_m/prep_c.c
diff --git a/arch/arm/bsp/CortexM/reset.S b/arch/arm/core/cortex_m/reset.S
similarity index 100%
rename from arch/arm/bsp/CortexM/reset.S
rename to arch/arm/core/cortex_m/reset.S
diff --git a/arch/arm/bsp/CortexM/scb.c b/arch/arm/core/cortex_m/scb.c
similarity index 100%
rename from arch/arm/bsp/CortexM/scb.c
rename to arch/arm/core/cortex_m/scb.c
diff --git a/arch/arm/bsp/CortexM/scs.c b/arch/arm/core/cortex_m/scs.c
similarity index 100%
rename from arch/arm/bsp/CortexM/scs.c
rename to arch/arm/core/cortex_m/scs.c
diff --git a/arch/arm/bsp/CortexM/sw_isr_table.S b/arch/arm/core/cortex_m/sw_isr_table.S
similarity index 100%
rename from arch/arm/bsp/CortexM/sw_isr_table.S
rename to arch/arm/core/cortex_m/sw_isr_table.S
diff --git a/arch/arm/bsp/CortexM/vector_table.S b/arch/arm/core/cortex_m/vector_table.S
similarity index 100%
rename from arch/arm/bsp/CortexM/vector_table.S
rename to arch/arm/core/cortex_m/vector_table.S
diff --git a/arch/arm/bsp/CortexM/vector_table.h b/arch/arm/core/cortex_m/vector_table.h
similarity index 100%
rename from arch/arm/bsp/CortexM/vector_table.h
rename to arch/arm/core/cortex_m/vector_table.h