diff --git a/hw/bsp/ea4088qs/board_ea4088qs.c b/hw/bsp/ea4088qs/ea4088qs.c
similarity index 100%
rename from hw/bsp/ea4088qs/board_ea4088qs.c
rename to hw/bsp/ea4088qs/ea4088qs.c
diff --git a/hw/bsp/ea4357/board_ea4357.c b/hw/bsp/ea4357/ea4357.c
similarity index 100%
rename from hw/bsp/ea4357/board_ea4357.c
rename to hw/bsp/ea4357/ea4357.c
diff --git a/hw/bsp/feather_m4_express/board_feather_m4_express.c b/hw/bsp/feather_m4_express/feather_m4_express.c
similarity index 100%
rename from hw/bsp/feather_m4_express/board_feather_m4_express.c
rename to hw/bsp/feather_m4_express/feather_m4_express.c
diff --git a/hw/bsp/feather_nrf52840_express/board.mk b/hw/bsp/feather_nrf52840_express/board.mk
index f89baaaa..11b5e7bd 100644
--- a/hw/bsp/feather_nrf52840_express/board.mk
+++ b/hw/bsp/feather_nrf52840_express/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
 	hw/mcu/nordic/nrfx/mdk/system_nrf52840.c \
 
 INC += \
-	$(TOP)/hw/cmsis/Include \
+	$(TOP)/hw/mcu/nordic/cmsis/Include \
 	$(TOP)/hw/mcu/nordic \
 	$(TOP)/hw/mcu/nordic/nrfx \
 	$(TOP)/hw/mcu/nordic/nrfx/mdk \
diff --git a/hw/bsp/feather_nrf52840_express/board_feather_nrf52840_express.c b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
similarity index 100%
rename from hw/bsp/feather_nrf52840_express/board_feather_nrf52840_express.c
rename to hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
diff --git a/hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c b/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
similarity index 100%
rename from hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c
rename to hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
diff --git a/hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c b/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
similarity index 100%
rename from hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c
rename to hw/bsp/lpcxpresso1347/lpcxpresso1347.c
diff --git a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
similarity index 100%
rename from hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
rename to hw/bsp/lpcxpresso1769/lpcxpresso1769.c
diff --git a/hw/bsp/mcb1800/board_mcb1800.c b/hw/bsp/mcb1800/mcb1800.c
similarity index 100%
rename from hw/bsp/mcb1800/board_mcb1800.c
rename to hw/bsp/mcb1800/mcb1800.c
diff --git a/hw/bsp/metro_m0_express/board_metro_m0_express.c b/hw/bsp/metro_m0_express/metro_m0_express.c
similarity index 100%
rename from hw/bsp/metro_m0_express/board_metro_m0_express.c
rename to hw/bsp/metro_m0_express/metro_m0_express.c
diff --git a/hw/bsp/metro_m4_express/board_metro_m4_express.c b/hw/bsp/metro_m4_express/metro_m4_express.c
similarity index 100%
rename from hw/bsp/metro_m4_express/board_metro_m4_express.c
rename to hw/bsp/metro_m4_express/metro_m4_express.c
diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk
index d8f63690..9dbaea42 100644
--- a/hw/bsp/pca10056/board.mk
+++ b/hw/bsp/pca10056/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
 	hw/mcu/nordic/nrfx/mdk/system_nrf52840.c \
 
 INC += \
-	$(TOP)/hw/cmsis/Include \
+	$(TOP)/hw/mcu/nordic/cmsis/Include \
 	$(TOP)/hw/mcu/nordic \
 	$(TOP)/hw/mcu/nordic/nrfx \
 	$(TOP)/hw/mcu/nordic/nrfx/mdk \
