xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory...

	This is the first step for the update to X11R7.1.
	This will not build and will be followed by more patches and updates.

diff --git a/packages/x11-apps/xauth/.mtn2git_empty b/packages/xorg-app/.mtn2git_empty
similarity index 100%
rename from packages/x11-apps/xauth/.mtn2git_empty
rename to packages/xorg-app/.mtn2git_empty

diff --git a/packages/x11-apps/bdftopcf_1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/x11-apps/bdftopcf_1.0.0.bb
rename to packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb

diff --git a/packages/x11-apps/iceauth_1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/iceauth_1.0.1.bb
rename to packages/xorg-app/iceauth_X11R7.0-1.0.1.bb

diff --git a/packages/x11-apps/mkfontdir_1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/mkfontdir_1.0.1.bb
rename to packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb

diff --git a/packages/x11-apps/mkfontscale_1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/mkfontscale_1.0.1.bb
rename to packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb

diff --git a/packages/x11-apps/rgb_1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/x11-apps/rgb_1.0.0.bb
rename to packages/xorg-app/rgb_X11R7.0-1.0.0.bb

diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/twm_1.0.1.bb
rename to packages/xorg-app/twm_X11R7.0-1.0.1.bb

diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xorg-app/xauth/.mtn2git_empty
similarity index 100%
rename from packages/xdpyinfo/xdpyinfo/.mtn2git_empty
rename to packages/xorg-app/xauth/.mtn2git_empty

diff --git a/packages/x11-apps/xauth/autofoo.patch b/packages/xorg-app/xauth/autofoo.patch
similarity index 100%
rename from packages/x11-apps/xauth/autofoo.patch
rename to packages/xorg-app/xauth/autofoo.patch

diff --git a/packages/x11-apps/xauth_1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/xauth_1.0.1.bb
rename to packages/xorg-app/xauth_X11R7.0-1.0.1.bb

diff --git a/packages/x11-apps/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
similarity index 100%
rename from packages/x11-apps/xauth_cvs.bb
rename to packages/xorg-app/xauth_cvs.bb

diff --git a/packages/x11-apps/xclock_1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/xclock_1.0.1.bb
rename to packages/xorg-app/xclock_X11R7.0-1.0.1.bb

diff --git a/packages/xev/files/.mtn2git_empty b/packages/xorg-app/xdpyinfo/.mtn2git_empty
similarity index 100%
rename from packages/xev/files/.mtn2git_empty
rename to packages/xorg-app/xdpyinfo/.mtn2git_empty

diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xorg-app/xdpyinfo/disable-xkb.patch
similarity index 100%
rename from packages/xdpyinfo/xdpyinfo/disable-xkb.patch
rename to packages/xorg-app/xdpyinfo/disable-xkb.patch

diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xdpyinfo/xdpyinfo_1.0.1.bb
rename to packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb

diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
similarity index 100%
rename from packages/xdpyinfo/xdpyinfo_cvs.bb
rename to packages/xorg-app/xdpyinfo_cvs.bb

diff --git a/packages/xhost/xhost/.mtn2git_empty b/packages/xorg-app/xev/.mtn2git_empty
similarity index 100%
rename from packages/xhost/xhost/.mtn2git_empty
rename to packages/xorg-app/xev/.mtn2git_empty

diff --git a/packages/xev/files/diet-x11.patch b/packages/xorg-app/xev/diet-x11.patch
similarity index 100%
rename from packages/xev/files/diet-x11.patch
rename to packages/xorg-app/xev/diet-x11.patch

diff --git a/packages/xev/xev_1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xev/xev_1.0.1.bb
rename to packages/xorg-app/xev_X11R7.0-1.0.1.bb

diff --git a/packages/xev/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
similarity index 100%
rename from packages/xev/xev_cvs.bb
rename to packages/xorg-app/xev_cvs.bb

diff --git a/packages/x11-apps/xeyes_1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/xeyes_1.0.1.bb
rename to packages/xorg-app/xeyes_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xorg-app/xhost/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/diet-x11/.mtn2git_empty
rename to packages/xorg-app/xhost/.mtn2git_empty

diff --git a/packages/xhost/xhost/autofoo.patch b/packages/xorg-app/xhost/autofoo.patch
similarity index 100%
rename from packages/xhost/xhost/autofoo.patch
rename to packages/xorg-app/xhost/autofoo.patch

diff --git a/packages/xhost/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
similarity index 100%
rename from packages/xhost/xhost_20040413.bb
rename to packages/xorg-app/xhost_20040413.bb

diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xhost/xhost_1.0.0.bb
rename to packages/xorg-app/xhost_X11R7.0-1.0.0.bb

diff --git a/packages/x11-apps/xinit_1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/xinit_1.0.1.bb
rename to packages/xorg-app/xinit_X11R7.0-1.0.1.bb

diff --git a/packages/x11-apps/xkbcomp_1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/x11-apps/xkbcomp_1.0.1.bb
rename to packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/xorg-app/xmodmap/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/files/.mtn2git_empty
rename to packages/xorg-app/xmodmap/.mtn2git_empty

diff --git a/packages/xmodmap/xmodmap/autofoo.patch b/packages/xorg-app/xmodmap/autofoo.patch
similarity index 100%
rename from packages/xmodmap/xmodmap/autofoo.patch
rename to packages/xorg-app/xmodmap/autofoo.patch

diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xmodmap/xmodmap_1.0.0.bb
rename to packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb

diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
similarity index 100%
rename from packages/xmodmap/xmodmap_cvs.bb
rename to packages/xorg-app/xmodmap_cvs.bb

diff --git a/packages/x11-apps/app-common.inc b/packages/xorg-app/xorg-app-common.inc
similarity index 100%
rename from packages/x11-apps/app-common.inc
rename to packages/xorg-app/xorg-app-common.inc

diff --git a/packages/xlibs/libice/.mtn2git_empty b/packages/xorg-app/xprop/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libice/.mtn2git_empty
rename to packages/xorg-app/xprop/.mtn2git_empty

diff --git a/packages/xprop/xprop/autofoo.patch b/packages/xorg-app/xprop/autofoo.patch
similarity index 100%
rename from packages/xprop/xprop/autofoo.patch
rename to packages/xorg-app/xprop/autofoo.patch

diff --git a/packages/xprop/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
similarity index 100%
rename from packages/xprop/xprop_cvs.bb
rename to packages/xorg-app/xprop_cvs.bb

diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xrandr/xrandr_1.0.1.bb
rename to packages/xorg-app/xrandr_X11R7.0-1.0.1.bb

diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
similarity index 100%
rename from packages/xrandr/xrandr_cvs.bb
rename to packages/xorg-app/xrandr_cvs.bb

