diff --git a/boards/wsn430-common/Makefile b/boards/common/wsn430/Makefile
similarity index 53%
rename from boards/wsn430-common/Makefile
rename to boards/common/wsn430/Makefile
index ffc7569b01..68565d52e8 100644
--- a/boards/wsn430-common/Makefile
+++ b/boards/common/wsn430/Makefile
@@ -1,3 +1,3 @@
-MODULE = wsn430-common
+MODULE = boards_common_wsn430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/wsn430-common/Makefile.include b/boards/common/wsn430/Makefile.include
similarity index 82%
rename from boards/wsn430-common/Makefile.include
rename to boards/common/wsn430/Makefile.include
index f129be19a6..3d197451b7 100644
--- a/boards/wsn430-common/Makefile.include
+++ b/boards/common/wsn430/Makefile.include
@@ -13,5 +13,5 @@ export OFLAGS = -O ihex
 export FLASHER = mspdebug
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
 
-# include wsn430-common includes
-export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
+# include common wsn430 includes
+export INCLUDES += -I$(RIOTBOARD)/common/wsn430/include
diff --git a/boards/wsn430-common/board_init.c b/boards/common/wsn430/board_init.c
similarity index 100%
rename from boards/wsn430-common/board_init.c
rename to boards/common/wsn430/board_init.c
diff --git a/boards/wsn430-common/include/board_common.h b/boards/common/wsn430/include/board_common.h
similarity index 100%
rename from boards/wsn430-common/include/board_common.h
rename to boards/common/wsn430/include/board_common.h
diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/common/wsn430/include/periph_conf.h
similarity index 100%
rename from boards/wsn430-common/include/periph_conf.h
rename to boards/common/wsn430/include/periph_conf.h
diff --git a/boards/wsn430-v1_3b/Makefile b/boards/wsn430-v1_3b/Makefile
index c28e0e33e3..77db0c1908 100644
--- a/boards/wsn430-v1_3b/Makefile
+++ b/boards/wsn430-v1_3b/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/wsn430-common
+DIRS = $(RIOTBOARD)/common/wsn430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/wsn430-v1_3b/Makefile.include b/boards/wsn430-v1_3b/Makefile.include
index be49a22db7..54a6472f9a 100644
--- a/boards/wsn430-v1_3b/Makefile.include
+++ b/boards/wsn430-v1_3b/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += wsn430-common
-include $(RIOTBOARD)/wsn430-common/Makefile.include
+USEMODULE += boards_common_wsn430
+include $(RIOTBOARD)/common/wsn430/Makefile.include
diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile
index c28e0e33e3..77db0c1908 100644
--- a/boards/wsn430-v1_4/Makefile
+++ b/boards/wsn430-v1_4/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/wsn430-common
+DIRS = $(RIOTBOARD)/common/wsn430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
index be49a22db7..54a6472f9a 100644
--- a/boards/wsn430-v1_4/Makefile.include
+++ b/boards/wsn430-v1_4/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += wsn430-common
-include $(RIOTBOARD)/wsn430-common/Makefile.include
+USEMODULE += boards_common_wsn430
+include $(RIOTBOARD)/common/wsn430/Makefile.include