diff --git a/build/tests/mi/Makefile b/build/tests/mi/Makefile
index ba08dcf..45e61ef 100644
--- a/build/tests/mi/Makefile
+++ b/build/tests/mi/Makefile
@@ -25,7 +25,6 @@ SUBDIRS =	\
 ifneq	($(TWL_PLATFORM),DSTEG)
 SUBDIRS +=	\
 			exDma-1 \
-			_ARM7_exDma-1 \
 
 endif
 
diff --git a/build/tests/mi/_ARM7_exDma-1/Makefile b/build/tests/mi/exDma-1/ARM7/Makefile
similarity index 100%
rename from build/tests/mi/_ARM7_exDma-1/Makefile
rename to build/tests/mi/exDma-1/ARM7/Makefile
diff --git a/build/tests/mi/_ARM7_exDma-1/src/main.c b/build/tests/mi/exDma-1/ARM7/src/main.c
similarity index 100%
rename from build/tests/mi/_ARM7_exDma-1/src/main.c
rename to build/tests/mi/exDma-1/ARM7/src/main.c
diff --git a/build/tests/mi/exDma-1/ARM9/Makefile b/build/tests/mi/exDma-1/ARM9/Makefile
new file mode 100644
index 0000000..3a92a02
--- /dev/null
+++ b/build/tests/mi/exDma-1/ARM9/Makefile
@@ -0,0 +1,42 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - OS - demos - exDma-1
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Log: $
+# $NoKeywords: $
+#----------------------------------------------------------------------------
+
+
+SUBDIRS		=
+
+
+#----------------------------------------------------------------------------
+
+TARGET_BIN	=	exDma.axf
+
+SRCS		=	main.c
+
+#SRCDIR		=	# using default
+#LCFILE		=	# using default
+
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+
+
+#----------------------------------------------------------------------------
+
+do-build:		$(TARGETS)
+
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====
diff --git a/build/tests/mi/exDma-1/src/main.c b/build/tests/mi/exDma-1/ARM9/src/main.c
similarity index 100%
rename from build/tests/mi/exDma-1/src/main.c
rename to build/tests/mi/exDma-1/ARM9/src/main.c
diff --git a/build/tests/mi/exDma-1/Makefile b/build/tests/mi/exDma-1/Makefile
index 3a92a02..078ec37 100644
--- a/build/tests/mi/exDma-1/Makefile
+++ b/build/tests/mi/exDma-1/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlSDK - OS - demos - exDma-1
+# Project:  TwlSDK - build
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
@@ -15,26 +15,16 @@
 # $NoKeywords: $
 #----------------------------------------------------------------------------
 
-
-SUBDIRS		=
-
-
-#----------------------------------------------------------------------------
-
-TARGET_BIN	=	exDma.axf
-
-SRCS		=	main.c
-
-#SRCDIR		=	# using default
-#LCFILE		=	# using default
-
 include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 
 #----------------------------------------------------------------------------
 
-do-build:		$(TARGETS)
+SUBDIRS =	\
+            ARM7 \
+            ARM9 \
 
+#----------------------------------------------------------------------------
 
 include	$(TWLSDK_ROOT)/build/buildtools/modulerules
 
diff --git a/build/tests/os/Makefile b/build/tests/os/Makefile
index 2398bab..224ecec 100644
--- a/build/tests/os/Makefile
+++ b/build/tests/os/Makefile
@@ -20,7 +20,7 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS =	alarm-1 _ARM7-alarm-2
+SUBDIRS =	alarm-1
 
 
 #----------------------------------------------------------------------------
diff --git a/build/tests/os/_ARM7-alarm-2/Makefile b/build/tests/os/alarm-1/ARM7/Makefile
similarity index 100%
rename from build/tests/os/_ARM7-alarm-2/Makefile
rename to build/tests/os/alarm-1/ARM7/Makefile
diff --git a/build/tests/os/_ARM7-alarm-2/src/main.c b/build/tests/os/alarm-1/ARM7/src/main.c
similarity index 100%
rename from build/tests/os/_ARM7-alarm-2/src/main.c
rename to build/tests/os/alarm-1/ARM7/src/main.c
diff --git a/build/tests/os/alarm-1/ARM9/Makefile b/build/tests/os/alarm-1/ARM9/Makefile
new file mode 100644
index 0000000..2dacd54
--- /dev/null
+++ b/build/tests/os/alarm-1/ARM9/Makefile
@@ -0,0 +1,42 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - OS - demos - alarm-1
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Log: $
+# $NoKeywords: $
+#----------------------------------------------------------------------------
+
+
+SUBDIRS		=
+
+
+#----------------------------------------------------------------------------
+
+TARGET_BIN	=	alerm.axf
+
+SRCS		=	main.c
+
+#SRCDIR		=	# using default
+#LCFILE		=	# using default
+
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+
+
+#----------------------------------------------------------------------------
+
+do-build:		$(TARGETS)
+
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====
diff --git a/build/tests/os/alarm-1/src/main.c b/build/tests/os/alarm-1/ARM9/src/main.c
similarity index 100%
rename from build/tests/os/alarm-1/src/main.c
rename to build/tests/os/alarm-1/ARM9/src/main.c
diff --git a/build/tests/os/alarm-1/Makefile b/build/tests/os/alarm-1/Makefile
index 2dacd54..078ec37 100644
--- a/build/tests/os/alarm-1/Makefile
+++ b/build/tests/os/alarm-1/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlSDK - OS - demos - alarm-1
+# Project:  TwlSDK - build
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
@@ -15,26 +15,16 @@
 # $NoKeywords: $
 #----------------------------------------------------------------------------
 
-
-SUBDIRS		=
-
-
-#----------------------------------------------------------------------------
-
-TARGET_BIN	=	alerm.axf
-
-SRCS		=	main.c
-
-#SRCDIR		=	# using default
-#LCFILE		=	# using default
-
 include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 
 #----------------------------------------------------------------------------
 
-do-build:		$(TARGETS)
+SUBDIRS =	\
+            ARM7 \
+            ARM9 \
 
+#----------------------------------------------------------------------------
 
 include	$(TWLSDK_ROOT)/build/buildtools/modulerules