diff --git a/packages/xlibs/liblbxutil/.mtn2git_empty b/packages/xorg-app/xrdb/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/liblbxutil/.mtn2git_empty
rename to packages/xorg-app/xrdb/.mtn2git_empty

diff --git a/packages/xrdb/xrdb/autofoo.patch b/packages/xorg-app/xrdb/autofoo.patch
similarity index 100%
rename from packages/xrdb/xrdb/autofoo.patch
rename to packages/xorg-app/xrdb/autofoo.patch

diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xrdb/xrdb_1.0.1.bb
rename to packages/xorg-app/xrdb_X11R7.0-1.0.1.bb

diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
similarity index 100%
rename from packages/xrdb/xrdb_cvs.bb
rename to packages/xorg-app/xrdb_cvs.bb

diff --git a/packages/xlibs/libsm/.mtn2git_empty b/packages/xorg-app/xset/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libsm/.mtn2git_empty
rename to packages/xorg-app/xset/.mtn2git_empty

diff --git a/packages/xset/xset/autofoo.patch b/packages/xorg-app/xset/autofoo.patch
similarity index 100%
rename from packages/xset/xset/autofoo.patch
rename to packages/xorg-app/xset/autofoo.patch

diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xorg-app/xset/disable-xkb.patch
similarity index 100%
rename from packages/xset/xset/disable-xkb.patch
rename to packages/xorg-app/xset/disable-xkb.patch

diff --git a/packages/xset/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
similarity index 100%
rename from packages/xset/xset_20040817.bb
rename to packages/xorg-app/xset_20040817.bb

diff --git a/packages/xset/xset_1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xset/xset_1.0.1.bb
rename to packages/xorg-app/xset_X11R7.0-1.0.1.bb

diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xorg-data/xbitmaps_1.0.1.bb
rename to packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb

diff --git a/packages/xorg-data/xkbdata_1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xorg-data/xkbdata_1.0.1.bb
rename to packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb

diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/xorg-data-common.inc
similarity index 100%
rename from packages/xorg-data/data-common.inc
rename to packages/xorg-data/xorg-data-common.inc

diff --git a/packages/xlibs/libx11/.mtn2git_empty b/packages/xorg-font/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libx11/.mtn2git_empty
rename to packages/xorg-font/.mtn2git_empty

diff --git a/packages/xlibs/libxau/.mtn2git_empty b/packages/xorg-font/files/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxau/.mtn2git_empty
rename to packages/xorg-font/files/.mtn2git_empty

diff --git a/packages/xfonts/imake-staging.patch b/packages/xorg-font/files/imake-staging.patch
similarity index 100%
rename from packages/xfonts/imake-staging.patch
rename to packages/xorg-font/files/imake-staging.patch

diff --git a/packages/xfonts/lexer.patch b/packages/xorg-font/files/lexer.patch
similarity index 100%
rename from packages/xfonts/lexer.patch
rename to packages/xorg-font/files/lexer.patch

diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xorg-fonts/font-alias_1.0.1.bb
rename to packages/xorg-font/font-alias_X11R7.0-1.0.1.bb

diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xorg-fonts/font-cursor-misc_1.0.0.bb
rename to packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb

diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xorg-fonts/font-misc-misc_1.0.0.bb
rename to packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb

diff --git a/packages/xorg-fonts/font-util_1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xorg-fonts/font-util_1.0.0.bb
rename to packages/xorg-font/font-util_X11R7.0-1.0.0.bb

diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
similarity index 100%
rename from packages/xfonts/xfonts-xorg_6.8.bb
rename to packages/xorg-font/xfonts-xorg_6.8.bb

diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-font/xorg-font-common.inc
similarity index 100%
rename from packages/xorg-fonts/font-common.inc
rename to packages/xorg-font/xorg-font-common.inc

diff --git a/packages/xlibs/libxaw/.mtn2git_empty b/packages/xorg-lib/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxaw/.mtn2git_empty
rename to packages/xorg-lib/.mtn2git_empty

diff --git a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty b/packages/xorg-lib/diet-x11/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty
rename to packages/xorg-lib/diet-x11/.mtn2git_empty

diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
similarity index 100%
rename from packages/xlibs/diet-x11/X18NCMSstubs.diff
rename to packages/xorg-lib/diet-x11/X18NCMSstubs.diff

diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
similarity index 100%
rename from packages/xlibs/diet-x11/fix-disable-xlocale.diff
rename to packages/xorg-lib/diet-x11/fix-disable-xlocale.diff

diff --git a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
similarity index 100%
rename from packages/xlibs/diet-x11/fix-utf8-wrong-define.patch
rename to packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch

diff --git a/packages/xlibs/diet-x11_20050226.bb b/packages/xorg-lib/diet-x11_20050226.bb
similarity index 100%
rename from packages/xlibs/diet-x11_20050226.bb
rename to packages/xorg-lib/diet-x11_20050226.bb

diff --git a/packages/xlibs/diet-x11_6.2.1.bb b/packages/xorg-lib/diet-x11_6.2.1.bb
similarity index 100%
rename from packages/xlibs/diet-x11_6.2.1.bb
rename to packages/xorg-lib/diet-x11_6.2.1.bb

diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/diet-x11_cvs.bb b/packages/xorg-lib/diet-x11_cvs.bb
similarity index 100%
rename from packages/xlibs/diet-x11_cvs.bb
rename to packages/xorg-lib/diet-x11_cvs.bb

diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxcomposite/.mtn2git_empty
rename to packages/xorg-lib/files/.mtn2git_empty

diff --git a/packages/xlibs/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
similarity index 100%
rename from packages/xlibs/files/errordb-keysymdb-path-fix.patch
rename to packages/xorg-lib/files/errordb-keysymdb-path-fix.patch

diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
similarity index 100%
rename from packages/xlibs/files/fix-utf8-wrong-define.patch
rename to packages/xorg-lib/files/fix-utf8-wrong-define.patch

diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libfontenc_1.0.1.bb
rename to packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
similarity index 100%
rename from packages/xlibs/libfontenc_1.0.2.bb
rename to packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb

diff --git a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty b/packages/xorg-lib/libice/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxcursor-1.1.2/.mtn2git_empty
rename to packages/xorg-lib/libice/.mtn2git_empty

diff --git a/packages/xlibs/libice/autofoo.patch b/packages/xorg-lib/libice/autofoo.patch
similarity index 100%
rename from packages/xlibs/libice/autofoo.patch
rename to packages/xorg-lib/libice/autofoo.patch

diff --git a/packages/xlibs/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
similarity index 100%
rename from packages/xlibs/libice_6.3.3.bb
rename to packages/xorg-lib/libice_6.3.3.bb

diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libice_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libice_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libice_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/libice_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb
similarity index 100%
rename from packages/xlibs/libice_cvs.bb
rename to packages/xorg-lib/libice_cvs.bb

diff --git a/packages/xlibs/libxcursor/.mtn2git_empty b/packages/xorg-lib/liblbxutil/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxcursor/.mtn2git_empty
rename to packages/xorg-lib/liblbxutil/.mtn2git_empty

diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xorg-lib/liblbxutil/mkg3states.patch
similarity index 100%
rename from packages/xlibs/liblbxutil/mkg3states.patch
rename to packages/xorg-lib/liblbxutil/mkg3states.patch

diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/liblbxutil_1.0.0.bb
rename to packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/liblbxutil_1.0.1.bb
rename to packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty b/packages/xorg-lib/libsm/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxdamage-1.0.1/.mtn2git_empty
rename to packages/xorg-lib/libsm/.mtn2git_empty

diff --git a/packages/xlibs/libsm/autofoo.patch b/packages/xorg-lib/libsm/autofoo.patch
similarity index 100%
rename from packages/xlibs/libsm/autofoo.patch
rename to packages/xorg-lib/libsm/autofoo.patch

diff --git a/packages/xlibs/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
similarity index 100%
rename from packages/xlibs/libsm_6.0.3.bb
rename to packages/xorg-lib/libsm_6.0.3.bb

diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libsm_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libsm_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libsm_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/libsm_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb
similarity index 100%
rename from packages/xlibs/libsm_cvs.bb
rename to packages/xorg-lib/libsm_cvs.bb

diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xorg-lib/libx11-native_6.2.1.bb
similarity index 100%
rename from packages/xlibs/libx11-native_6.2.1.bb
rename to packages/xorg-lib/libx11-native_6.2.1.bb

diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xorg-lib/libx11-native_cvs.bb
similarity index 100%
rename from packages/xlibs/libx11-native_cvs.bb
rename to packages/xorg-lib/libx11-native_cvs.bb

diff --git a/packages/xlibs/libxdamage/.mtn2git_empty b/packages/xorg-lib/libx11/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxdamage/.mtn2git_empty
rename to packages/xorg-lib/libx11/.mtn2git_empty

diff --git a/packages/xlibs/libx11/autofoo.patch b/packages/xorg-lib/libx11/autofoo.patch
similarity index 100%
rename from packages/xlibs/libx11/autofoo.patch
rename to packages/xorg-lib/libx11/autofoo.patch

diff --git a/packages/xlibs/libx11/xim.patch b/packages/xorg-lib/libx11/xim.patch
similarity index 100%
rename from packages/xlibs/libx11/xim.patch
rename to packages/xorg-lib/libx11/xim.patch

diff --git a/packages/xlibs/libx11_20050226.bb b/packages/xorg-lib/libx11_20050226.bb
similarity index 100%
rename from packages/xlibs/libx11_20050226.bb
rename to packages/xorg-lib/libx11_20050226.bb

diff --git a/packages/xlibs/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb
similarity index 100%
rename from packages/xlibs/libx11_6.2.1.bb
rename to packages/xorg-lib/libx11_6.2.1.bb

diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libx11_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libx11_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libx11_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/libx11_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
similarity index 100%
rename from packages/xlibs/libx11_cvs.bb
rename to packages/xorg-lib/libx11_cvs.bb

diff --git a/packages/xlibs/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
similarity index 100%
rename from packages/xlibs/libx11_git.bb
rename to packages/xorg-lib/libx11_git.bb

diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xorg-lib/libxau-native_0.1.1.bb
similarity index 100%
rename from packages/xlibs/libxau-native_0.1.1.bb
rename to packages/xorg-lib/libxau-native_0.1.1.bb

diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xorg-lib/libxau-native_cvs.bb
similarity index 100%
rename from packages/xlibs/libxau-native_cvs.bb
rename to packages/xorg-lib/libxau-native_cvs.bb

diff --git a/packages/xlibs/libxdmcp/.mtn2git_empty b/packages/xorg-lib/libxau/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxdmcp/.mtn2git_empty
rename to packages/xorg-lib/libxau/.mtn2git_empty

diff --git a/packages/xlibs/libxau/autofoo.patch b/packages/xorg-lib/libxau/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxau/autofoo.patch
rename to packages/xorg-lib/libxau/autofoo.patch

diff --git a/packages/xlibs/libxau_0.1.1.bb b/packages/xorg-lib/libxau_0.1.1.bb
similarity index 100%
rename from packages/xlibs/libxau_0.1.1.bb
rename to packages/xorg-lib/libxau_0.1.1.bb

diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxau_1.0.0.bb
rename to packages/xorg-lib/libxau_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxau_1.0.1.bb
rename to packages/xorg-lib/libxau_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxau_cvs.bb b/packages/xorg-lib/libxau_cvs.bb
similarity index 100%
rename from packages/xlibs/libxau_cvs.bb
rename to packages/xorg-lib/libxau_cvs.bb

diff --git a/packages/xlibs/libxext/.mtn2git_empty b/packages/xorg-lib/libxaw/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxext/.mtn2git_empty
rename to packages/xorg-lib/libxaw/.mtn2git_empty

diff --git a/packages/xlibs/libxaw/auxdir.patch b/packages/xorg-lib/libxaw/auxdir.patch
similarity index 100%
rename from packages/xlibs/libxaw/auxdir.patch
rename to packages/xorg-lib/libxaw/auxdir.patch

diff --git a/packages/xlibs/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb
similarity index 100%
rename from packages/xlibs/libxaw_7.0.2.bb
rename to packages/xorg-lib/libxaw_7.0.2.bb

diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxaw_X11R7.0-1.0.1.bb
rename to packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxaw_X11R7.1-1.0.2.bb
rename to packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb

diff --git a/packages/xlibs/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb
similarity index 100%
rename from packages/xlibs/libxaw_cvs.bb
rename to packages/xorg-lib/libxaw_cvs.bb

diff --git a/packages/xlibs/libxfixes/.mtn2git_empty b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxfixes/.mtn2git_empty
rename to packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty

diff --git a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxcomposite-1.0.1/autofoo.patch
rename to packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch

diff --git a/packages/xlibs/libxfont/.mtn2git_empty b/packages/xorg-lib/libxcomposite/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxfont/.mtn2git_empty
rename to packages/xorg-lib/libxcomposite/.mtn2git_empty

diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xorg-lib/libxcomposite/change-include-order.patch
similarity index 100%
rename from packages/xlibs/libxcomposite/change-include-order.patch
rename to packages/xorg-lib/libxcomposite/change-include-order.patch

diff --git a/packages/xlibs/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxcomposite_1.0.1.bb
rename to packages/xorg-lib/libxcomposite_1.0.1.bb

diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
similarity index 100%
rename from packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
rename to packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb

diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
similarity index 100%
rename from packages/xlibs/libxcomposite_X11R7.1-0.3.bb
rename to packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb

diff --git a/packages/xlibs/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb
similarity index 100%
rename from packages/xlibs/libxcomposite_cvs.bb
rename to packages/xorg-lib/libxcomposite_cvs.bb

diff --git a/packages/xlibs/libxft/.mtn2git_empty b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxft/.mtn2git_empty
rename to packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty

diff --git a/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxcursor-1.1.2/autofoo.patch
rename to packages/xorg-lib/libxcursor-1.1.2/autofoo.patch

diff --git a/packages/xlibs/libxi/.mtn2git_empty b/packages/xorg-lib/libxcursor/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxi/.mtn2git_empty
rename to packages/xorg-lib/libxcursor/.mtn2git_empty

diff --git a/packages/xlibs/libxcursor/autofoo.patch b/packages/xorg-lib/libxcursor/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxcursor/autofoo.patch
rename to packages/xorg-lib/libxcursor/autofoo.patch

diff --git a/packages/xlibs/libxcursor_1.1.2.bb b/packages/xorg-lib/libxcursor_1.1.2.bb
similarity index 100%
rename from packages/xlibs/libxcursor_1.1.2.bb
rename to packages/xorg-lib/libxcursor_1.1.2.bb

diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
similarity index 100%
rename from packages/xlibs/libxcursor_1.1.5.2.bb
rename to packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb

diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
similarity index 100%
rename from packages/xlibs/libxcursor_1.1.6.bb
rename to packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb

diff --git a/packages/xlibs/libxcursor_cvs.bb b/packages/xorg-lib/libxcursor_cvs.bb
similarity index 100%
rename from packages/xlibs/libxcursor_cvs.bb
rename to packages/xorg-lib/libxcursor_cvs.bb

diff --git a/packages/xlibs/libxpm/.mtn2git_empty b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxpm/.mtn2git_empty
rename to packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty

diff --git a/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxdamage-1.0.1/autofoo.patch
rename to packages/xorg-lib/libxdamage-1.0.1/autofoo.patch

diff --git a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty b/packages/xorg-lib/libxdamage/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxrandr-1.0.2/.mtn2git_empty
rename to packages/xorg-lib/libxdamage/.mtn2git_empty

diff --git a/packages/xlibs/libxdamage/m4.patch b/packages/xorg-lib/libxdamage/m4.patch
similarity index 100%
rename from packages/xlibs/libxdamage/m4.patch
rename to packages/xorg-lib/libxdamage/m4.patch

diff --git a/packages/xlibs/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxdamage_1.0.1.bb
rename to packages/xorg-lib/libxdamage_1.0.1.bb

diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
similarity index 100%
rename from packages/xlibs/libxdamage_1.0.2.2.bb
rename to packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb

diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
similarity index 100%
rename from packages/xlibs/libxdamage_1.0.3.bb
rename to packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb

diff --git a/packages/xlibs/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb
similarity index 100%
rename from packages/xlibs/libxdamage_cvs.bb
rename to packages/xorg-lib/libxdamage_cvs.bb

diff --git a/packages/xlibs/libxdmcp-native_0.1.1.bb b/packages/xorg-lib/libxdmcp-native_0.1.1.bb
similarity index 100%
rename from packages/xlibs/libxdmcp-native_0.1.1.bb
rename to packages/xorg-lib/libxdmcp-native_0.1.1.bb

diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xorg-lib/libxdmcp-native_0.1.3.bb
similarity index 100%
rename from packages/xlibs/libxdmcp-native_0.1.3.bb
rename to packages/xorg-lib/libxdmcp-native_0.1.3.bb

diff --git a/packages/xlibs/libxrandr/.mtn2git_empty b/packages/xorg-lib/libxdmcp/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxrandr/.mtn2git_empty
rename to packages/xorg-lib/libxdmcp/.mtn2git_empty

diff --git a/packages/xlibs/libxdmcp/autofoo.patch b/packages/xorg-lib/libxdmcp/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxdmcp/autofoo.patch
rename to packages/xorg-lib/libxdmcp/autofoo.patch

diff --git a/packages/xlibs/libxdmcp_0.1.1.bb b/packages/xorg-lib/libxdmcp_0.1.1.bb
similarity index 100%
rename from packages/xlibs/libxdmcp_0.1.1.bb
rename to packages/xorg-lib/libxdmcp_0.1.1.bb

diff --git a/packages/xlibs/libxdmcp_0.1.3.bb b/packages/xorg-lib/libxdmcp_0.1.3.bb
similarity index 100%
rename from packages/xlibs/libxdmcp_0.1.3.bb
rename to packages/xorg-lib/libxdmcp_0.1.3.bb

diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxdmcp_1.0.0.bb
rename to packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxdmcp_1.0.1.bb
rename to packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxdmcp_cvs.bb b/packages/xorg-lib/libxdmcp_cvs.bb
similarity index 100%
rename from packages/xlibs/libxdmcp_cvs.bb
rename to packages/xorg-lib/libxdmcp_cvs.bb

diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb
similarity index 100%
rename from packages/xlibs/libxext-native_cvs.bb
rename to packages/xorg-lib/libxext-native_cvs.bb

diff --git a/packages/xlibs/libxrender/.mtn2git_empty b/packages/xorg-lib/libxext/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxrender/.mtn2git_empty
rename to packages/xorg-lib/libxext/.mtn2git_empty

diff --git a/packages/xlibs/libxext/autofoo.patch b/packages/xorg-lib/libxext/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxext/autofoo.patch
rename to packages/xorg-lib/libxext/autofoo.patch

diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxext_1.0.0.bb
rename to packages/xorg-lib/libxext_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxext_1.0.1.bb
rename to packages/xorg-lib/libxext_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb
similarity index 100%
rename from packages/xlibs/libxext_cvs.bb
rename to packages/xorg-lib/libxext_cvs.bb

diff --git a/packages/xlibs/libxt/.mtn2git_empty b/packages/xorg-lib/libxfixes/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxt/.mtn2git_empty
rename to packages/xorg-lib/libxfixes/.mtn2git_empty

diff --git a/packages/xlibs/libxfixes/autofoo.patch b/packages/xorg-lib/libxfixes/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxfixes/autofoo.patch
rename to packages/xorg-lib/libxfixes/autofoo.patch

diff --git a/packages/xlibs/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb
similarity index 100%
rename from packages/xlibs/libxfixes_2.0.1.bb
rename to packages/xorg-lib/libxfixes_2.0.1.bb

diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
similarity index 100%
rename from packages/xlibs/libxfixes_3.0.1.2.bb
rename to packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb

diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
similarity index 100%
rename from packages/xlibs/libxfixes_4.0.1.bb
rename to packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb

diff --git a/packages/xlibs/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb
similarity index 100%
rename from packages/xlibs/libxfixes_cvs.bb
rename to packages/xorg-lib/libxfixes_cvs.bb

diff --git a/packages/xlibs/libxvmc/.mtn2git_empty b/packages/xorg-lib/libxfont/.mtn2git_empty
similarity index 100%
rename from packages/xlibs/libxvmc/.mtn2git_empty
rename to packages/xorg-lib/libxfont/.mtn2git_empty

diff --git a/packages/xlibs/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxfont/autofoo.patch
rename to packages/xorg-lib/libxfont/autofoo.patch

diff --git a/packages/xlibs/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch
similarity index 100%
rename from packages/xlibs/libxfont/scalable.patch
rename to packages/xorg-lib/libxfont/scalable.patch

diff --git a/packages/xlibs/libxfont_1.4.2.bb b/packages/xorg-lib/libxfont_1.4.2.bb
similarity index 100%
rename from packages/xlibs/libxfont_1.4.2.bb
rename to packages/xorg-lib/libxfont_1.4.2.bb

diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxfont_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
similarity index 100%
rename from packages/xlibs/libxfont_X11R7.1-1.1.0.bb
rename to packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb

diff --git a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
similarity index 100%
rename from packages/xlibs/libxfont_X11R7.1-1.2.0.bb
rename to packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb

diff --git a/packages/xlibs/libxfont_cvs.bb b/packages/xorg-lib/libxfont_cvs.bb
similarity index 100%
rename from packages/xlibs/libxfont_cvs.bb
rename to packages/xorg-lib/libxfont_cvs.bb

diff --git a/packages/xmodmap/xmodmap/.mtn2git_empty b/packages/xorg-lib/libxft/.mtn2git_empty
similarity index 100%
rename from packages/xmodmap/xmodmap/.mtn2git_empty
rename to packages/xorg-lib/libxft/.mtn2git_empty

diff --git a/packages/xlibs/libxft/autofoo.patch b/packages/xorg-lib/libxft/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxft/autofoo.patch
rename to packages/xorg-lib/libxft/autofoo.patch

diff --git a/packages/xlibs/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb
similarity index 100%
rename from packages/xlibs/libxft_2.1.6.bb
rename to packages/xorg-lib/libxft_2.1.6.bb

diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
similarity index 100%
rename from packages/xlibs/libxft_2.1.8.2.bb
rename to packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb

diff --git a/packages/xlibs/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb
similarity index 100%
rename from packages/xlibs/libxft_cvs.bb
rename to packages/xorg-lib/libxft_cvs.bb

diff --git a/packages/xprop/xprop/.mtn2git_empty b/packages/xorg-lib/libxi/.mtn2git_empty
similarity index 100%
rename from packages/xprop/xprop/.mtn2git_empty
rename to packages/xorg-lib/libxi/.mtn2git_empty

diff --git a/packages/xlibs/libxi/autofoo.patch b/packages/xorg-lib/libxi/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxi/autofoo.patch
rename to packages/xorg-lib/libxi/autofoo.patch

diff --git a/packages/xlibs/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb
similarity index 100%
rename from packages/xlibs/libxi_6.0.1.bb
rename to packages/xorg-lib/libxi_6.0.1.bb

diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxi_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libxi_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxi_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/libxi_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb
similarity index 100%
rename from packages/xlibs/libxi_cvs.bb
rename to packages/xorg-lib/libxi_cvs.bb

diff --git a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
similarity index 100%
rename from packages/xlibs/libxinerama_1.0.2+cvs20050505.bb
rename to packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb

diff --git a/packages/xlibs/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxinerama_1.0.2.bb
rename to packages/xorg-lib/libxinerama_1.0.2.bb

diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
rename to packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb
similarity index 100%
rename from packages/xlibs/libxinerama_cvs.bb
rename to packages/xorg-lib/libxinerama_cvs.bb

diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxkbfile_1.0.1.bb
rename to packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
similarity index 100%
rename from packages/xlibs/libxkbfile_1.0.3.bb
rename to packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb

diff --git a/packages/xlibs/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb
similarity index 100%
rename from packages/xlibs/libxkbfile_cvs.bb
rename to packages/xorg-lib/libxkbfile_cvs.bb

diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxkbui_1.0.1.bb
rename to packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxkbui_1.0.2.bb
rename to packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb

diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxmu_1.0.0.bb
rename to packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxmu_1.0.1.bb
rename to packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxmu_cvs.bb b/packages/xorg-lib/libxmu_cvs.bb
similarity index 100%
rename from packages/xlibs/libxmu_cvs.bb
rename to packages/xorg-lib/libxmu_cvs.bb

diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxp_1.0.0.bb
rename to packages/xorg-lib/libxp_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb
similarity index 100%
rename from packages/xlibs/libxp_cvs.bb
rename to packages/xorg-lib/libxp_cvs.bb

diff --git a/packages/xrdb/xrdb/.mtn2git_empty b/packages/xorg-lib/libxpm/.mtn2git_empty
similarity index 100%
rename from packages/xrdb/xrdb/.mtn2git_empty
rename to packages/xorg-lib/libxpm/.mtn2git_empty

diff --git a/packages/xlibs/libxpm/autofoo.patch b/packages/xorg-lib/libxpm/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxpm/autofoo.patch
rename to packages/xorg-lib/libxpm/autofoo.patch

diff --git a/packages/xlibs/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb
similarity index 100%
rename from packages/xlibs/libxpm_3.5.1.bb
rename to packages/xorg-lib/libxpm_3.5.1.bb

diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
similarity index 100%
rename from packages/xlibs/libxpm_3.5.4.2.bb
rename to packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb

diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
similarity index 100%
rename from packages/xlibs/libxpm_3.5.5.bb
rename to packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb

diff --git a/packages/xlibs/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
similarity index 100%
rename from packages/xlibs/libxpm_cvs.bb
rename to packages/xorg-lib/libxpm_cvs.bb

diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty
similarity index 100%
rename from packages/xserver-common/files/.mtn2git_empty
rename to packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty

diff --git a/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxrandr-1.0.2/autofoo.patch
rename to packages/xorg-lib/libxrandr-1.0.2/autofoo.patch

diff --git a/packages/xserver/.mtn2git_empty b/packages/xorg-lib/libxrandr/.mtn2git_empty
similarity index 100%
rename from packages/xserver/.mtn2git_empty
rename to packages/xorg-lib/libxrandr/.mtn2git_empty

