diff --git a/packages/.old/Mesa-openchrome/10_cross-compile.diff b/packages/graphics/Mesa-openchrome/10_cross-compile.diff
similarity index 100%
rename from packages/.old/Mesa-openchrome/10_cross-compile.diff
rename to packages/graphics/Mesa-openchrome/10_cross-compile.diff
diff --git a/packages/.old/Mesa-openchrome/20_libmesa-shared.diff b/packages/graphics/Mesa-openchrome/20_libmesa-shared.diff
similarity index 100%
rename from packages/.old/Mesa-openchrome/20_libmesa-shared.diff
rename to packages/graphics/Mesa-openchrome/20_libmesa-shared.diff
diff --git a/packages/.old/Mesa-openchrome/build b/packages/graphics/Mesa-openchrome/build
similarity index 100%
rename from packages/.old/Mesa-openchrome/build
rename to packages/graphics/Mesa-openchrome/build
diff --git a/packages/.old/Mesa-openchrome/install b/packages/graphics/Mesa-openchrome/install
similarity index 100%
rename from packages/.old/Mesa-openchrome/install
rename to packages/graphics/Mesa-openchrome/install
diff --git a/packages/.old/Mesa-openchrome/patches/10_cross-compile.diff b/packages/graphics/Mesa-openchrome/patches/10_cross-compile.diff
similarity index 100%
rename from packages/.old/Mesa-openchrome/patches/10_cross-compile.diff
rename to packages/graphics/Mesa-openchrome/patches/10_cross-compile.diff
diff --git a/packages/.old/Mesa-openchrome/url b/packages/graphics/Mesa-openchrome/url
similarity index 100%
rename from packages/.old/Mesa-openchrome/url
rename to packages/graphics/Mesa-openchrome/url
diff --git a/packages/.old/libdrm-newttm/build b/packages/graphics/libdrm-newttm/build
similarity index 100%
rename from packages/.old/libdrm-newttm/build
rename to packages/graphics/libdrm-newttm/build
diff --git a/packages/.old/libdrm-newttm/install b/packages/graphics/libdrm-newttm/install
similarity index 92%
rename from packages/.old/libdrm-newttm/install
rename to packages/graphics/libdrm-newttm/install
index ac10ee8c44..e0f247be1c 100755
--- a/packages/.old/libdrm-newttm/install
+++ b/packages/graphics/libdrm-newttm/install
@@ -23,7 +23,7 @@ for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do
   $STRIP --strip-debug $MOD
 done
 
-$BUILD/module-init-tool*/depmod -b $INSTALL -v $VER > /dev/null
+$BUILD/module-init-tool*/build/depmod -b $INSTALL -v $VER > /dev/null
 for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
   rm -f $i
 done
diff --git a/packages/.old/libdrm-newttm/patches/libdrm-newttm-linux-2.6.30-0.2.diff b/packages/graphics/libdrm-newttm/patches/libdrm-newttm-linux-2.6.30-0.2.diff
similarity index 100%
rename from packages/.old/libdrm-newttm/patches/libdrm-newttm-linux-2.6.30-0.2.diff
rename to packages/graphics/libdrm-newttm/patches/libdrm-newttm-linux-2.6.30-0.2.diff
diff --git a/packages/.old/libdrm-newttm/url b/packages/graphics/libdrm-newttm/url
similarity index 100%
rename from packages/.old/libdrm-newttm/url
rename to packages/graphics/libdrm-newttm/url
diff --git a/packages/.old/libwsbm/build b/packages/other/libwsbm/build
similarity index 100%
rename from packages/.old/libwsbm/build
rename to packages/other/libwsbm/build
diff --git a/packages/.old/libwsbm/install b/packages/other/libwsbm/install
similarity index 100%
rename from packages/.old/libwsbm/install
rename to packages/other/libwsbm/install
diff --git a/packages/.old/libwsbm/url b/packages/other/libwsbm/url
similarity index 100%
rename from packages/.old/libwsbm/url
rename to packages/other/libwsbm/url
diff --git a/packages/.old/xf86-video-openchrome-ttm/build b/packages/x11/driver/xf86-video-openchrome-ttm/build
similarity index 100%
rename from packages/.old/xf86-video-openchrome-ttm/build
rename to packages/x11/driver/xf86-video-openchrome-ttm/build
diff --git a/packages/.old/xf86-video-openchrome-ttm/config/openchrome.xinf b/packages/x11/driver/xf86-video-openchrome-ttm/config/openchrome.xinf
similarity index 100%
rename from packages/.old/xf86-video-openchrome-ttm/config/openchrome.xinf
rename to packages/x11/driver/xf86-video-openchrome-ttm/config/openchrome.xinf
diff --git a/packages/.old/xf86-video-openchrome-ttm/install b/packages/x11/driver/xf86-video-openchrome-ttm/install
similarity index 100%
rename from packages/.old/xf86-video-openchrome-ttm/install
rename to packages/x11/driver/xf86-video-openchrome-ttm/install
diff --git a/packages/.old/xf86-video-openchrome-ttm/patches/10_crosscompile.diff b/packages/x11/driver/xf86-video-openchrome-ttm/patches/10_crosscompile.diff
similarity index 100%
rename from packages/.old/xf86-video-openchrome-ttm/patches/10_crosscompile.diff
rename to packages/x11/driver/xf86-video-openchrome-ttm/patches/10_crosscompile.diff
diff --git a/packages/.old/xf86-video-openchrome-ttm/url b/packages/x11/driver/xf86-video-openchrome-ttm/url
similarity index 100%
rename from packages/.old/xf86-video-openchrome-ttm/url
rename to packages/x11/driver/xf86-video-openchrome-ttm/url
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index eb45179c3e..06ad74e631 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -23,8 +23,8 @@ $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
 $SCRIPTS/build libXvMC
-$SCRIPTS/build libdrm
-$SCRIPTS/build Mesa
+$SCRIPTS/build $LIBDRM
+$SCRIPTS/build $MESA
 $SCRIPTS/build openssl
 $SCRIPTS/build freetype
 $SCRIPTS/build libfontenc
diff --git a/projects/jetway_j7f5m/options b/projects/jetway_j7f5m/options
index 20fe69ffa0..768c37ce4d 100644
--- a/projects/jetway_j7f5m/options
+++ b/projects/jetway_j7f5m/options
@@ -7,9 +7,9 @@ EMULATORS=yes
 # X.org drivers to use (all/ati/geode/glint/i740/intel/mga/nv/openchrome/
 # radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
 # Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
-XORG_DRIVERS="openchrome"
-DRIDRIVERS="unichrome"
+XORG_DRIVERS="openchrome-ttm"
+DRIDRIVERS="openchrome"
 
-MESA=Mesa
-LIBDRM=libdrm
+MESA=Mesa-openchrome
+LIBDRM=libdrm-newttm