diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile
index 9bbf863f..b498910b 100644
--- a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile
@@ -58,11 +58,11 @@ LINCLUDES		=	$(ROOT)/build/libraries/spi/ARM7/include \
 					$(TWL_IPL_RED_ROOT)/include \
 					../../NandInitializerRed/common/include \
 					../../NandInitializerRed/ARM7.TWL/include \
-					../../common/include
+					../../common/ARM7/include
 
 
 SRCDIR		=	../../NandInitializerRed/ARM7.TWL/src \
-				../../common/src
+				../../common/ARM7/src
 
 LLIBRARY_DIRS	+=	$(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
 					./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile
index 23c4f67f..408a2005 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile
@@ -57,9 +57,9 @@ LINCLUDES		+=	$(ROOT)/build/libraries/spi/ARM7/include \
 					$(TWL_IPL_RED_ROOT)/include \
 					../common/include \
 					$(ROOT)/build/libraries/init/common/include \
-					../../common/include
+					../../common/ARM7/include
 
-SRCDIR		    +=  ../../common/src
+SRCDIR		    +=  ../../common/ARM7/src
 
 LLIBRARY_DIRS	+=	$(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
 					./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
diff --git a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile
index b9e46aa4..77e4fa4c 100644
--- a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile
@@ -53,9 +53,9 @@ MAKELCF_FLAGS	+=	-DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libs
 
 LINCLUDES		=	$(ROOT)/build/libraries/spi/ARM7/include \
 					../common/include \
-					../../common/include
+					../../common/ARM7/include
 
-SRCDIR		    +=  ../../common/src
+SRCDIR		    +=  ../../common/ARM7/src
 
 LLIBRARIES		+=	libwl_sp$(TWL_LIBSUFFIX).a			\
 					libsdio_sp$(TWL_LIBSUFFIX).a		\
diff --git a/build/systemMenu_tools/common/include/formatter.h b/build/systemMenu_tools/common/ARM7/include/formatter.h
similarity index 100%
rename from build/systemMenu_tools/common/include/formatter.h
rename to build/systemMenu_tools/common/ARM7/include/formatter.h
diff --git a/build/systemMenu_tools/common/src/formatter.c b/build/systemMenu_tools/common/ARM7/src/formatter.c
similarity index 100%
rename from build/systemMenu_tools/common/src/formatter.c
rename to build/systemMenu_tools/common/ARM7/src/formatter.c