diff --git a/boards/nucleo-common/Makefile b/boards/common/nucleo/Makefile
similarity index 100%
rename from boards/nucleo-common/Makefile
rename to boards/common/nucleo/Makefile
diff --git a/boards/nucleo-common/Makefile.dep b/boards/common/nucleo/Makefile.dep
similarity index 100%
rename from boards/nucleo-common/Makefile.dep
rename to boards/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-common/Makefile.features b/boards/common/nucleo/Makefile.features
similarity index 100%
rename from boards/nucleo-common/Makefile.features
rename to boards/common/nucleo/Makefile.features
diff --git a/boards/common/nucleo/Makefile.include b/boards/common/nucleo/Makefile.include
new file mode 100644
index 0000000000000000000000000000000000000000..21b714a355851525ad216777df874c8d3c8fa6a5
--- /dev/null
+++ b/boards/common/nucleo/Makefile.include
@@ -0,0 +1,5 @@
+# include nucleo common serial configuration
+include $(RIOTBOARD)/common/nucleo/Makefile.include.serial
+
+# add the common header files to the include path
+INCLUDES += -I$(RIOTBOARD)/common/nucleo/include
diff --git a/boards/nucleo-common/Makefile.include.serial b/boards/common/nucleo/Makefile.include.serial
similarity index 59%
rename from boards/nucleo-common/Makefile.include.serial
rename to boards/common/nucleo/Makefile.include.serial
index 20bc2220d4e8d3a29671bb1507d5574780c63316..a5e9afab2c56ebb361bd7c7ff7d6f52811a15858 100644
--- a/boards/nucleo-common/Makefile.include.serial
+++ b/boards/common/nucleo/Makefile.include.serial
@@ -12,23 +12,23 @@ export STLINK_VERSION ?= 2-1
 # Choose OpenOCD board configuration depending on CPU type
 ifeq (,$(OPENOCD_CONFIG))
   ifeq ($(CPU),stm32f0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f0.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f0.cfg
   else ifeq ($(CPU),stm32f1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f1.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f1.cfg
   else ifeq ($(CPU),stm32f2)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f2.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f2.cfg
   else ifeq ($(CPU),stm32f3)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f3.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f3.cfg
   else ifeq ($(CPU),stm32f4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f4.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f4.cfg
   else ifeq ($(CPU),stm32f7)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f7.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f7.cfg
   else ifeq ($(CPU),stm32l0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l0.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l0.cfg
   else ifeq ($(CPU),stm32l1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l1.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l1.cfg
   else ifeq ($(CPU),stm32l4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l4.cfg
+    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l4.cfg
   endif
 endif
 
diff --git a/boards/nucleo-common/dist/openocd-f0.cfg b/boards/common/nucleo/dist/openocd-f0.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f0.cfg
rename to boards/common/nucleo/dist/openocd-f0.cfg
diff --git a/boards/nucleo-common/dist/openocd-f1.cfg b/boards/common/nucleo/dist/openocd-f1.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f1.cfg
rename to boards/common/nucleo/dist/openocd-f1.cfg
diff --git a/boards/nucleo-common/dist/openocd-f2.cfg b/boards/common/nucleo/dist/openocd-f2.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f2.cfg
rename to boards/common/nucleo/dist/openocd-f2.cfg
diff --git a/boards/nucleo-common/dist/openocd-f3.cfg b/boards/common/nucleo/dist/openocd-f3.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f3.cfg
rename to boards/common/nucleo/dist/openocd-f3.cfg
diff --git a/boards/nucleo-common/dist/openocd-f4.cfg b/boards/common/nucleo/dist/openocd-f4.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f4.cfg
rename to boards/common/nucleo/dist/openocd-f4.cfg
diff --git a/boards/nucleo-common/dist/openocd-f7.cfg b/boards/common/nucleo/dist/openocd-f7.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-f7.cfg
rename to boards/common/nucleo/dist/openocd-f7.cfg
diff --git a/boards/nucleo-common/dist/openocd-l0.cfg b/boards/common/nucleo/dist/openocd-l0.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l0.cfg
rename to boards/common/nucleo/dist/openocd-l0.cfg
diff --git a/boards/nucleo-common/dist/openocd-l1.cfg b/boards/common/nucleo/dist/openocd-l1.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l1.cfg
rename to boards/common/nucleo/dist/openocd-l1.cfg
diff --git a/boards/nucleo-common/dist/openocd-l4.cfg b/boards/common/nucleo/dist/openocd-l4.cfg
similarity index 100%
rename from boards/nucleo-common/dist/openocd-l4.cfg
rename to boards/common/nucleo/dist/openocd-l4.cfg
diff --git a/boards/nucleo-common/include/arduino_board.h b/boards/common/nucleo/include/arduino_board.h
similarity index 100%
rename from boards/nucleo-common/include/arduino_board.h
rename to boards/common/nucleo/include/arduino_board.h
diff --git a/boards/nucleo-common/include/arduino_pinmap.h b/boards/common/nucleo/include/arduino_pinmap.h
similarity index 100%
rename from boards/nucleo-common/include/arduino_pinmap.h
rename to boards/common/nucleo/include/arduino_pinmap.h
diff --git a/boards/nucleo-common/include/board_common.h b/boards/common/nucleo/include/board_common.h
similarity index 100%
rename from boards/nucleo-common/include/board_common.h
rename to boards/common/nucleo/include/board_common.h
diff --git a/boards/nucleo-common/include/gpio_params.h b/boards/common/nucleo/include/gpio_params.h
similarity index 100%
rename from boards/nucleo-common/include/gpio_params.h
rename to boards/common/nucleo/include/gpio_params.h
diff --git a/boards/nucleo-common/Makefile.include b/boards/nucleo-common/Makefile.include
deleted file mode 100644
index 1d6f7deea89ad3d9d0dc53682cb1c7ec77b63b08..0000000000000000000000000000000000000000
--- a/boards/nucleo-common/Makefile.include
+++ /dev/null
@@ -1,5 +0,0 @@
-# include nucleo common serial configuration
-include $(RIOTBOARD)/nucleo-common/Makefile.include.serial
-
-# add the common header files to the include path
-INCLUDES += -I$(RIOTBOARD)/nucleo-common/include
diff --git a/boards/nucleo-f030/Makefile.dep b/boards/nucleo-f030/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f030/Makefile.dep
+++ b/boards/nucleo-f030/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f030/Makefile.features b/boards/nucleo-f030/Makefile.features
index ac926da1560c744d3e2df489c9907de9e9c76f12..01698fe2542fea18f3fc8941405c16f2320d2a56 100644
--- a/boards/nucleo-f030/Makefile.features
+++ b/boards/nucleo-f030/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f030/Makefile.include b/boards/nucleo-f030/Makefile.include
index 7f46635918a62ae80e25e2df76146d7a291e0f0a..8c0f845a9aee79931c005affcabe1eb26d953e1f 100644
--- a/boards/nucleo-f030/Makefile.include
+++ b/boards/nucleo-f030/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f030r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f070/Makefile.dep b/boards/nucleo-f070/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f070/Makefile.dep
+++ b/boards/nucleo-f070/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f070/Makefile.features b/boards/nucleo-f070/Makefile.features
index ac926da1560c744d3e2df489c9907de9e9c76f12..01698fe2542fea18f3fc8941405c16f2320d2a56 100644
--- a/boards/nucleo-f070/Makefile.features
+++ b/boards/nucleo-f070/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f070/Makefile.include b/boards/nucleo-f070/Makefile.include
index 02aa57f43a9c284f5fcef5abd82701b0969b8509..99e836bb77f436d948fc135d5d9b70ec479810a2 100644
--- a/boards/nucleo-f070/Makefile.include
+++ b/boards/nucleo-f070/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f070rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f072/Makefile.dep b/boards/nucleo-f072/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f072/Makefile.dep
+++ b/boards/nucleo-f072/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f072/Makefile.features b/boards/nucleo-f072/Makefile.features
index 51410f1e7b877a1939fa3cdc5f633b20745a6771..81e6fe26cbf274f4e77def07db8c7f65fd89ff7f 100644
--- a/boards/nucleo-f072/Makefile.features
+++ b/boards/nucleo-f072/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_spi
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f072/Makefile.include b/boards/nucleo-f072/Makefile.include
index e8fd3d77dc79aa9e4634a5c29870784552c471ed..ee50ffc82efad48b53811308eef085ea33203396 100644
--- a/boards/nucleo-f072/Makefile.include
+++ b/boards/nucleo-f072/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f072rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f091/Makefile.dep b/boards/nucleo-f091/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f091/Makefile.dep
+++ b/boards/nucleo-f091/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f091/Makefile.features b/boards/nucleo-f091/Makefile.features
index 51410f1e7b877a1939fa3cdc5f633b20745a6771..81e6fe26cbf274f4e77def07db8c7f65fd89ff7f 100644
--- a/boards/nucleo-f091/Makefile.features
+++ b/boards/nucleo-f091/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_spi
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-f091/Makefile.include b/boards/nucleo-f091/Makefile.include
index 46a891574bd5a0fa61dd1f53ecc083e686491183..5e8cad68633165da638e02a24efe4a24dd78a27a 100644
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f0
 export CPU_MODEL = stm32f091rc
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f103/Makefile.dep b/boards/nucleo-f103/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f103/Makefile.dep
+++ b/boards/nucleo-f103/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f103/Makefile.features b/boards/nucleo-f103/Makefile.features
index 0cc72d3f1a6e129eb349b4e449c3a599c617846a..8e8843d5e4f46fd94e87c94fdfb121a294117002 100644
--- a/boards/nucleo-f103/Makefile.features
+++ b/boards/nucleo-f103/Makefile.features
@@ -6,7 +6,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
diff --git a/boards/nucleo-f103/Makefile.include b/boards/nucleo-f103/Makefile.include
index 1fe6635a940c042a2c164af541274e4a5c6bf7de..de63a919b93f1c823bc802e100d6c4cea94ed3c8 100644
--- a/boards/nucleo-f103/Makefile.include
+++ b/boards/nucleo-f103/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f1
 export CPU_MODEL = stm32f103rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f302/Makefile.dep b/boards/nucleo-f302/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f302/Makefile.dep
+++ b/boards/nucleo-f302/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f302/Makefile.features b/boards/nucleo-f302/Makefile.features
index 87b91a8272e5157a1e4c5e66f0a5a2a41d2781d5..d761bf567abd198dd254469cd7180568362e9e7d 100644
--- a/boards/nucleo-f302/Makefile.features
+++ b/boards/nucleo-f302/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f302/Makefile.include b/boards/nucleo-f302/Makefile.include
index 249533699383118d28b3663cd52aeaa85c4301b6..6d4d2e403583fabd48ceb3d804cbea6e57d6145f 100644
--- a/boards/nucleo-f302/Makefile.include
+++ b/boards/nucleo-f302/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f302r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f303/Makefile.dep b/boards/nucleo-f303/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f303/Makefile.dep
+++ b/boards/nucleo-f303/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f303/Makefile.features b/boards/nucleo-f303/Makefile.features
index 87b91a8272e5157a1e4c5e66f0a5a2a41d2781d5..d761bf567abd198dd254469cd7180568362e9e7d 100644
--- a/boards/nucleo-f303/Makefile.features
+++ b/boards/nucleo-f303/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f303/Makefile.include b/boards/nucleo-f303/Makefile.include
index c37c350a99e4b280caa12cf7bb55c2901e9feb88..723f72fb62cf9c4e896faa8fe9a781d1f41a99cc 100644
--- a/boards/nucleo-f303/Makefile.include
+++ b/boards/nucleo-f303/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f303re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f334/Makefile.dep b/boards/nucleo-f334/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f334/Makefile.dep
+++ b/boards/nucleo-f334/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f334/Makefile.features b/boards/nucleo-f334/Makefile.features
index 0c6296c36121cbfa8842aa364d5f15ddf6635194..84fb8df11eff4c0d93029d1b9e35accfd6d500ce 100644
--- a/boards/nucleo-f334/Makefile.features
+++ b/boards/nucleo-f334/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f334/Makefile.include b/boards/nucleo-f334/Makefile.include
index 108e9782649281c940aabafd73387d915ece378c..41809262c5278e328d3f73175a2fbffa06ccf833 100644
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f3
 export CPU_MODEL = stm32f334r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f401/Makefile.dep b/boards/nucleo-f401/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f401/Makefile.dep
+++ b/boards/nucleo-f401/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f401/Makefile.features b/boards/nucleo-f401/Makefile.features
index 5f6a656dcbd13f60c75f792a468609cd36ac7414..10ffdd68dd544b5543d45d0a33d1a37efa9d959f 100644
--- a/boards/nucleo-f401/Makefile.features
+++ b/boards/nucleo-f401/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
diff --git a/boards/nucleo-f401/Makefile.include b/boards/nucleo-f401/Makefile.include
index 30cc7a5ba9b5424a2f8190ba6a79676bd929457c..4a63668cf1a881e7dcaea8f2e392d69a8960f5c1 100644
--- a/boards/nucleo-f401/Makefile.include
+++ b/boards/nucleo-f401/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f401re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f410/Makefile.dep b/boards/nucleo-f410/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f410/Makefile.dep
+++ b/boards/nucleo-f410/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f410/Makefile.include b/boards/nucleo-f410/Makefile.include
index d79b8dfa71a87342c9b181ac67def1bf41c42478..b3d4a910d16004d303d3e85e02a6a9b6b9a1f526 100644
--- a/boards/nucleo-f410/Makefile.include
+++ b/boards/nucleo-f410/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f410rb
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f411/Makefile.dep b/boards/nucleo-f411/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f411/Makefile.dep
+++ b/boards/nucleo-f411/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f411/Makefile.include b/boards/nucleo-f411/Makefile.include
index 42b62b6cd0f1589f66cea0595ae64363ddd8d452..70a5d0a19920a69c6ec577d048144da5203d9c0a 100644
--- a/boards/nucleo-f411/Makefile.include
+++ b/boards/nucleo-f411/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f411re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-f446/Makefile.dep b/boards/nucleo-f446/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-f446/Makefile.dep
+++ b/boards/nucleo-f446/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-f446/Makefile.features b/boards/nucleo-f446/Makefile.features
index 5f6a656dcbd13f60c75f792a468609cd36ac7414..10ffdd68dd544b5543d45d0a33d1a37efa9d959f 100644
--- a/boards/nucleo-f446/Makefile.features
+++ b/boards/nucleo-f446/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
diff --git a/boards/nucleo-f446/Makefile.include b/boards/nucleo-f446/Makefile.include
index 00919b161654cac781f8d5dd8ea3fe840aa7ad83..332851abc34bde258025e980f5c23ad30dafc997 100644
--- a/boards/nucleo-f446/Makefile.include
+++ b/boards/nucleo-f446/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32f4
 export CPU_MODEL = stm32f446re
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l053/Makefile.dep b/boards/nucleo-l053/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-l053/Makefile.dep
+++ b/boards/nucleo-l053/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l053/Makefile.features b/boards/nucleo-l053/Makefile.features
index fe1b576a052fa0cbfe928050bb068da2df04d76a..d785886eba1e0ef13125cd0f8357581b30a257f7 100644
--- a/boards/nucleo-l053/Makefile.features
+++ b/boards/nucleo-l053/Makefile.features
@@ -7,7 +7,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-l053/Makefile.include b/boards/nucleo-l053/Makefile.include
index 5128948a0e46c16cdc75f91b9f05efcdb94b0bf9..e4344de4b81507fd3a10db88904795d38c7975be 100644
--- a/boards/nucleo-l053/Makefile.include
+++ b/boards/nucleo-l053/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l0
 export CPU_MODEL = stm32l053r8
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l073/Makefile.dep b/boards/nucleo-l073/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-l073/Makefile.dep
+++ b/boards/nucleo-l073/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l073/Makefile.features b/boards/nucleo-l073/Makefile.features
index 79e116343a0d329d81494b7e50c8d7cd702a6f5a..33fd602785f4a78d3912b09301e9b5117bd0d9ff 100644
--- a/boards/nucleo-l073/Makefile.features
+++ b/boards/nucleo-l073/Makefile.features
@@ -9,7 +9,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nucleo-l073/Makefile.include b/boards/nucleo-l073/Makefile.include
index 71759157dcff838d750a0ff7c2c49b7b29a80c0c..59447c1094729ea6b60c8e5dbc144b338eba336d 100644
--- a/boards/nucleo-l073/Makefile.include
+++ b/boards/nucleo-l073/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l0
 export CPU_MODEL = stm32l073rz
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l152/Makefile.dep b/boards/nucleo-l152/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-l152/Makefile.dep
+++ b/boards/nucleo-l152/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l152/Makefile.features b/boards/nucleo-l152/Makefile.features
index 9fcf1a961713480f593ceba85a1479578c16b4b1..4bc3faf2d4d2a33dad2d355d2c1930048e17fb88 100644
--- a/boards/nucleo-l152/Makefile.features
+++ b/boards/nucleo-l152/Makefile.features
@@ -10,7 +10,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
diff --git a/boards/nucleo-l152/Makefile.include b/boards/nucleo-l152/Makefile.include
index 290208540805bcfa5861523e2b8da71f8b27c807..5ba7da128f4b1ee93cc66a0aedd2f78893a9ba0b 100644
--- a/boards/nucleo-l152/Makefile.include
+++ b/boards/nucleo-l152/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l1
 export CPU_MODEL = stm32l152ret6
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include
diff --git a/boards/nucleo-l476/Makefile.dep b/boards/nucleo-l476/Makefile.dep
index 76e2dc17b45c22bfb5b499e63647610ca247b349..729485827299c1a63e12514b30d4943aeea41c0d 100644
--- a/boards/nucleo-l476/Makefile.dep
+++ b/boards/nucleo-l476/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/nucleo-common/Makefile.dep
+include $(RIOTBOARD)/common/nucleo/Makefile.dep
diff --git a/boards/nucleo-l476/Makefile.features b/boards/nucleo-l476/Makefile.features
index d1a5906bc01d9e782c1df0ce48587c1186ba32cd..b4ed73641e667b5ce98e9a7fc5fac7371ad847ae 100644
--- a/boards/nucleo-l476/Makefile.features
+++ b/boards/nucleo-l476/Makefile.features
@@ -8,7 +8,7 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # load the common Makefile.features for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.features
+include $(RIOTBOARD)/common/nucleo/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-l476/Makefile.include b/boards/nucleo-l476/Makefile.include
index 7ca5c424a26d8d59b88db269d97a5fd3e17db761..a796b9257d09905270fb4c63e4b320b15de238fc 100644
--- a/boards/nucleo-l476/Makefile.include
+++ b/boards/nucleo-l476/Makefile.include
@@ -3,4 +3,4 @@ export CPU = stm32l4
 export CPU_MODEL = stm32l476rg
 
 # load the common Makefile.include for Nucleo boards
-include $(RIOTBOARD)/nucleo-common/Makefile.include
+include $(RIOTBOARD)/common/nucleo/Makefile.include