diff --git a/package/xorg/xkeyboard-config/xkeyboard-config.cache b/package/freedesktop/xkeyboard-config/xkeyboard-config.cache
similarity index 100%
rename from package/xorg/xkeyboard-config/xkeyboard-config.cache
rename to package/freedesktop/xkeyboard-config/xkeyboard-config.cache
diff --git a/package/xorg/xkeyboard-config/xkeyboard-config.conf b/package/freedesktop/xkeyboard-config/xkeyboard-config.conf
similarity index 100%
rename from package/xorg/xkeyboard-config/xkeyboard-config.conf
rename to package/freedesktop/xkeyboard-config/xkeyboard-config.conf
diff --git a/package/xorg/xkeyboard-config/xkeyboard-config.desc b/package/freedesktop/xkeyboard-config/xkeyboard-config.desc
similarity index 100%
rename from package/xorg/xkeyboard-config/xkeyboard-config.desc
rename to package/freedesktop/xkeyboard-config/xkeyboard-config.desc
diff --git a/package/xorg/mesalib/mesalib.cache b/package/x11/mesalib/mesalib.cache
similarity index 100%
rename from package/xorg/mesalib/mesalib.cache
rename to package/x11/mesalib/mesalib.cache
diff --git a/package/xorg/mesalib/mesalib.conf b/package/x11/mesalib/mesalib.conf
similarity index 100%
rename from package/xorg/mesalib/mesalib.conf
rename to package/x11/mesalib/mesalib.conf
diff --git a/package/xorg/mesalib/mesalib.desc b/package/x11/mesalib/mesalib.desc
similarity index 100%
rename from package/xorg/mesalib/mesalib.desc
rename to package/x11/mesalib/mesalib.desc
diff --git a/package/xorg/mesalib/missing-glw.pc.in.patch b/package/x11/mesalib/missing-glw.pc.in.patch
similarity index 100%
rename from package/xorg/mesalib/missing-glw.pc.in.patch
rename to package/x11/mesalib/missing-glw.pc.in.patch
diff --git a/package/xorg/mesalib/no_broken_demos.diff b/package/x11/mesalib/no_broken_demos.diff
similarity index 100%
rename from package/xorg/mesalib/no_broken_demos.diff
rename to package/x11/mesalib/no_broken_demos.diff
diff --git a/package/xorg/mesalib/pkgmapper.in b/package/x11/mesalib/pkgmapper.in
similarity index 100%
rename from package/xorg/mesalib/pkgmapper.in
rename to package/x11/mesalib/pkgmapper.in
diff --git a/package/xorg/mesalib/preconfig.in b/package/x11/mesalib/preconfig.in
similarity index 100%
rename from package/xorg/mesalib/preconfig.in
rename to package/x11/mesalib/preconfig.in