diff --git a/meta-moblin/packages/xorg-app/iceauth_1.0.2.bb b/meta-extras/packages/xorg-app/iceauth_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/iceauth_1.0.2.bb
rename to meta-extras/packages/xorg-app/iceauth_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/luit_1.0.2.bb b/meta-extras/packages/xorg-app/luit_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/luit_1.0.2.bb
rename to meta-extras/packages/xorg-app/luit_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/oclock_1.0.1.bb b/meta-extras/packages/xorg-app/oclock_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/oclock_1.0.1.bb
rename to meta-extras/packages/xorg-app/oclock_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/rgb_1.0.1.bb b/meta-extras/packages/xorg-app/rgb_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/rgb_1.0.1.bb
rename to meta-extras/packages/xorg-app/rgb_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/sessreg_1.0.4.bb b/meta-extras/packages/xorg-app/sessreg_1.0.4.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/sessreg_1.0.4.bb
rename to meta-extras/packages/xorg-app/sessreg_1.0.4.bb
diff --git a/meta-moblin/packages/xorg-app/twm_1.0.4.bb b/meta-extras/packages/xorg-app/twm_1.0.4.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/twm_1.0.4.bb
rename to meta-extras/packages/xorg-app/twm_1.0.4.bb
diff --git a/meta-moblin/packages/xorg-app/xbiff_1.0.1.bb b/meta-extras/packages/xorg-app/xbiff_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xbiff_1.0.1.bb
rename to meta-extras/packages/xorg-app/xbiff_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb b/meta-extras/packages/xorg-app/xclipboard_1.1.0.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb
rename to meta-extras/packages/xorg-app/xclipboard_1.1.0.bb
diff --git a/meta-moblin/packages/xorg-app/xclock_1.0.4.bb b/meta-extras/packages/xorg-app/xclock_1.0.4.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xclock_1.0.4.bb
rename to meta-extras/packages/xorg-app/xclock_1.0.4.bb
diff --git a/meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb b/meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb
rename to meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xconsole_1.0.3.bb b/meta-extras/packages/xorg-app/xconsole_1.0.3.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xconsole_1.0.3.bb
rename to meta-extras/packages/xorg-app/xconsole_1.0.3.bb
diff --git a/meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb b/meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb
rename to meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb b/meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb
rename to meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xfd_1.0.1.bb b/meta-extras/packages/xorg-app/xfd_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xfd_1.0.1.bb
rename to meta-extras/packages/xorg-app/xfd_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb b/meta-extras/packages/xorg-app/xfontsel_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb
rename to meta-extras/packages/xorg-app/xfontsel_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xgamma_1.0.2.bb b/meta-extras/packages/xorg-app/xgamma_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xgamma_1.0.2.bb
rename to meta-extras/packages/xorg-app/xgamma_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb b/meta-extras/packages/xorg-app/xkbevd_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb
rename to meta-extras/packages/xorg-app/xkbevd_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb b/meta-extras/packages/xorg-app/xkbprint_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb
rename to meta-extras/packages/xorg-app/xkbprint_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb b/meta-extras/packages/xorg-app/xkbutils_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb
rename to meta-extras/packages/xorg-app/xkbutils_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xkill_1.0.1.bb b/meta-extras/packages/xorg-app/xkill_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xkill_1.0.1.bb
rename to meta-extras/packages/xorg-app/xkill_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xload_1.0.2.bb b/meta-extras/packages/xorg-app/xload_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xload_1.0.2.bb
rename to meta-extras/packages/xorg-app/xload_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xlogo_1.0.1.bb b/meta-extras/packages/xorg-app/xlogo_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xlogo_1.0.1.bb
rename to meta-extras/packages/xorg-app/xlogo_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb b/meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb
rename to meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb b/meta-extras/packages/xorg-app/xlsclients_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb
rename to meta-extras/packages/xorg-app/xlsclients_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb b/meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb
rename to meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xmag_1.0.2.bb b/meta-extras/packages/xorg-app/xmag_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xmag_1.0.2.bb
rename to meta-extras/packages/xorg-app/xmag_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xmessage_1.0.2.bb b/meta-extras/packages/xorg-app/xmessage_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xmessage_1.0.2.bb
rename to meta-extras/packages/xorg-app/xmessage_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xorg-app-common.inc b/meta-extras/packages/xorg-app/xorg-app-common.inc
similarity index 100%
rename from meta-moblin/packages/xorg-app/xorg-app-common.inc
rename to meta-extras/packages/xorg-app/xorg-app-common.inc
diff --git a/meta-moblin/packages/xorg-app/xpr_1.0.2.bb b/meta-extras/packages/xorg-app/xpr_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xpr_1.0.2.bb
rename to meta-extras/packages/xorg-app/xpr_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb b/meta-extras/packages/xorg-app/xrefresh_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb
rename to meta-extras/packages/xorg-app/xrefresh_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb b/meta-extras/packages/xorg-app/xsetroot_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb
rename to meta-extras/packages/xorg-app/xsetroot_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb b/meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb
rename to meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xterm_207.bb b/meta-extras/packages/xorg-app/xterm_207.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xterm_207.bb
rename to meta-extras/packages/xorg-app/xterm_207.bb
diff --git a/meta-moblin/packages/xorg-app/xtrap_1.0.2.bb b/meta-extras/packages/xorg-app/xtrap_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xtrap_1.0.2.bb
rename to meta-extras/packages/xorg-app/xtrap_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb b/meta-extras/packages/xorg-app/xvidtune_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb
rename to meta-extras/packages/xorg-app/xvidtune_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb b/meta-extras/packages/xorg-app/xvinfo_1.0.2.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb
rename to meta-extras/packages/xorg-app/xvinfo_1.0.2.bb
diff --git a/meta-moblin/packages/xorg-app/xwd_1.0.1.bb b/meta-extras/packages/xorg-app/xwd_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xwd_1.0.1.bb
rename to meta-extras/packages/xorg-app/xwd_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-app/xwud_1.0.1.bb b/meta-extras/packages/xorg-app/xwud_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-app/xwud_1.0.1.bb
rename to meta-extras/packages/xorg-app/xwud_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb b/meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb
similarity index 100%
rename from meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb
rename to meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb
diff --git a/meta-moblin/packages/xorg-data/xorg-data-common.inc b/meta-extras/packages/xorg-data/xorg-data-common.inc
similarity index 100%
rename from meta-moblin/packages/xorg-data/xorg-data-common.inc
rename to meta-extras/packages/xorg-data/xorg-data-common.inc