diff --git a/packages/xlibs/libxrandr/autofoo.patch b/packages/xorg-lib/libxrandr/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxrandr/autofoo.patch
rename to packages/xorg-lib/libxrandr/autofoo.patch

diff --git a/packages/xlibs/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxrandr_1.0.2.bb
rename to packages/xorg-lib/libxrandr_1.0.2.bb

diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxrandr_1.1.0.2.bb
rename to packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb

diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
similarity index 100%
rename from packages/xlibs/libxrandr_1.1.1.bb
rename to packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb

diff --git a/packages/xlibs/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb
similarity index 100%
rename from packages/xlibs/libxrandr_cvs.bb
rename to packages/xorg-lib/libxrandr_cvs.bb

diff --git a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-lib/libxrender/.mtn2git_empty
similarity index 100%
rename from packages/xserver/xserver-kdrive-omap/.mtn2git_empty
rename to packages/xorg-lib/libxrender/.mtn2git_empty

diff --git a/packages/xlibs/libxrender/autofoo.patch b/packages/xorg-lib/libxrender/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxrender/autofoo.patch
rename to packages/xorg-lib/libxrender/autofoo.patch

diff --git a/packages/xlibs/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb
similarity index 100%
rename from packages/xlibs/libxrender_0.8.4.bb
rename to packages/xorg-lib/libxrender_0.8.4.bb

diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
similarity index 100%
rename from packages/xlibs/libxrender_0.9.0.2.bb
rename to packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb

diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
similarity index 100%
rename from packages/xlibs/libxrender_0.9.1.bb
rename to packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb

diff --git a/packages/xlibs/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb
similarity index 100%
rename from packages/xlibs/libxrender_cvs.bb
rename to packages/xorg-lib/libxrender_cvs.bb

diff --git a/packages/xlibs/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxres_1.0.1.bb
rename to packages/xorg-lib/libxres_1.0.1.bb

diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxres_X11R7.0-1.0.0.bb
rename to packages/xorg-lib/libxres_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxres_X11R7.1-1.0.1.bb
rename to packages/xorg-lib/libxres_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
similarity index 100%
rename from packages/xlibs/libxres_cvs.bb
rename to packages/xorg-lib/libxres_cvs.bb

diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxss_1.0.1.bb
rename to packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb
similarity index 100%
rename from packages/xlibs/libxss_cvs.bb
rename to packages/xorg-lib/libxss_cvs.bb

diff --git a/packages/xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-lib/libxt/.mtn2git_empty
similarity index 100%
rename from packages/xserver/xserver-kdrive/.mtn2git_empty
rename to packages/xorg-lib/libxt/.mtn2git_empty

diff --git a/packages/xlibs/libxt/autofoo.patch b/packages/xorg-lib/libxt/autofoo.patch
similarity index 100%
rename from packages/xlibs/libxt/autofoo.patch
rename to packages/xorg-lib/libxt/autofoo.patch

diff --git a/packages/xlibs/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb
similarity index 100%
rename from packages/xlibs/libxt_0.1.5.bb
rename to packages/xorg-lib/libxt_0.1.5.bb

diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxt_1.0.0.bb
rename to packages/xorg-lib/libxt_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
similarity index 100%
rename from packages/xlibs/libxt_1.0.2.bb
rename to packages/xorg-lib/libxt_X11R7.1-1.0.2.bb

diff --git a/packages/xlibs/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb
similarity index 100%
rename from packages/xlibs/libxt_cvs.bb
rename to packages/xorg-lib/libxt_cvs.bb

diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxtst_1.0.1.bb
rename to packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb
similarity index 100%
rename from packages/xlibs/libxtst_cvs.bb
rename to packages/xorg-lib/libxtst_cvs.bb

diff --git a/packages/xlibs/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
similarity index 100%
rename from packages/xlibs/libxv_2.2.2+cvs20040918.bb
rename to packages/xorg-lib/libxv_2.2.2+cvs20040918.bb

diff --git a/packages/xlibs/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb
similarity index 100%
rename from packages/xlibs/libxv_2.2.2.bb
rename to packages/xorg-lib/libxv_2.2.2.bb

diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxv_X11R7.0-1.0.1.bb
rename to packages/xorg-lib/libxv_X11R7.0-1.0.1.bb

diff --git a/packages/xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-lib/libxvmc/.mtn2git_empty
similarity index 100%
rename from packages/xserver/xserver-xorg/.mtn2git_empty
rename to packages/xorg-lib/libxvmc/.mtn2git_empty

diff --git a/packages/xlibs/libxvmc/drm.patch b/packages/xorg-lib/libxvmc/drm.patch
similarity index 100%
rename from packages/xlibs/libxvmc/drm.patch
rename to packages/xorg-lib/libxvmc/drm.patch

diff --git a/packages/xlibs/libxvmc/true.patch b/packages/xorg-lib/libxvmc/true.patch
similarity index 100%
rename from packages/xlibs/libxvmc/true.patch
rename to packages/xorg-lib/libxvmc/true.patch

diff --git a/packages/xlibs/libxvmc/via.patch b/packages/xorg-lib/libxvmc/via.patch
similarity index 100%
rename from packages/xlibs/libxvmc/via.patch
rename to packages/xorg-lib/libxvmc/via.patch

diff --git a/packages/xlibs/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb
similarity index 100%
rename from packages/xlibs/libxvmc_20040919.bb
rename to packages/xorg-lib/libxvmc_20040919.bb

diff --git a/packages/xlibs/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb
similarity index 100%
rename from packages/xlibs/libxvmc_20041025.bb
rename to packages/xorg-lib/libxvmc_20041025.bb

diff --git a/packages/xlibs/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb
similarity index 100%
rename from packages/xlibs/libxvmc_20050612.bb
rename to packages/xorg-lib/libxvmc_20050612.bb

diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxxf86dga_1.0.0.bb
rename to packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxxf86dga_1.0.1.bb
rename to packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb
similarity index 100%
rename from packages/xlibs/libxxf86dga_cvs.bb
rename to packages/xorg-lib/libxxf86dga_cvs.bb

diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxxf86misc_1.0.0.bb
rename to packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxxf86misc_1.0.1.bb
rename to packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/libxxf86vm_1.0.0.bb
rename to packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
similarity index 100%
rename from packages/xlibs/libxxf86vm_1.0.1.bb
rename to packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb

diff --git a/packages/xlibs/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb
similarity index 100%
rename from packages/xlibs/libxxf86vm_cvs.bb
rename to packages/xorg-lib/libxxf86vm_cvs.bb

diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xorg-lib/xorg-lib-common.inc
similarity index 100%
rename from packages/xlibs/xorg-xlibs.inc
rename to packages/xorg-lib/xorg-lib-common.inc

