Index: branches/meklort/i386/modules/MakeInc.dir
===================================================================
--- branches/meklort/i386/modules/MakeInc.dir	(revision 744)
+++ branches/meklort/i386/modules/MakeInc.dir	(revision 745)
@@ -1,9 +1,9 @@
 include ../../MakePaths.dir
 include ../../MakeInc.dir
 
-OBJROOT=../../../obj/i386/modules/$(DIR)
-SYMROOT=../../../sym/i386/modules/
-DSTROOT=../../../dst/i386/modules/
+OBJROOT=../../../obj/i386/$(DIR)
+SYMROOT=../../../sym/i386/
+DSTROOT=../../../dst/i386/
 
 
 UTILDIR = ../../util
@@ -11,7 +11,7 @@
 LIBSAIODIR = ../../libsaio
 BOOT2DIR = ../../boot2
 
-MODULE_DEPENDENCIES := $(foreach x,$(MODULE_DEPENDENCIES),-weak_library $(SYMROOT)/$(x).dylib)
+MODULE_DEPENDENCIES := $(foreach x,$(MODULE_DEPENDENCIES),-weak_library $(SYMROOT)/modules/$(x).dylib)
 
 
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
@@ -36,7 +36,7 @@
 	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
 	$(MODULE_DEPENDENCIES) \
 	-macosx_version_min 10.6 \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
+	-o $(SYMROOT)/modules/$(MODULE_NAME).dylib
 	
 	@cp -rf include/* ../module_includes/ &> /dev/null || true
 	
Index: branches/meklort/i386/modules/Makefile
===================================================================
--- branches/meklort/i386/modules/Makefile	(revision 744)
+++ branches/meklort/i386/modules/Makefile	(revision 745)
@@ -1,7 +1,11 @@
+#	Makefile for i386 modules
 
-#	Makefile for i386 boot program
-#	define FLOPPY and SMALL using DEFINES macro as necessary
+# The order of building is important.
+SUBDIRS = klibc uClibc++ Resolution KernelPatcher GUI KextPatcher GraphicsEnabler HPET USBFix Memory Networking NetbookInstaller ACPIPatcher
+#SUBDIRS = klibc uClibc++ ACPIPatcher PCI HDAC
+#SUBDIRS = HelloWorld
 
+
 CFLAGS= -O $(MORECPP) -arch i386 -g -static
 DEFINES=
 CONFIG = hd
@@ -18,16 +22,13 @@
 #
 # these paths are only valid in subdirectories of this directory
 #
-OBJROOT=`pwd`/../../obj/i386/modules/
-SYMROOT=`pwd`/../../sym/i386/modules/
-DSTROOT=`pwd`/../../dst/i386/modules/
+OBJROOT=`pwd`/../../obj/i386/
+SYMROOT=`pwd`/../../sym/i386/
+DSTROOT=`pwd`/../../dst/i386/
 SRCROOT=/tmp
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-# The order of building is important.
-SUBDIRS = klibc uClibc++ Resolution KernelPatcher GUI KextPatcher GraphicsEnabler HPET USBFix Memory Networking NetbookInstaller ACPIPatcher
-#SUBDIRS = HelloWorld
 
 all embedtheme optionrom tags debug install installhdrs: objroot_dirs lazydylib1.o
 	@for i in ${SUBDIRS}; \
@@ -46,10 +47,12 @@
 	done
 
 objroot_dirs:
-	@rm -rf $(OBJROOT) 
-	@mkdir $(OBJROOT) &> /dev/null
+	@rm -rf "$(OBJROOT)" 
+	@mkdir "$(OBJROOT)" &> /dev/null
 	@rm -rf module_includes
 	@mkdir module_includes
+	@rm -rf "$(SYMROOT)/modules/"
+	@mkdir "$(SYMROOT)/modules/"
 
 
 %.o: %.c