Index: branches/xZen/src/modules/FileSystem/Cconfig
===================================================================
--- branches/xZen/src/modules/FileSystem/Cconfig	(revision 1239)
+++ branches/xZen/src/modules/FileSystem/Cconfig	(revision 1240)
@@ -9,4 +9,4 @@
 	---help---
 	  Say Y here if you want to enable to use of this module.
 
-source "i386/modules/FileSystem/HFS/Cconfig"
+source "src/modules/FileSystem/HFS/Cconfig"
Index: branches/xZen/src/modules/Cconfig
===================================================================
--- branches/xZen/src/modules/Cconfig	(revision 1239)
+++ branches/xZen/src/modules/Cconfig	(revision 1240)
@@ -18,14 +18,14 @@
 
 menu "Modules"
 # NOTE: ModuleSystem should always be compiled in
-source "i386/modules/ModuleSystem/Cconfig"
+source "src/modules/ModuleSystem/Cconfig"
 
 # NOTE BiosDisk, FileSystem should both be enabled as well as at least one file system driver
-source "i386/modules/klibc/Cconfig"
-source "i386/modules/objc/Cconfig"
-source "i386/modules/uClibcxx/Cconfig"
-source "i386/modules/Disk/Cconfig"
-source "i386/modules/FileSystem/Cconfig"
+source "src/modules/klibc/Cconfig"
+#source "src/modules/objc/Cconfig"
+source "src/modules/uClibcxx/Cconfig"
+source "src/modules/Disk/Cconfig"
+source "src/modules/FileSystem/Cconfig"
 
-source "i386/modules/HelloWorld/Cconfig"
+source "src/modules/HelloWorld/Cconfig"
 endmenu
\ No newline at end of file
Index: branches/xZen/src/i386/Cconfig
===================================================================
--- branches/xZen/src/i386/Cconfig	(revision 1239)
+++ branches/xZen/src/i386/Cconfig	(revision 1240)
@@ -8,16 +8,12 @@
 	---help---
 	  Specify the level to compile chameleon with.
 
-source "src/i386/util/Cconfig"
-
 source "src/i386/boot0/Cconfig"
 
 source "src/i386/boot1/Cconfig"
 
 source "src/i386/boot2/Cconfig"
 
-source "src/i386/modules/Cconfig"
-
 source "src/i386/libsa/Cconfig"
 
 source "src/i386/libsaio/Cconfig"
Index: branches/xZen/src/util/Cconfig
===================================================================
--- branches/xZen/src/util/Cconfig	(revision 1239)
+++ branches/xZen/src/util/Cconfig	(revision 1240)
@@ -7,7 +7,7 @@
 	  chameleon boot sequence.
 	  When in doubt, say "Y".
 
-source "i386/util/fdisk/Cconfig"
+source "src/util/fdisk/Cconfig"
 
 config OPENUP
 	bool "openUp utility"