diff --git a/packages/xlibs/xtrans-native_0.1.bb b/packages/xorg-lib/xtrans-native_0.1.bb
similarity index 100%
rename from packages/xlibs/xtrans-native_0.1.bb
rename to packages/xorg-lib/xtrans-native_0.1.bb

diff --git a/packages/xlibs/xtrans_0.1.bb b/packages/xorg-lib/xtrans_0.1.bb
similarity index 100%
rename from packages/xlibs/xtrans_0.1.bb
rename to packages/xorg-lib/xtrans_0.1.bb

diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
similarity index 100%
rename from packages/xlibs/xtrans_1.0.0.bb
rename to packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb

diff --git a/packages/xlibs/xtrans_cvs.bb b/packages/xorg-lib/xtrans_cvs.bb
similarity index 100%
rename from packages/xlibs/xtrans_cvs.bb
rename to packages/xorg-lib/xtrans_cvs.bb

diff --git a/packages/xset/xset/.mtn2git_empty b/packages/xorg-proto/.mtn2git_empty
similarity index 100%
rename from packages/xset/xset/.mtn2git_empty
rename to packages/xorg-proto/.mtn2git_empty

diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
similarity index 100%
rename from packages/xproto/applewmproto_1.0.3.bb
rename to packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb

diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/bigreqsproto_1.0.2.bb
rename to packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb

diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
similarity index 100%
rename from packages/xproto/compositeproto_0.2.2.bb
rename to packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb

diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
similarity index 100%
rename from packages/xproto/compositeproto_0.3.1.bb
rename to packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb

diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
similarity index 100%
rename from packages/xproto/damageproto_1.0.3.bb
rename to packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb

diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
similarity index 100%
rename from packages/xproto/dmxproto_2.2.2.bb
rename to packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb

diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/evieext_1.0.2.bb
rename to packages/xorg-proto/evieext_X11R7.0-1.0.2.bb

diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
similarity index 100%
rename from packages/xproto/fixesproto_3.0.2.bb
rename to packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb

diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
similarity index 100%
rename from packages/xproto/fixesproto_4.0.bb
rename to packages/xorg-proto/fixesproto_X11R7.1-4.0.bb

diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
similarity index 100%
rename from packages/xproto/fontcacheproto_0.1.2.bb
rename to packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb

diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
similarity index 100%
rename from packages/xproto/fontsproto_2.0.2.bb
rename to packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb

diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
similarity index 100%
rename from packages/xproto/glproto_1.4.3.bb
rename to packages/xorg-proto/glproto_X11R7.0-1.4.3.bb

diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
similarity index 100%
rename from packages/xproto/glproto_1.4.7.bb
rename to packages/xorg-proto/glproto_X11R7.1-1.4.7.bb

diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
similarity index 100%
rename from packages/xproto/inputproto_1.3.2.bb
rename to packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb

diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/kbproto_1.0.2.bb
rename to packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb

diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
similarity index 100%
rename from packages/xproto/printproto_1.0.3.bb
rename to packages/xorg-proto/printproto_X11R7.0-1.0.3.bb

diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
similarity index 100%
rename from packages/xproto/randrproto_1.1.2.bb
rename to packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb

diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
similarity index 100%
rename from packages/xproto/recordproto_1.13.2.bb
rename to packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb

diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
similarity index 100%
rename from packages/xproto/renderproto_0.9.2.bb
rename to packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb

diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/resourceproto_1.0.2.bb
rename to packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb

diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/scrnsaverproto_1.0.2.bb
rename to packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb

diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
similarity index 100%
rename from packages/xproto/scrnsaverproto_1.1.0.bb
rename to packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb

diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
similarity index 100%
rename from packages/xproto/trapproto_3.4.3.bb
rename to packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb

diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
similarity index 100%
rename from packages/xproto/videoproto_2.2.2.bb
rename to packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb

diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
similarity index 100%
rename from packages/xproto/windowswmproto_1.0.3.bb
rename to packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb

diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
similarity index 100%
rename from packages/xproto/xcmiscproto_1.1.2.bb
rename to packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb

diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
similarity index 100%
rename from packages/xproto/xextproto_7.0.2.bb
rename to packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb

diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
similarity index 100%
rename from packages/xproto/xf86bigfontproto_1.1.2.bb
rename to packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb

diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
similarity index 100%
rename from packages/xproto/xf86dgaproto_2.0.2.bb
rename to packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb

diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
similarity index 100%
rename from packages/xproto/xf86driproto_2.0.3.bb
rename to packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb

diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
similarity index 100%
rename from packages/xproto/xf86miscproto_0.9.2.bb
rename to packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb

diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
similarity index 100%
rename from packages/xproto/xf86rushproto_1.1.2.bb
rename to packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb

diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
similarity index 100%
rename from packages/xproto/xf86vidmodeproto_2.2.2.bb
rename to packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb

diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
similarity index 100%
rename from packages/xproto/xineramaproto_1.1.2.bb
rename to packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb

diff --git a/packages/xproto/proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
similarity index 100%
rename from packages/xproto/proto-common.inc
rename to packages/xorg-proto/xorg-proto-common.inc

diff --git a/packages/xproto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb
similarity index 100%
rename from packages/xproto/xproto-native_6.6.2.bb
rename to packages/xorg-proto/xproto-native_6.6.2.bb

diff --git a/packages/xproto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb
similarity index 100%
rename from packages/xproto/xproto-native_cvs.bb
rename to packages/xorg-proto/xproto-native_cvs.bb

diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
similarity index 100%
rename from packages/xproto/xproto_6.6.2+cvs20050226.bb
rename to packages/xorg-proto/xproto_6.6.2+cvs20050226.bb

diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb
similarity index 100%
rename from packages/xproto/xproto_6.6.2.bb
rename to packages/xorg-proto/xproto_6.6.2.bb

diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
similarity index 100%
rename from packages/xproto/xproto_7.0.4.bb
rename to packages/xorg-proto/xproto_X11R7.0-7.0.4.bb

diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
similarity index 100%
rename from packages/xproto/xproto_7.0.5.bb
rename to packages/xorg-proto/xproto_X11R7.1-7.0.5.bb

diff --git a/packages/xproto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb
similarity index 100%
rename from packages/xproto/xproto_cvs.bb
rename to packages/xorg-proto/xproto_cvs.bb

diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
similarity index 100%
rename from packages/xproto/xproxymanagementprotocol_1.0.2.bb
rename to packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb

diff --git a/packages/xorg-util/.mtn2git_empty b/packages/xorg-util/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
similarity index 100%
rename from packages/xlibs/util-macros_1.0.1.bb
rename to packages/xorg-util/util-macros_X11R7.0-1.0.1.bb

diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
similarity index 100%
rename from packages/xlibs/util-macros_1.0.2.bb
rename to packages/xorg-util/util-macros_X11R7.1-1.0.2.bb

diff --git a/packages/xorg-xserver/.mtn2git_empty b/packages/xorg-xserver/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xorg-xserver/files/calibrate_zaurusd.patch
similarity index 100%
rename from packages/xserver-common/files/calibrate_zaurusd.patch
rename to packages/xorg-xserver/files/calibrate_zaurusd.patch

diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
similarity index 100%
rename from packages/xserver-common/files/poodle-xmodmap-2.6.patch
rename to packages/xorg-xserver/files/poodle-xmodmap-2.6.patch

diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xorg-xserver/files/setDPI.sh
similarity index 100%
rename from packages/xserver-common/files/setDPI.sh
rename to packages/xorg-xserver/files/setDPI.sh

diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xorg-xserver/xserver-common_1.10.bb
similarity index 100%
rename from packages/xserver-common/xserver-common_1.10.bb
rename to packages/xorg-xserver/xserver-common_1.10.bb

diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xorg-xserver/xserver-common_1.3.bb
similarity index 100%
rename from packages/xserver-common/xserver-common_1.3.bb
rename to packages/xorg-xserver/xserver-common_1.3.bb

diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xorg-xserver/xserver-common_1.8.bb
similarity index 100%
rename from packages/xserver-common/xserver-common_1.8.bb
rename to packages/xorg-xserver/xserver-common_1.8.bb

diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xorg-xserver/xserver-common_1.9.bb
similarity index 100%
rename from packages/xserver-common/xserver-common_1.9.bb
rename to packages/xorg-xserver/xserver-common_1.9.bb

diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive-omap/configure-tslib.patch
rename to packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch

diff --git a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
rename to packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch

diff --git a/packages/xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive-omap/kmode.patch
rename to packages/xorg-xserver/xserver-kdrive-omap/kmode.patch

diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive-omap_6.6.3.bb
rename to packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb

diff --git a/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
similarity index 100%
rename from packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
rename to packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff

diff --git a/packages/xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/devfs.patch
rename to packages/xorg-xserver/xserver-kdrive/devfs.patch

diff --git a/packages/xserver/xserver-kdrive/disable-apm.patch b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/disable-apm.patch
rename to packages/xorg-xserver/xserver-kdrive/disable-apm.patch

diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
rename to packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch

diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
rename to packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch

diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/enable-tslib.patch
rename to packages/xorg-xserver/xserver-kdrive/enable-tslib.patch

diff --git a/packages/xserver/xserver-kdrive/epson.patch b/packages/xorg-xserver/xserver-kdrive/epson.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/epson.patch
rename to packages/xorg-xserver/xserver-kdrive/epson.patch

diff --git a/packages/xserver/xserver-kdrive/faster-rotated.patch b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/faster-rotated.patch
rename to packages/xorg-xserver/xserver-kdrive/faster-rotated.patch

diff --git a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/fbdev-not-fix.patch
rename to packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch

diff --git a/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/kdrive-evdev.patch
rename to packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch

diff --git a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/kdrive-use-evdev.patch
rename to packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch

diff --git a/packages/xserver/xserver-kdrive/kmode.patch b/packages/xorg-xserver/xserver-kdrive/kmode.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/kmode.patch
rename to packages/xorg-xserver/xserver-kdrive/kmode.patch

diff --git a/packages/xserver/xserver-kdrive/no-serial-probing.patch b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/no-serial-probing.patch
rename to packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch

diff --git a/packages/xserver/xserver-kdrive/onlyfb.patch b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/onlyfb.patch
rename to packages/xorg-xserver/xserver-kdrive/onlyfb.patch

diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/optional-xkb.patch
rename to packages/xorg-xserver/xserver-kdrive/optional-xkb.patch

diff --git a/packages/xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/xcalibrate.patch
rename to packages/xorg-xserver/xserver-kdrive/xcalibrate.patch

diff --git a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
similarity index 100%
rename from packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
rename to packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch

diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_20050207.bb
rename to packages/xorg-xserver/xserver-kdrive_20050207.bb

diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_20050624.bb
rename to packages/xorg-xserver/xserver-kdrive_20050624.bb

diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_20060312.bb
rename to packages/xorg-xserver/xserver-kdrive_20060312.bb

diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
rename to packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb

diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_cvs.bb
rename to packages/xorg-xserver/xserver-kdrive_cvs.bb

diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
similarity index 100%
rename from packages/xserver/xserver-kdrive_git.bb
rename to packages/xorg-xserver/xserver-kdrive_git.bb

diff --git a/packages/xorg-xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-xorg/dri.patch b/packages/xorg-xserver/xserver-xorg/dri.patch
similarity index 100%
rename from packages/xserver/xserver-xorg/dri.patch
rename to packages/xorg-xserver/xserver-xorg/dri.patch

diff --git a/packages/xserver/xserver-xorg/fontfile.patch b/packages/xorg-xserver/xserver-xorg/fontfile.patch
similarity index 100%
rename from packages/xserver/xserver-xorg/fontfile.patch
rename to packages/xorg-xserver/xserver-xorg/fontfile.patch

diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xorg-xserver/xserver-xorg/freetype.patch
similarity index 100%
rename from packages/xserver/xserver-xorg/freetype.patch
rename to packages/xorg-xserver/xserver-xorg/freetype.patch

diff --git a/packages/xserver/xserver-xorg/imake-installed.patch b/packages/xorg-xserver/xserver-xorg/imake-installed.patch
similarity index 100%
rename from packages/xserver/xserver-xorg/imake-installed.patch
rename to packages/xorg-xserver/xserver-xorg/imake-installed.patch

diff --git a/packages/xserver/xserver-xorg/imake-staging.patch b/packages/xorg-xserver/xserver-xorg/imake-staging.patch
similarity index 100%
rename from packages/xserver/xserver-xorg/imake-staging.patch
rename to packages/xorg-xserver/xserver-xorg/imake-staging.patch

diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
similarity index 100%
rename from packages/xserver/xserver-xorg_6.8.99.10.bb
rename to packages/xorg-xserver/xserver-xorg_6.8.99.10.bb

diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
similarity index 100%
rename from packages/xserver/xserver-xorg_6.8.99.11.bb
rename to packages/xorg-xserver/xserver-xorg_6.8.99.11.bb

diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
similarity index 100%
rename from packages/xserver/xserver-xorg_cvs.bb
rename to packages/xorg-xserver/xserver-xorg_cvs.bb