diff --git a/boards/msb-430-common/Makefile b/boards/common/msb-430/Makefile
similarity index 62%
rename from boards/msb-430-common/Makefile
rename to boards/common/msb-430/Makefile
index afb0e3e9010882b46b72182861aaba19f6300362..baa55d873151f46154b83eaf906cf985093e8d3b 100644
--- a/boards/msb-430-common/Makefile
+++ b/boards/common/msb-430/Makefile
@@ -1,4 +1,4 @@
-MODULE = msb-430-common
+MODULE = boards_common_msb-430
 
 DIRS = drivers
 
diff --git a/boards/msb-430-common/Makefile.features b/boards/common/msb-430/Makefile.features
similarity index 100%
rename from boards/msb-430-common/Makefile.features
rename to boards/common/msb-430/Makefile.features
diff --git a/boards/msb-430-common/Makefile.include b/boards/common/msb-430/Makefile.include
similarity index 80%
rename from boards/msb-430-common/Makefile.include
rename to boards/common/msb-430/Makefile.include
index 7a9d36b5b3d5f19dcc287d5c2087e002b781023f..e7ce2c6d836359897407bb1d508ebbe70bbdf11e 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@@ -24,8 +24,8 @@ export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
 export DEBUGGER = $(PREFIX)gdb
 export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)
 
-# export msb-430-common includes
-export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include
-export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include
+# export common msb-430 includes
+export INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
+export INCLUDES += -I$(RIOTBOARD)/common/msb-430/drivers/include
 
-USEMODULE += msb-430-common-drivers
+USEMODULE += boards_common_msb-430-drivers
diff --git a/boards/msb-430-common/board_init.c b/boards/common/msb-430/board_init.c
similarity index 100%
rename from boards/msb-430-common/board_init.c
rename to boards/common/msb-430/board_init.c
diff --git a/boards/msb-430-common/drivers/Makefile b/boards/common/msb-430/drivers/Makefile
similarity index 68%
rename from boards/msb-430-common/drivers/Makefile
rename to boards/common/msb-430/drivers/Makefile
index a9f8e5e470ed284c053ea254d1231229c0157002..ed11f0ae340a4b762ad012b7380fdc0f9e5aaecf 100644
--- a/boards/msb-430-common/drivers/Makefile
+++ b/boards/common/msb-430/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE = msb-430-common-drivers
+MODULE = boards_common_msb-430-drivers
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
 
diff --git a/boards/msb-430-common/drivers/include/sht11-board.h b/boards/common/msb-430/drivers/include/sht11-board.h
similarity index 100%
rename from boards/msb-430-common/drivers/include/sht11-board.h
rename to boards/common/msb-430/drivers/include/sht11-board.h
diff --git a/boards/msb-430-common/include/board_common.h b/boards/common/msb-430/include/board_common.h
similarity index 100%
rename from boards/msb-430-common/include/board_common.h
rename to boards/common/msb-430/include/board_common.h
diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile
index 7746dd4dd9f1579207402398d57c46a142289838..854fb859cc9dd678725a338c4e1427ab8e704efc 100644
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/msb-430-common
+DIRS = $(RIOTBOARD)/common/msb-430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430/Makefile.include b/boards/msb-430/Makefile.include
index 2f65afb5d925b39cfa35e882689216bb3cd8bc5b..92d0ca027fa16aeeb5147f565fc1375acec0a49a 100644
--- a/boards/msb-430/Makefile.include
+++ b/boards/msb-430/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += msb-430-common
-include $(RIOTBOARD)/msb-430-common/Makefile.include
+USEMODULE += boards_common_msb-430
+include $(RIOTBOARD)/common/msb-430/Makefile.include
diff --git a/boards/msb-430h/Makefile b/boards/msb-430h/Makefile
index 7746dd4dd9f1579207402398d57c46a142289838..854fb859cc9dd678725a338c4e1427ab8e704efc 100644
--- a/boards/msb-430h/Makefile
+++ b/boards/msb-430h/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/msb-430-common
+DIRS = $(RIOTBOARD)/common/msb-430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
index 2f65afb5d925b39cfa35e882689216bb3cd8bc5b..92d0ca027fa16aeeb5147f565fc1375acec0a49a 100644
--- a/boards/msb-430h/Makefile.include
+++ b/boards/msb-430h/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += msb-430-common
-include $(RIOTBOARD)/msb-430-common/Makefile.include
+USEMODULE += boards_common_msb-430
+include $(RIOTBOARD)/common/msb-430/Makefile.include