diff --git a/hw/bsp/pca10056/board_pca10056.c b/hw/bsp/pca10056/pca10056.c
similarity index 100%
rename from hw/bsp/pca10056/board_pca10056.c
rename to hw/bsp/pca10056/pca10056.c
diff --git a/hw/bsp/stm32f303disco/board_stm32f303disco.c b/hw/bsp/stm32f303disco/stm32f303disco.c
similarity index 100%
rename from hw/bsp/stm32f303disco/board_stm32f303disco.c
rename to hw/bsp/stm32f303disco/stm32f303disco.c
diff --git a/hw/bsp/stm32f407disco/board_stm32f407disco.c b/hw/bsp/stm32f407disco/stm32f407disco.c
similarity index 100%
rename from hw/bsp/stm32f407disco/board_stm32f407disco.c
rename to hw/bsp/stm32f407disco/stm32f407disco.c
diff --git a/hw/bsp/stm32f411disco/board_stm32f411disco.c b/hw/bsp/stm32f411disco/stm32f411disco.c
similarity index 100%
rename from hw/bsp/stm32f411disco/board_stm32f411disco.c
rename to hw/bsp/stm32f411disco/stm32f411disco.c
diff --git a/hw/cmsis/Include/arm_common_tables.h b/hw/mcu/nordic/cmsis/Include/arm_common_tables.h
similarity index 100%
rename from hw/cmsis/Include/arm_common_tables.h
rename to hw/mcu/nordic/cmsis/Include/arm_common_tables.h
diff --git a/hw/cmsis/Include/arm_const_structs.h b/hw/mcu/nordic/cmsis/Include/arm_const_structs.h
similarity index 100%
rename from hw/cmsis/Include/arm_const_structs.h
rename to hw/mcu/nordic/cmsis/Include/arm_const_structs.h
diff --git a/hw/cmsis/Include/arm_math.h b/hw/mcu/nordic/cmsis/Include/arm_math.h
similarity index 100%
rename from hw/cmsis/Include/arm_math.h
rename to hw/mcu/nordic/cmsis/Include/arm_math.h
diff --git a/hw/cmsis/Include/cmsis_armcc.h b/hw/mcu/nordic/cmsis/Include/cmsis_armcc.h
similarity index 100%
rename from hw/cmsis/Include/cmsis_armcc.h
rename to hw/mcu/nordic/cmsis/Include/cmsis_armcc.h
diff --git a/hw/cmsis/Include/cmsis_armcc_V6.h b/hw/mcu/nordic/cmsis/Include/cmsis_armcc_V6.h
similarity index 100%
rename from hw/cmsis/Include/cmsis_armcc_V6.h
rename to hw/mcu/nordic/cmsis/Include/cmsis_armcc_V6.h
diff --git a/hw/cmsis/Include/cmsis_gcc.h b/hw/mcu/nordic/cmsis/Include/cmsis_gcc.h
similarity index 100%
rename from hw/cmsis/Include/cmsis_gcc.h
rename to hw/mcu/nordic/cmsis/Include/cmsis_gcc.h
diff --git a/hw/cmsis/Include/core_cm0.h b/hw/mcu/nordic/cmsis/Include/core_cm0.h
similarity index 100%
rename from hw/cmsis/Include/core_cm0.h
rename to hw/mcu/nordic/cmsis/Include/core_cm0.h
diff --git a/hw/cmsis/Include/core_cm0plus.h b/hw/mcu/nordic/cmsis/Include/core_cm0plus.h
similarity index 100%
rename from hw/cmsis/Include/core_cm0plus.h
rename to hw/mcu/nordic/cmsis/Include/core_cm0plus.h
diff --git a/hw/cmsis/Include/core_cm3.h b/hw/mcu/nordic/cmsis/Include/core_cm3.h
similarity index 100%
rename from hw/cmsis/Include/core_cm3.h
rename to hw/mcu/nordic/cmsis/Include/core_cm3.h
diff --git a/hw/cmsis/Include/core_cm4.h b/hw/mcu/nordic/cmsis/Include/core_cm4.h
similarity index 100%
rename from hw/cmsis/Include/core_cm4.h
rename to hw/mcu/nordic/cmsis/Include/core_cm4.h
diff --git a/hw/cmsis/Include/core_cm7.h b/hw/mcu/nordic/cmsis/Include/core_cm7.h
similarity index 100%
rename from hw/cmsis/Include/core_cm7.h
rename to hw/mcu/nordic/cmsis/Include/core_cm7.h
diff --git a/hw/cmsis/Include/core_cmFunc.h b/hw/mcu/nordic/cmsis/Include/core_cmFunc.h
similarity index 100%
rename from hw/cmsis/Include/core_cmFunc.h
rename to hw/mcu/nordic/cmsis/Include/core_cmFunc.h
diff --git a/hw/cmsis/Include/core_cmInstr.h b/hw/mcu/nordic/cmsis/Include/core_cmInstr.h
similarity index 100%
rename from hw/cmsis/Include/core_cmInstr.h
rename to hw/mcu/nordic/cmsis/Include/core_cmInstr.h
diff --git a/hw/cmsis/Include/core_cmSimd.h b/hw/mcu/nordic/cmsis/Include/core_cmSimd.h
similarity index 100%
rename from hw/cmsis/Include/core_cmSimd.h
rename to hw/mcu/nordic/cmsis/Include/core_cmSimd.h
diff --git a/hw/cmsis/Include/core_sc000.h b/hw/mcu/nordic/cmsis/Include/core_sc000.h
similarity index 100%
rename from hw/cmsis/Include/core_sc000.h
rename to hw/mcu/nordic/cmsis/Include/core_sc000.h
diff --git a/hw/cmsis/Include/core_sc300.h b/hw/mcu/nordic/cmsis/Include/core_sc300.h
similarity index 100%
rename from hw/cmsis/Include/core_sc300.h
rename to hw/mcu/nordic/cmsis/Include/core_sc300.h
diff --git a/tools/build_all.py b/tools/build_all.py
index 9efd79fe..9c379d0d 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -51,7 +51,7 @@ for example in all_examples:
 
         if build_result.returncode != 0:
             exit_status = build_result.returncode
-            success = "\033[31mfailed\033[0m"
+            success = "\033[31mfailed\033[0m   "
             fail_count += 1
         else:
             success = "\033[32msucceeded\033[0m"