diff --git a/boards/arduino-mkr1000/Makefile b/boards/arduino-mkr1000/Makefile
index f2684f1e54..392f7d5c56 100644
--- a/boards/arduino-mkr1000/Makefile
+++ b/boards/arduino-mkr1000/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/arduino-mkr-common
+DIRS = $(RIOTBOARD)/common/arduino-mkr
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-mkr1000/Makefile.dep b/boards/arduino-mkr1000/Makefile.dep
index 2b61789eaf..698c09c572 100644
--- a/boards/arduino-mkr1000/Makefile.dep
+++ b/boards/arduino-mkr1000/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
diff --git a/boards/arduino-mkr1000/Makefile.features b/boards/arduino-mkr1000/Makefile.features
index 75f211c04c..bc8c9ae857 100644
--- a/boards/arduino-mkr1000/Makefile.features
+++ b/boards/arduino-mkr1000/Makefile.features
@@ -1,3 +1,3 @@
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
 
 -include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-mkr1000/Makefile.include b/boards/arduino-mkr1000/Makefile.include
index 83a2f983f7..49453ce50d 100644
--- a/boards/arduino-mkr1000/Makefile.include
+++ b/boards/arduino-mkr1000/Makefile.include
@@ -1,10 +1,10 @@
-USEMODULE += arduino-mkr-common
+USEMODULE += boards_common_arduino-mkr
 
 ifeq ($(PROGRAMMER),jlink)
   export MKR_JLINK_DEVICE = atsamw25
 endif
 
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.include
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
 
 # add arduino-mkr1000 include path
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/arduino-mkrzero/Makefile b/boards/arduino-mkrzero/Makefile
index f2684f1e54..392f7d5c56 100644
--- a/boards/arduino-mkrzero/Makefile
+++ b/boards/arduino-mkrzero/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/arduino-mkr-common
+DIRS = $(RIOTBOARD)/common/arduino-mkr
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-mkrzero/Makefile.dep b/boards/arduino-mkrzero/Makefile.dep
index 2b61789eaf..698c09c572 100644
--- a/boards/arduino-mkrzero/Makefile.dep
+++ b/boards/arduino-mkrzero/Makefile.dep
@@ -1 +1 @@
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
diff --git a/boards/arduino-mkrzero/Makefile.features b/boards/arduino-mkrzero/Makefile.features
index 75f211c04c..bc8c9ae857 100644
--- a/boards/arduino-mkrzero/Makefile.features
+++ b/boards/arduino-mkrzero/Makefile.features
@@ -1,3 +1,3 @@
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
 
 -include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-mkrzero/Makefile.include b/boards/arduino-mkrzero/Makefile.include
index 6f992cd0bb..4b920dfa56 100644
--- a/boards/arduino-mkrzero/Makefile.include
+++ b/boards/arduino-mkrzero/Makefile.include
@@ -1,10 +1,10 @@
-USEMODULE += arduino-mkr-common
+USEMODULE += boards_common_arduino-mkr
 
 ifeq ($(PROGRAMMER),jlink)
   export MKR_JLINK_DEVICE = atsamd21
 endif
 
-include $(RIOTBOARD)/arduino-mkr-common/Makefile.include
+include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
 
 # add arduino-mkrzero include path
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/arduino-mkr-common/Makefile b/boards/common/arduino-mkr/Makefile
similarity index 50%
rename from boards/arduino-mkr-common/Makefile
rename to boards/common/arduino-mkr/Makefile
index 8caef4864e..7c64bc0598 100644
--- a/boards/arduino-mkr-common/Makefile
+++ b/boards/common/arduino-mkr/Makefile
@@ -1,3 +1,3 @@
-MODULE = arduino-mkr-common
+MODULE = boards_common_arduino-mkr
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-mkr-common/Makefile.dep b/boards/common/arduino-mkr/Makefile.dep
similarity index 100%
rename from boards/arduino-mkr-common/Makefile.dep
rename to boards/common/arduino-mkr/Makefile.dep
diff --git a/boards/arduino-mkr-common/Makefile.features b/boards/common/arduino-mkr/Makefile.features
similarity index 100%
rename from boards/arduino-mkr-common/Makefile.features
rename to boards/common/arduino-mkr/Makefile.features
diff --git a/boards/arduino-mkr-common/Makefile.include b/boards/common/arduino-mkr/Makefile.include
similarity index 93%
rename from boards/arduino-mkr-common/Makefile.include
rename to boards/common/arduino-mkr/Makefile.include
index e25b6865a4..6e1e0b7bb3 100644
--- a/boards/arduino-mkr-common/Makefile.include
+++ b/boards/common/arduino-mkr/Makefile.include
@@ -22,7 +22,7 @@ else
   include $(RIOTMAKE)/tools/bossa.inc.mk
 endif
 
-INCLUDES += -I$(RIOTBOARD)/arduino-mkr-common/include
+INCLUDES += -I$(RIOTBOARD)/common/arduino-mkr/include
 
 # setup the boards dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
diff --git a/boards/arduino-mkr-common/board.c b/boards/common/arduino-mkr/board.c
similarity index 100%
rename from boards/arduino-mkr-common/board.c
rename to boards/common/arduino-mkr/board.c
diff --git a/boards/arduino-mkr-common/include/arduino_board.h b/boards/common/arduino-mkr/include/arduino_board.h
similarity index 100%
rename from boards/arduino-mkr-common/include/arduino_board.h
rename to boards/common/arduino-mkr/include/arduino_board.h
diff --git a/boards/arduino-mkr-common/include/arduino_pinmap.h b/boards/common/arduino-mkr/include/arduino_pinmap.h
similarity index 100%
rename from boards/arduino-mkr-common/include/arduino_pinmap.h
rename to boards/common/arduino-mkr/include/arduino_pinmap.h
diff --git a/boards/arduino-mkr-common/include/board_common.h b/boards/common/arduino-mkr/include/board_common.h
similarity index 100%
rename from boards/arduino-mkr-common/include/board_common.h
rename to boards/common/arduino-mkr/include/board_common.h
diff --git a/boards/arduino-mkr-common/include/gpio_params.h b/boards/common/arduino-mkr/include/gpio_params.h
similarity index 100%
rename from boards/arduino-mkr-common/include/gpio_params.h
rename to boards/common/arduino-mkr/include/gpio_params.h
diff --git a/boards/arduino-mkr-common/include/periph_conf.h b/boards/common/arduino-mkr/include/periph_conf.h
similarity index 100%
rename from boards/arduino-mkr-common/include/periph_conf.h
rename to boards/common/arduino-mkr/include/periph_conf.h