diff --git a/local/recipes/wayland/xwayland/recipe.toml b/local/recipes/wayland/xwayland/recipe.toml
index 2514a8b074..b61918c1b1 100644
--- a/local/recipes/wayland/xwayland/recipe.toml
+++ b/local/recipes/wayland/xwayland/recipe.toml
@@ -3,10 +3,14 @@ name = "xwayland"
 version = "24.1.8"
 
 [source]
-tar = "https://www.x.org/releases/individual/xserver/xwayland-24.1.8.tar.xz"
-patches = [
-    "redox.patch"
-]
+# Vendored full-fork model: builds from the committed source/ tree (pristine
+# xwayland 24.1.8 with the Redox port baked in). The old redox.patch was
+# obsolete — it was written for an older xwayland, whereas 24.1.8 already
+# carries the BTN_LEFT/MIDDLE/RIGHT mapping and the modern meson get_variable()
+# API, and relibc now provides uname()/utsname (so the os/access.c guard is
+# unnecessary). Redox-specific changes are committed directly in source/.
+#   upstream: https://www.x.org/releases/individual/xserver/xwayland-24.1.8.tar.xz
+path = "source"
 [build]
 template = "meson"
 dependencies = [
diff --git a/local/recipes/wayland/xwayland/redox.patch b/local/recipes/wayland/xwayland/redox.patch
deleted file mode 100644
index 7ef6316255..0000000000
--- a/local/recipes/wayland/xwayland/redox.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -ruwN source/hw/xwayland/meson.build source-new/hw/xwayland/meson.build
---- a/source/hw/xwayland/meson.build
-+++ b/source-new/hw/xwayland/meson.build
-@@ -30,8 +30,7 @@
-     '../../mi/miinitext.h',
- ]
- 
--scanner_dep = dependency('wayland-scanner', native: true)
--scanner = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
-+scanner =  find_program('wayland-scanner', native: true)
- 
- protocols_dep = dependency('wayland-protocols', version: wayland_protocols_req)
- protodir = protocols_dep.get_pkgconfig_variable('pkgdatadir')
-@@ -55,11 +54,7 @@
-     arguments : ['client-header', '@INPUT@', '@OUTPUT@']
- )
- 
--if scanner_dep.version().version_compare('>= 1.14.91')
-     scanner_argument = 'private-code'
--else
--    scanner_argument = 'code'
--endif
- 
- code = generator(scanner,
-     output : '@BASENAME@-protocol.c',
-diff -ruwN source/hw/xwayland/xwayland-input.c source-new/hw/xwayland/xwayland-input.c
---- a/source/hw/xwayland/xwayland-input.c
-+++ b/source-new/hw/xwayland/xwayland-input.c
-@@ -26,7 +26,7 @@
- 
- #include <xwayland-config.h>
- 
--#include <linux/input.h>
-+#include <linux/input.h>
- #include <sys/mman.h>
- 
- #include <inputstr.h>
-@@ -758,9 +758,16 @@
-     xwl_seat->xwl_screen->serial = serial;
- 
-     switch (button) {
-+    case BTN_LEFT:
-+        index = 1;
-+        break;
-+    case BTN_MIDDLE:
-+        index = 2;
-+        break;
-+    case BTN_RIGHT:
-+        index = 3;
-+        break;
-     default:
--        /* Skip indexes 4-7: they are used for vertical and horizontal scroll.
--           The rest of the buttons go in order: BTN_SIDE becomes 8, etc. */
-         index = 8 + button - 0x113 /* BTN_SIDE */;
-         break;
-     }
-@@ -1057,7 +1057,7 @@
- 
-     state_rec = xwl_seat->keyboard->key->xkbInfo->state;
-     xkb_state = (XkbStateFieldFromRec(&state_rec) & 0xff);
--
-+/*
-     if (((key == KEY_LEFTSHIFT || key == KEY_RIGHTSHIFT) && (xkb_state & ControlMask)) ||
-         ((key == KEY_LEFTCTRL || key == KEY_RIGHTCTRL) && (xkb_state & ShiftMask))) {
- 
-@@ -1072,6 +1072,7 @@
-         if (xwl_window)
-             xwl_window_rootful_update_title(xwl_window);
-     }
-+*/
- }
- 
- static void
-diff -ruwN source/os/access.c source-new/os/access.c
---- a/source/os/access.c
-+++ b/source-new/os/access.c
-@@ -446,7 +446,7 @@
-     int family;
-     register HOST *host;
- 
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__redox__)
-     struct utsname name;
- #else
-     struct {
-@@ -477,7 +477,7 @@
-      * uname() lets me access to the whole string (it smashes release, you
-      * see), whereas gethostname() kindly truncates it for me.
-      */
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__redox__)
-     uname(&name);
- #else
-     gethostname(name.nodename, sizeof(name.nodename));
diff --git a/local/recipes/wayland/xwayland/source.tar b/local/recipes/wayland/xwayland/source.tar
deleted file mode 100644
index 0fba986a37..0000000000
Binary files a/local/recipes/wayland/xwayland/source.tar and /dev/null differ
diff --git a/local/recipes/wayland/xwayland/source.tmp/.appveyor.yml b/local/recipes/wayland/xwayland/source/.appveyor.yml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.appveyor.yml
rename to local/recipes/wayland/xwayland/source/.appveyor.yml
diff --git a/local/recipes/wayland/xwayland/source.tmp/.dir-locals.el b/local/recipes/wayland/xwayland/source/.dir-locals.el
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.dir-locals.el
rename to local/recipes/wayland/xwayland/source/.dir-locals.el
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitignore b/local/recipes/wayland/xwayland/source/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitignore
rename to local/recipes/wayland/xwayland/source/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitlab-ci.yml b/local/recipes/wayland/xwayland/source/.gitlab-ci.yml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitlab-ci.yml
rename to local/recipes/wayland/xwayland/source/.gitlab-ci.yml
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/check-piglit-results.sh b/local/recipes/wayland/xwayland/source/.gitlab-ci/check-piglit-results.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/check-piglit-results.sh
rename to local/recipes/wayland/xwayland/source/.gitlab-ci/check-piglit-results.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/debian-install.sh b/local/recipes/wayland/xwayland/source/.gitlab-ci/debian-install.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/debian-install.sh
rename to local/recipes/wayland/xwayland/source/.gitlab-ci/debian-install.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/manpages-check b/local/recipes/wayland/xwayland/source/.gitlab-ci/manpages-check
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/manpages-check
rename to local/recipes/wayland/xwayland/source/.gitlab-ci/manpages-check
diff --git a/local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/meson-build.sh b/local/recipes/wayland/xwayland/source/.gitlab-ci/meson-build.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.gitlab-ci/meson-build.sh
rename to local/recipes/wayland/xwayland/source/.gitlab-ci/meson-build.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/.mailmap b/local/recipes/wayland/xwayland/source/.mailmap
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/.mailmap
rename to local/recipes/wayland/xwayland/source/.mailmap
diff --git a/local/recipes/wayland/xwayland/source.tmp/COPYING b/local/recipes/wayland/xwayland/source/COPYING
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/COPYING
rename to local/recipes/wayland/xwayland/source/COPYING
diff --git a/local/recipes/wayland/xwayland/source.tmp/README.md b/local/recipes/wayland/xwayland/source/README.md
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/README.md
rename to local/recipes/wayland/xwayland/source/README.md
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/bigreq.c b/local/recipes/wayland/xwayland/source/Xext/bigreq.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/bigreq.c
rename to local/recipes/wayland/xwayland/source/Xext/bigreq.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/dpms.c b/local/recipes/wayland/xwayland/source/Xext/dpms.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/dpms.c
rename to local/recipes/wayland/xwayland/source/Xext/dpms.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/dpmsproc.h b/local/recipes/wayland/xwayland/source/Xext/dpmsproc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/dpmsproc.h
rename to local/recipes/wayland/xwayland/source/Xext/dpmsproc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/geext.c b/local/recipes/wayland/xwayland/source/Xext/geext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/geext.c
rename to local/recipes/wayland/xwayland/source/Xext/geext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/geext.h b/local/recipes/wayland/xwayland/source/Xext/geext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/geext.h
rename to local/recipes/wayland/xwayland/source/Xext/geext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/geint.h b/local/recipes/wayland/xwayland/source/Xext/geint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/geint.h
rename to local/recipes/wayland/xwayland/source/Xext/geint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/hashtable.c b/local/recipes/wayland/xwayland/source/Xext/hashtable.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/hashtable.c
rename to local/recipes/wayland/xwayland/source/Xext/hashtable.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/hashtable.h b/local/recipes/wayland/xwayland/source/Xext/hashtable.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/hashtable.h
rename to local/recipes/wayland/xwayland/source/Xext/hashtable.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/meson.build b/local/recipes/wayland/xwayland/source/Xext/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/meson.build
rename to local/recipes/wayland/xwayland/source/Xext/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiX.c b/local/recipes/wayland/xwayland/source/Xext/panoramiX.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiX.c
rename to local/recipes/wayland/xwayland/source/Xext/panoramiX.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiX.h b/local/recipes/wayland/xwayland/source/Xext/panoramiX.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiX.h
rename to local/recipes/wayland/xwayland/source/Xext/panoramiX.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXSwap.c b/local/recipes/wayland/xwayland/source/Xext/panoramiXSwap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXSwap.c
rename to local/recipes/wayland/xwayland/source/Xext/panoramiXSwap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXh.h b/local/recipes/wayland/xwayland/source/Xext/panoramiXh.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXh.h
rename to local/recipes/wayland/xwayland/source/Xext/panoramiXh.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXprocs.c b/local/recipes/wayland/xwayland/source/Xext/panoramiXprocs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXprocs.c
rename to local/recipes/wayland/xwayland/source/Xext/panoramiXprocs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXsrv.h b/local/recipes/wayland/xwayland/source/Xext/panoramiXsrv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/panoramiXsrv.h
rename to local/recipes/wayland/xwayland/source/Xext/panoramiXsrv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/saver.c b/local/recipes/wayland/xwayland/source/Xext/saver.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/saver.c
rename to local/recipes/wayland/xwayland/source/Xext/saver.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/security.c b/local/recipes/wayland/xwayland/source/Xext/security.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/security.c
rename to local/recipes/wayland/xwayland/source/Xext/security.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/securitysrv.h b/local/recipes/wayland/xwayland/source/Xext/securitysrv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/securitysrv.h
rename to local/recipes/wayland/xwayland/source/Xext/securitysrv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/shape.c b/local/recipes/wayland/xwayland/source/Xext/shape.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/shape.c
rename to local/recipes/wayland/xwayland/source/Xext/shape.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/shm.c b/local/recipes/wayland/xwayland/source/Xext/shm.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/shm.c
rename to local/recipes/wayland/xwayland/source/Xext/shm.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/shmint.h b/local/recipes/wayland/xwayland/source/Xext/shmint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/shmint.h
rename to local/recipes/wayland/xwayland/source/Xext/shmint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/sleepuntil.c b/local/recipes/wayland/xwayland/source/Xext/sleepuntil.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/sleepuntil.c
rename to local/recipes/wayland/xwayland/source/Xext/sleepuntil.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/sleepuntil.h b/local/recipes/wayland/xwayland/source/Xext/sleepuntil.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/sleepuntil.h
rename to local/recipes/wayland/xwayland/source/Xext/sleepuntil.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/sync.c b/local/recipes/wayland/xwayland/source/Xext/sync.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/sync.c
rename to local/recipes/wayland/xwayland/source/Xext/sync.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/syncsdk.h b/local/recipes/wayland/xwayland/source/Xext/syncsdk.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/syncsdk.h
rename to local/recipes/wayland/xwayland/source/Xext/syncsdk.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/syncsrv.h b/local/recipes/wayland/xwayland/source/Xext/syncsrv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/syncsrv.h
rename to local/recipes/wayland/xwayland/source/Xext/syncsrv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/vidmode.c b/local/recipes/wayland/xwayland/source/Xext/vidmode.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/vidmode.c
rename to local/recipes/wayland/xwayland/source/Xext/vidmode.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xace.c b/local/recipes/wayland/xwayland/source/Xext/xace.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xace.c
rename to local/recipes/wayland/xwayland/source/Xext/xace.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xace.h b/local/recipes/wayland/xwayland/source/Xext/xace.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xace.h
rename to local/recipes/wayland/xwayland/source/Xext/xace.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xacestr.h b/local/recipes/wayland/xwayland/source/Xext/xacestr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xacestr.h
rename to local/recipes/wayland/xwayland/source/Xext/xacestr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xcmisc.c b/local/recipes/wayland/xwayland/source/Xext/xcmisc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xcmisc.c
rename to local/recipes/wayland/xwayland/source/Xext/xcmisc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xf86bigfont.c b/local/recipes/wayland/xwayland/source/Xext/xf86bigfont.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xf86bigfont.c
rename to local/recipes/wayland/xwayland/source/Xext/xf86bigfont.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xf86bigfontsrv.h b/local/recipes/wayland/xwayland/source/Xext/xf86bigfontsrv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xf86bigfontsrv.h
rename to local/recipes/wayland/xwayland/source/Xext/xf86bigfontsrv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xres.c b/local/recipes/wayland/xwayland/source/Xext/xres.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xres.c
rename to local/recipes/wayland/xwayland/source/Xext/xres.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xselinux.h b/local/recipes/wayland/xwayland/source/Xext/xselinux.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xselinux.h
rename to local/recipes/wayland/xwayland/source/Xext/xselinux.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_ext.c b/local/recipes/wayland/xwayland/source/Xext/xselinux_ext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_ext.c
rename to local/recipes/wayland/xwayland/source/Xext/xselinux_ext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_hooks.c b/local/recipes/wayland/xwayland/source/Xext/xselinux_hooks.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_hooks.c
rename to local/recipes/wayland/xwayland/source/Xext/xselinux_hooks.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_label.c b/local/recipes/wayland/xwayland/source/Xext/xselinux_label.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xselinux_label.c
rename to local/recipes/wayland/xwayland/source/Xext/xselinux_label.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xselinuxint.h b/local/recipes/wayland/xwayland/source/Xext/xselinuxint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xselinuxint.h
rename to local/recipes/wayland/xwayland/source/Xext/xselinuxint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xtest.c b/local/recipes/wayland/xwayland/source/Xext/xtest.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xtest.c
rename to local/recipes/wayland/xwayland/source/Xext/xtest.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvdisp.c b/local/recipes/wayland/xwayland/source/Xext/xvdisp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvdisp.c
rename to local/recipes/wayland/xwayland/source/Xext/xvdisp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvdisp.h b/local/recipes/wayland/xwayland/source/Xext/xvdisp.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvdisp.h
rename to local/recipes/wayland/xwayland/source/Xext/xvdisp.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvdix.h b/local/recipes/wayland/xwayland/source/Xext/xvdix.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvdix.h
rename to local/recipes/wayland/xwayland/source/Xext/xvdix.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvmain.c b/local/recipes/wayland/xwayland/source/Xext/xvmain.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvmain.c
rename to local/recipes/wayland/xwayland/source/Xext/xvmain.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvmc.c b/local/recipes/wayland/xwayland/source/Xext/xvmc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvmc.c
rename to local/recipes/wayland/xwayland/source/Xext/xvmc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xext/xvmcext.h b/local/recipes/wayland/xwayland/source/Xext/xvmcext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xext/xvmcext.h
rename to local/recipes/wayland/xwayland/source/Xext/xvmcext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/allowev.c b/local/recipes/wayland/xwayland/source/Xi/allowev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/allowev.c
rename to local/recipes/wayland/xwayland/source/Xi/allowev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/allowev.h b/local/recipes/wayland/xwayland/source/Xi/allowev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/allowev.h
rename to local/recipes/wayland/xwayland/source/Xi/allowev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgdctl.c b/local/recipes/wayland/xwayland/source/Xi/chgdctl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgdctl.c
rename to local/recipes/wayland/xwayland/source/Xi/chgdctl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgdctl.h b/local/recipes/wayland/xwayland/source/Xi/chgdctl.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgdctl.h
rename to local/recipes/wayland/xwayland/source/Xi/chgdctl.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgfctl.c b/local/recipes/wayland/xwayland/source/Xi/chgfctl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgfctl.c
rename to local/recipes/wayland/xwayland/source/Xi/chgfctl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgfctl.h b/local/recipes/wayland/xwayland/source/Xi/chgfctl.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgfctl.h
rename to local/recipes/wayland/xwayland/source/Xi/chgfctl.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgkbd.c b/local/recipes/wayland/xwayland/source/Xi/chgkbd.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgkbd.c
rename to local/recipes/wayland/xwayland/source/Xi/chgkbd.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgkbd.h b/local/recipes/wayland/xwayland/source/Xi/chgkbd.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgkbd.h
rename to local/recipes/wayland/xwayland/source/Xi/chgkbd.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgkmap.c b/local/recipes/wayland/xwayland/source/Xi/chgkmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgkmap.c
rename to local/recipes/wayland/xwayland/source/Xi/chgkmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgkmap.h b/local/recipes/wayland/xwayland/source/Xi/chgkmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgkmap.h
rename to local/recipes/wayland/xwayland/source/Xi/chgkmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgprop.c b/local/recipes/wayland/xwayland/source/Xi/chgprop.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgprop.c
rename to local/recipes/wayland/xwayland/source/Xi/chgprop.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgprop.h b/local/recipes/wayland/xwayland/source/Xi/chgprop.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgprop.h
rename to local/recipes/wayland/xwayland/source/Xi/chgprop.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgptr.c b/local/recipes/wayland/xwayland/source/Xi/chgptr.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgptr.c
rename to local/recipes/wayland/xwayland/source/Xi/chgptr.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/chgptr.h b/local/recipes/wayland/xwayland/source/Xi/chgptr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/chgptr.h
rename to local/recipes/wayland/xwayland/source/Xi/chgptr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/closedev.c b/local/recipes/wayland/xwayland/source/Xi/closedev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/closedev.c
rename to local/recipes/wayland/xwayland/source/Xi/closedev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/closedev.h b/local/recipes/wayland/xwayland/source/Xi/closedev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/closedev.h
rename to local/recipes/wayland/xwayland/source/Xi/closedev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/devbell.c b/local/recipes/wayland/xwayland/source/Xi/devbell.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/devbell.c
rename to local/recipes/wayland/xwayland/source/Xi/devbell.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/devbell.h b/local/recipes/wayland/xwayland/source/Xi/devbell.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/devbell.h
rename to local/recipes/wayland/xwayland/source/Xi/devbell.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/exevents.c b/local/recipes/wayland/xwayland/source/Xi/exevents.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/exevents.c
rename to local/recipes/wayland/xwayland/source/Xi/exevents.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/exglobals.h b/local/recipes/wayland/xwayland/source/Xi/exglobals.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/exglobals.h
rename to local/recipes/wayland/xwayland/source/Xi/exglobals.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/extinit.c b/local/recipes/wayland/xwayland/source/Xi/extinit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/extinit.c
rename to local/recipes/wayland/xwayland/source/Xi/extinit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getbmap.c b/local/recipes/wayland/xwayland/source/Xi/getbmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getbmap.c
rename to local/recipes/wayland/xwayland/source/Xi/getbmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getbmap.h b/local/recipes/wayland/xwayland/source/Xi/getbmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getbmap.h
rename to local/recipes/wayland/xwayland/source/Xi/getbmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getdctl.c b/local/recipes/wayland/xwayland/source/Xi/getdctl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getdctl.c
rename to local/recipes/wayland/xwayland/source/Xi/getdctl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getdctl.h b/local/recipes/wayland/xwayland/source/Xi/getdctl.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getdctl.h
rename to local/recipes/wayland/xwayland/source/Xi/getdctl.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getfctl.c b/local/recipes/wayland/xwayland/source/Xi/getfctl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getfctl.c
rename to local/recipes/wayland/xwayland/source/Xi/getfctl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getfctl.h b/local/recipes/wayland/xwayland/source/Xi/getfctl.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getfctl.h
rename to local/recipes/wayland/xwayland/source/Xi/getfctl.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getfocus.c b/local/recipes/wayland/xwayland/source/Xi/getfocus.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getfocus.c
rename to local/recipes/wayland/xwayland/source/Xi/getfocus.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getfocus.h b/local/recipes/wayland/xwayland/source/Xi/getfocus.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getfocus.h
rename to local/recipes/wayland/xwayland/source/Xi/getfocus.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getkmap.c b/local/recipes/wayland/xwayland/source/Xi/getkmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getkmap.c
rename to local/recipes/wayland/xwayland/source/Xi/getkmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getkmap.h b/local/recipes/wayland/xwayland/source/Xi/getkmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getkmap.h
rename to local/recipes/wayland/xwayland/source/Xi/getkmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getmmap.c b/local/recipes/wayland/xwayland/source/Xi/getmmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getmmap.c
rename to local/recipes/wayland/xwayland/source/Xi/getmmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getmmap.h b/local/recipes/wayland/xwayland/source/Xi/getmmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getmmap.h
rename to local/recipes/wayland/xwayland/source/Xi/getmmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getprop.c b/local/recipes/wayland/xwayland/source/Xi/getprop.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getprop.c
rename to local/recipes/wayland/xwayland/source/Xi/getprop.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getprop.h b/local/recipes/wayland/xwayland/source/Xi/getprop.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getprop.h
rename to local/recipes/wayland/xwayland/source/Xi/getprop.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getselev.c b/local/recipes/wayland/xwayland/source/Xi/getselev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getselev.c
rename to local/recipes/wayland/xwayland/source/Xi/getselev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getselev.h b/local/recipes/wayland/xwayland/source/Xi/getselev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getselev.h
rename to local/recipes/wayland/xwayland/source/Xi/getselev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getvers.c b/local/recipes/wayland/xwayland/source/Xi/getvers.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getvers.c
rename to local/recipes/wayland/xwayland/source/Xi/getvers.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/getvers.h b/local/recipes/wayland/xwayland/source/Xi/getvers.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/getvers.h
rename to local/recipes/wayland/xwayland/source/Xi/getvers.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdev.c b/local/recipes/wayland/xwayland/source/Xi/grabdev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdev.c
rename to local/recipes/wayland/xwayland/source/Xi/grabdev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdev.h b/local/recipes/wayland/xwayland/source/Xi/grabdev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdev.h
rename to local/recipes/wayland/xwayland/source/Xi/grabdev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdevb.c b/local/recipes/wayland/xwayland/source/Xi/grabdevb.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdevb.c
rename to local/recipes/wayland/xwayland/source/Xi/grabdevb.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdevb.h b/local/recipes/wayland/xwayland/source/Xi/grabdevb.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdevb.h
rename to local/recipes/wayland/xwayland/source/Xi/grabdevb.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdevk.c b/local/recipes/wayland/xwayland/source/Xi/grabdevk.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdevk.c
rename to local/recipes/wayland/xwayland/source/Xi/grabdevk.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/grabdevk.h b/local/recipes/wayland/xwayland/source/Xi/grabdevk.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/grabdevk.h
rename to local/recipes/wayland/xwayland/source/Xi/grabdevk.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/gtmotion.c b/local/recipes/wayland/xwayland/source/Xi/gtmotion.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/gtmotion.c
rename to local/recipes/wayland/xwayland/source/Xi/gtmotion.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/gtmotion.h b/local/recipes/wayland/xwayland/source/Xi/gtmotion.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/gtmotion.h
rename to local/recipes/wayland/xwayland/source/Xi/gtmotion.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/listdev.c b/local/recipes/wayland/xwayland/source/Xi/listdev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/listdev.c
rename to local/recipes/wayland/xwayland/source/Xi/listdev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/listdev.h b/local/recipes/wayland/xwayland/source/Xi/listdev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/listdev.h
rename to local/recipes/wayland/xwayland/source/Xi/listdev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/meson.build b/local/recipes/wayland/xwayland/source/Xi/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/meson.build
rename to local/recipes/wayland/xwayland/source/Xi/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/opendev.c b/local/recipes/wayland/xwayland/source/Xi/opendev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/opendev.c
rename to local/recipes/wayland/xwayland/source/Xi/opendev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/opendev.h b/local/recipes/wayland/xwayland/source/Xi/opendev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/opendev.h
rename to local/recipes/wayland/xwayland/source/Xi/opendev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/queryst.c b/local/recipes/wayland/xwayland/source/Xi/queryst.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/queryst.c
rename to local/recipes/wayland/xwayland/source/Xi/queryst.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/queryst.h b/local/recipes/wayland/xwayland/source/Xi/queryst.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/queryst.h
rename to local/recipes/wayland/xwayland/source/Xi/queryst.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/selectev.c b/local/recipes/wayland/xwayland/source/Xi/selectev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/selectev.c
rename to local/recipes/wayland/xwayland/source/Xi/selectev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/selectev.h b/local/recipes/wayland/xwayland/source/Xi/selectev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/selectev.h
rename to local/recipes/wayland/xwayland/source/Xi/selectev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/sendexev.c b/local/recipes/wayland/xwayland/source/Xi/sendexev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/sendexev.c
rename to local/recipes/wayland/xwayland/source/Xi/sendexev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/sendexev.h b/local/recipes/wayland/xwayland/source/Xi/sendexev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/sendexev.h
rename to local/recipes/wayland/xwayland/source/Xi/sendexev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setbmap.c b/local/recipes/wayland/xwayland/source/Xi/setbmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setbmap.c
rename to local/recipes/wayland/xwayland/source/Xi/setbmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setbmap.h b/local/recipes/wayland/xwayland/source/Xi/setbmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setbmap.h
rename to local/recipes/wayland/xwayland/source/Xi/setbmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setdval.c b/local/recipes/wayland/xwayland/source/Xi/setdval.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setdval.c
rename to local/recipes/wayland/xwayland/source/Xi/setdval.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setdval.h b/local/recipes/wayland/xwayland/source/Xi/setdval.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setdval.h
rename to local/recipes/wayland/xwayland/source/Xi/setdval.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setfocus.c b/local/recipes/wayland/xwayland/source/Xi/setfocus.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setfocus.c
rename to local/recipes/wayland/xwayland/source/Xi/setfocus.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setfocus.h b/local/recipes/wayland/xwayland/source/Xi/setfocus.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setfocus.h
rename to local/recipes/wayland/xwayland/source/Xi/setfocus.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setmmap.c b/local/recipes/wayland/xwayland/source/Xi/setmmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setmmap.c
rename to local/recipes/wayland/xwayland/source/Xi/setmmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setmmap.h b/local/recipes/wayland/xwayland/source/Xi/setmmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setmmap.h
rename to local/recipes/wayland/xwayland/source/Xi/setmmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setmode.c b/local/recipes/wayland/xwayland/source/Xi/setmode.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setmode.c
rename to local/recipes/wayland/xwayland/source/Xi/setmode.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/setmode.h b/local/recipes/wayland/xwayland/source/Xi/setmode.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/setmode.h
rename to local/recipes/wayland/xwayland/source/Xi/setmode.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/stubs.c b/local/recipes/wayland/xwayland/source/Xi/stubs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/stubs.c
rename to local/recipes/wayland/xwayland/source/Xi/stubs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdev.c b/local/recipes/wayland/xwayland/source/Xi/ungrdev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdev.c
rename to local/recipes/wayland/xwayland/source/Xi/ungrdev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdev.h b/local/recipes/wayland/xwayland/source/Xi/ungrdev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdev.h
rename to local/recipes/wayland/xwayland/source/Xi/ungrdev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevb.c b/local/recipes/wayland/xwayland/source/Xi/ungrdevb.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevb.c
rename to local/recipes/wayland/xwayland/source/Xi/ungrdevb.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevb.h b/local/recipes/wayland/xwayland/source/Xi/ungrdevb.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevb.h
rename to local/recipes/wayland/xwayland/source/Xi/ungrdevb.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevk.c b/local/recipes/wayland/xwayland/source/Xi/ungrdevk.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevk.c
rename to local/recipes/wayland/xwayland/source/Xi/ungrdevk.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevk.h b/local/recipes/wayland/xwayland/source/Xi/ungrdevk.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/ungrdevk.h
rename to local/recipes/wayland/xwayland/source/Xi/ungrdevk.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiallowev.c b/local/recipes/wayland/xwayland/source/Xi/xiallowev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiallowev.c
rename to local/recipes/wayland/xwayland/source/Xi/xiallowev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiallowev.h b/local/recipes/wayland/xwayland/source/Xi/xiallowev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiallowev.h
rename to local/recipes/wayland/xwayland/source/Xi/xiallowev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xibarriers.c b/local/recipes/wayland/xwayland/source/Xi/xibarriers.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xibarriers.c
rename to local/recipes/wayland/xwayland/source/Xi/xibarriers.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xibarriers.h b/local/recipes/wayland/xwayland/source/Xi/xibarriers.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xibarriers.h
rename to local/recipes/wayland/xwayland/source/Xi/xibarriers.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xichangecursor.c b/local/recipes/wayland/xwayland/source/Xi/xichangecursor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xichangecursor.c
rename to local/recipes/wayland/xwayland/source/Xi/xichangecursor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xichangecursor.h b/local/recipes/wayland/xwayland/source/Xi/xichangecursor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xichangecursor.h
rename to local/recipes/wayland/xwayland/source/Xi/xichangecursor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xichangehierarchy.c b/local/recipes/wayland/xwayland/source/Xi/xichangehierarchy.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xichangehierarchy.c
rename to local/recipes/wayland/xwayland/source/Xi/xichangehierarchy.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xichangehierarchy.h b/local/recipes/wayland/xwayland/source/Xi/xichangehierarchy.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xichangehierarchy.h
rename to local/recipes/wayland/xwayland/source/Xi/xichangehierarchy.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xigetclientpointer.c b/local/recipes/wayland/xwayland/source/Xi/xigetclientpointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xigetclientpointer.c
rename to local/recipes/wayland/xwayland/source/Xi/xigetclientpointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xigetclientpointer.h b/local/recipes/wayland/xwayland/source/Xi/xigetclientpointer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xigetclientpointer.h
rename to local/recipes/wayland/xwayland/source/Xi/xigetclientpointer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xigrabdev.c b/local/recipes/wayland/xwayland/source/Xi/xigrabdev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xigrabdev.c
rename to local/recipes/wayland/xwayland/source/Xi/xigrabdev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xigrabdev.h b/local/recipes/wayland/xwayland/source/Xi/xigrabdev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xigrabdev.h
rename to local/recipes/wayland/xwayland/source/Xi/xigrabdev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xipassivegrab.c b/local/recipes/wayland/xwayland/source/Xi/xipassivegrab.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xipassivegrab.c
rename to local/recipes/wayland/xwayland/source/Xi/xipassivegrab.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xipassivegrab.h b/local/recipes/wayland/xwayland/source/Xi/xipassivegrab.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xipassivegrab.h
rename to local/recipes/wayland/xwayland/source/Xi/xipassivegrab.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiproperty.c b/local/recipes/wayland/xwayland/source/Xi/xiproperty.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiproperty.c
rename to local/recipes/wayland/xwayland/source/Xi/xiproperty.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiproperty.h b/local/recipes/wayland/xwayland/source/Xi/xiproperty.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiproperty.h
rename to local/recipes/wayland/xwayland/source/Xi/xiproperty.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiquerydevice.c b/local/recipes/wayland/xwayland/source/Xi/xiquerydevice.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiquerydevice.c
rename to local/recipes/wayland/xwayland/source/Xi/xiquerydevice.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiquerydevice.h b/local/recipes/wayland/xwayland/source/Xi/xiquerydevice.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiquerydevice.h
rename to local/recipes/wayland/xwayland/source/Xi/xiquerydevice.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiquerypointer.c b/local/recipes/wayland/xwayland/source/Xi/xiquerypointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiquerypointer.c
rename to local/recipes/wayland/xwayland/source/Xi/xiquerypointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiquerypointer.h b/local/recipes/wayland/xwayland/source/Xi/xiquerypointer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiquerypointer.h
rename to local/recipes/wayland/xwayland/source/Xi/xiquerypointer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiqueryversion.c b/local/recipes/wayland/xwayland/source/Xi/xiqueryversion.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiqueryversion.c
rename to local/recipes/wayland/xwayland/source/Xi/xiqueryversion.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiqueryversion.h b/local/recipes/wayland/xwayland/source/Xi/xiqueryversion.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiqueryversion.h
rename to local/recipes/wayland/xwayland/source/Xi/xiqueryversion.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiselectev.c b/local/recipes/wayland/xwayland/source/Xi/xiselectev.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiselectev.c
rename to local/recipes/wayland/xwayland/source/Xi/xiselectev.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiselectev.h b/local/recipes/wayland/xwayland/source/Xi/xiselectev.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiselectev.h
rename to local/recipes/wayland/xwayland/source/Xi/xiselectev.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xisetclientpointer.c b/local/recipes/wayland/xwayland/source/Xi/xisetclientpointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xisetclientpointer.c
rename to local/recipes/wayland/xwayland/source/Xi/xisetclientpointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xisetclientpointer.h b/local/recipes/wayland/xwayland/source/Xi/xisetclientpointer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xisetclientpointer.h
rename to local/recipes/wayland/xwayland/source/Xi/xisetclientpointer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xisetdevfocus.c b/local/recipes/wayland/xwayland/source/Xi/xisetdevfocus.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xisetdevfocus.c
rename to local/recipes/wayland/xwayland/source/Xi/xisetdevfocus.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xisetdevfocus.h b/local/recipes/wayland/xwayland/source/Xi/xisetdevfocus.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xisetdevfocus.h
rename to local/recipes/wayland/xwayland/source/Xi/xisetdevfocus.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiwarppointer.c b/local/recipes/wayland/xwayland/source/Xi/xiwarppointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiwarppointer.c
rename to local/recipes/wayland/xwayland/source/Xi/xiwarppointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/Xi/xiwarppointer.h b/local/recipes/wayland/xwayland/source/Xi/xiwarppointer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/Xi/xiwarppointer.h
rename to local/recipes/wayland/xwayland/source/Xi/xiwarppointer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compalloc.c b/local/recipes/wayland/xwayland/source/composite/compalloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compalloc.c
rename to local/recipes/wayland/xwayland/source/composite/compalloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compext.c b/local/recipes/wayland/xwayland/source/composite/compext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compext.c
rename to local/recipes/wayland/xwayland/source/composite/compext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compinit.c b/local/recipes/wayland/xwayland/source/composite/compinit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compinit.c
rename to local/recipes/wayland/xwayland/source/composite/compinit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compint.h b/local/recipes/wayland/xwayland/source/composite/compint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compint.h
rename to local/recipes/wayland/xwayland/source/composite/compint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compositeext.h b/local/recipes/wayland/xwayland/source/composite/compositeext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compositeext.h
rename to local/recipes/wayland/xwayland/source/composite/compositeext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compositeext_priv.h b/local/recipes/wayland/xwayland/source/composite/compositeext_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compositeext_priv.h
rename to local/recipes/wayland/xwayland/source/composite/compositeext_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compoverlay.c b/local/recipes/wayland/xwayland/source/composite/compoverlay.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compoverlay.c
rename to local/recipes/wayland/xwayland/source/composite/compoverlay.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/compwindow.c b/local/recipes/wayland/xwayland/source/composite/compwindow.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/compwindow.c
rename to local/recipes/wayland/xwayland/source/composite/compwindow.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/composite/meson.build b/local/recipes/wayland/xwayland/source/composite/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/composite/meson.build
rename to local/recipes/wayland/xwayland/source/composite/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/damageext/damageext.c b/local/recipes/wayland/xwayland/source/damageext/damageext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/damageext/damageext.c
rename to local/recipes/wayland/xwayland/source/damageext/damageext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/damageext/damageext.h b/local/recipes/wayland/xwayland/source/damageext/damageext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/damageext/damageext.h
rename to local/recipes/wayland/xwayland/source/damageext/damageext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/damageext/damageextint.h b/local/recipes/wayland/xwayland/source/damageext/damageextint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/damageext/damageextint.h
rename to local/recipes/wayland/xwayland/source/damageext/damageextint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/damageext/meson.build b/local/recipes/wayland/xwayland/source/damageext/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/damageext/meson.build
rename to local/recipes/wayland/xwayland/source/damageext/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/dbe/dbe.c b/local/recipes/wayland/xwayland/source/dbe/dbe.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dbe/dbe.c
rename to local/recipes/wayland/xwayland/source/dbe/dbe.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dbe/dbestruct.h b/local/recipes/wayland/xwayland/source/dbe/dbestruct.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dbe/dbestruct.h
rename to local/recipes/wayland/xwayland/source/dbe/dbestruct.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dbe/meson.build b/local/recipes/wayland/xwayland/source/dbe/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dbe/meson.build
rename to local/recipes/wayland/xwayland/source/dbe/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/dbe/midbe.c b/local/recipes/wayland/xwayland/source/dbe/midbe.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dbe/midbe.c
rename to local/recipes/wayland/xwayland/source/dbe/midbe.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dbe/midbe.h b/local/recipes/wayland/xwayland/source/dbe/midbe.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dbe/midbe.h
rename to local/recipes/wayland/xwayland/source/dbe/midbe.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/.gitignore b/local/recipes/wayland/xwayland/source/dix/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/.gitignore
rename to local/recipes/wayland/xwayland/source/dix/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/BuiltInAtoms b/local/recipes/wayland/xwayland/source/dix/BuiltInAtoms
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/BuiltInAtoms
rename to local/recipes/wayland/xwayland/source/dix/BuiltInAtoms
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/atom.c b/local/recipes/wayland/xwayland/source/dix/atom.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/atom.c
rename to local/recipes/wayland/xwayland/source/dix/atom.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/buildatoms b/local/recipes/wayland/xwayland/source/dix/buildatoms
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/buildatoms
rename to local/recipes/wayland/xwayland/source/dix/buildatoms
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/callback_priv.h b/local/recipes/wayland/xwayland/source/dix/callback_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/callback_priv.h
rename to local/recipes/wayland/xwayland/source/dix/callback_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/colormap.c b/local/recipes/wayland/xwayland/source/dix/colormap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/colormap.c
rename to local/recipes/wayland/xwayland/source/dix/colormap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/cursor.c b/local/recipes/wayland/xwayland/source/dix/cursor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/cursor.c
rename to local/recipes/wayland/xwayland/source/dix/cursor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/devices.c b/local/recipes/wayland/xwayland/source/dix/devices.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/devices.c
rename to local/recipes/wayland/xwayland/source/dix/devices.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/dispatch.c b/local/recipes/wayland/xwayland/source/dix/dispatch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/dispatch.c
rename to local/recipes/wayland/xwayland/source/dix/dispatch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/dispatch.h b/local/recipes/wayland/xwayland/source/dix/dispatch.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/dispatch.h
rename to local/recipes/wayland/xwayland/source/dix/dispatch.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/dix_priv.h b/local/recipes/wayland/xwayland/source/dix/dix_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/dix_priv.h
rename to local/recipes/wayland/xwayland/source/dix/dix_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/dixfonts.c b/local/recipes/wayland/xwayland/source/dix/dixfonts.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/dixfonts.c
rename to local/recipes/wayland/xwayland/source/dix/dixfonts.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/dixutils.c b/local/recipes/wayland/xwayland/source/dix/dixutils.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/dixutils.c
rename to local/recipes/wayland/xwayland/source/dix/dixutils.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/enterleave.c b/local/recipes/wayland/xwayland/source/dix/enterleave.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/enterleave.c
rename to local/recipes/wayland/xwayland/source/dix/enterleave.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/enterleave.h b/local/recipes/wayland/xwayland/source/dix/enterleave.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/enterleave.h
rename to local/recipes/wayland/xwayland/source/dix/enterleave.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/eventconvert.c b/local/recipes/wayland/xwayland/source/dix/eventconvert.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/eventconvert.c
rename to local/recipes/wayland/xwayland/source/dix/eventconvert.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/eventconvert.h b/local/recipes/wayland/xwayland/source/dix/eventconvert.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/eventconvert.h
rename to local/recipes/wayland/xwayland/source/dix/eventconvert.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/events.c b/local/recipes/wayland/xwayland/source/dix/events.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/events.c
rename to local/recipes/wayland/xwayland/source/dix/events.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/extension.c b/local/recipes/wayland/xwayland/source/dix/extension.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/extension.c
rename to local/recipes/wayland/xwayland/source/dix/extension.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/gc.c b/local/recipes/wayland/xwayland/source/dix/gc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/gc.c
rename to local/recipes/wayland/xwayland/source/dix/gc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/gestures.c b/local/recipes/wayland/xwayland/source/dix/gestures.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/gestures.c
rename to local/recipes/wayland/xwayland/source/dix/gestures.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/getevents.c b/local/recipes/wayland/xwayland/source/dix/getevents.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/getevents.c
rename to local/recipes/wayland/xwayland/source/dix/getevents.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/globals.c b/local/recipes/wayland/xwayland/source/dix/globals.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/globals.c
rename to local/recipes/wayland/xwayland/source/dix/globals.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/glyphcurs.c b/local/recipes/wayland/xwayland/source/dix/glyphcurs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/glyphcurs.c
rename to local/recipes/wayland/xwayland/source/dix/glyphcurs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/grabs.c b/local/recipes/wayland/xwayland/source/dix/grabs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/grabs.c
rename to local/recipes/wayland/xwayland/source/dix/grabs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/initatoms.c b/local/recipes/wayland/xwayland/source/dix/initatoms.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/initatoms.c
rename to local/recipes/wayland/xwayland/source/dix/initatoms.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/inpututils.c b/local/recipes/wayland/xwayland/source/dix/inpututils.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/inpututils.c
rename to local/recipes/wayland/xwayland/source/dix/inpututils.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/main.c b/local/recipes/wayland/xwayland/source/dix/main.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/main.c
rename to local/recipes/wayland/xwayland/source/dix/main.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/meson.build b/local/recipes/wayland/xwayland/source/dix/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/meson.build
rename to local/recipes/wayland/xwayland/source/dix/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/pixmap.c b/local/recipes/wayland/xwayland/source/dix/pixmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/pixmap.c
rename to local/recipes/wayland/xwayland/source/dix/pixmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/privates.c b/local/recipes/wayland/xwayland/source/dix/privates.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/privates.c
rename to local/recipes/wayland/xwayland/source/dix/privates.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/property.c b/local/recipes/wayland/xwayland/source/dix/property.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/property.c
rename to local/recipes/wayland/xwayland/source/dix/property.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/protocol.txt b/local/recipes/wayland/xwayland/source/dix/protocol.txt
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/protocol.txt
rename to local/recipes/wayland/xwayland/source/dix/protocol.txt
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/ptrveloc.c b/local/recipes/wayland/xwayland/source/dix/ptrveloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/ptrveloc.c
rename to local/recipes/wayland/xwayland/source/dix/ptrveloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/ptrveloc_priv.h b/local/recipes/wayland/xwayland/source/dix/ptrveloc_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/ptrveloc_priv.h
rename to local/recipes/wayland/xwayland/source/dix/ptrveloc_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/region.c b/local/recipes/wayland/xwayland/source/dix/region.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/region.c
rename to local/recipes/wayland/xwayland/source/dix/region.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/registry.c b/local/recipes/wayland/xwayland/source/dix/registry.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/registry.c
rename to local/recipes/wayland/xwayland/source/dix/registry.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/registry_priv.h b/local/recipes/wayland/xwayland/source/dix/registry_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/registry_priv.h
rename to local/recipes/wayland/xwayland/source/dix/registry_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/resource.c b/local/recipes/wayland/xwayland/source/dix/resource.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/resource.c
rename to local/recipes/wayland/xwayland/source/dix/resource.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/screenint_priv.h b/local/recipes/wayland/xwayland/source/dix/screenint_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/screenint_priv.h
rename to local/recipes/wayland/xwayland/source/dix/screenint_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/selection.c b/local/recipes/wayland/xwayland/source/dix/selection.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/selection.c
rename to local/recipes/wayland/xwayland/source/dix/selection.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/stubmain.c b/local/recipes/wayland/xwayland/source/dix/stubmain.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/stubmain.c
rename to local/recipes/wayland/xwayland/source/dix/stubmain.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/swaprep.c b/local/recipes/wayland/xwayland/source/dix/swaprep.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/swaprep.c
rename to local/recipes/wayland/xwayland/source/dix/swaprep.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/swapreq.c b/local/recipes/wayland/xwayland/source/dix/swapreq.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/swapreq.c
rename to local/recipes/wayland/xwayland/source/dix/swapreq.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/tables.c b/local/recipes/wayland/xwayland/source/dix/tables.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/tables.c
rename to local/recipes/wayland/xwayland/source/dix/tables.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/touch.c b/local/recipes/wayland/xwayland/source/dix/touch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/touch.c
rename to local/recipes/wayland/xwayland/source/dix/touch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dix/window.c b/local/recipes/wayland/xwayland/source/dix/window.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dix/window.c
rename to local/recipes/wayland/xwayland/source/dix/window.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/.gitignore b/local/recipes/wayland/xwayland/source/doc/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/.gitignore
rename to local/recipes/wayland/xwayland/source/doc/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/Xinput.xml b/local/recipes/wayland/xwayland/source/doc/Xinput.xml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/Xinput.xml
rename to local/recipes/wayland/xwayland/source/doc/Xinput.xml
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/Xserver-spec.xml b/local/recipes/wayland/xwayland/source/doc/Xserver-spec.xml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/Xserver-spec.xml
rename to local/recipes/wayland/xwayland/source/doc/Xserver-spec.xml
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/c-extensions b/local/recipes/wayland/xwayland/source/doc/c-extensions
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/c-extensions
rename to local/recipes/wayland/xwayland/source/doc/c-extensions
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/dtrace/.gitignore b/local/recipes/wayland/xwayland/source/doc/dtrace/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/dtrace/.gitignore
rename to local/recipes/wayland/xwayland/source/doc/dtrace/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/dtrace/Xserver-DTrace.xml b/local/recipes/wayland/xwayland/source/doc/dtrace/Xserver-DTrace.xml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/dtrace/Xserver-DTrace.xml
rename to local/recipes/wayland/xwayland/source/doc/dtrace/Xserver-DTrace.xml
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/dtrace/meson.build b/local/recipes/wayland/xwayland/source/doc/dtrace/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/dtrace/meson.build
rename to local/recipes/wayland/xwayland/source/doc/dtrace/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/filter-xmlto.sh b/local/recipes/wayland/xwayland/source/doc/filter-xmlto.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/filter-xmlto.sh
rename to local/recipes/wayland/xwayland/source/doc/filter-xmlto.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/meson.build b/local/recipes/wayland/xwayland/source/doc/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/meson.build
rename to local/recipes/wayland/xwayland/source/doc/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/doc/smartsched b/local/recipes/wayland/xwayland/source/doc/smartsched
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/doc/smartsched
rename to local/recipes/wayland/xwayland/source/doc/smartsched
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/dri3.c b/local/recipes/wayland/xwayland/source/dri3/dri3.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/dri3.c
rename to local/recipes/wayland/xwayland/source/dri3/dri3.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/dri3.h b/local/recipes/wayland/xwayland/source/dri3/dri3.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/dri3.h
rename to local/recipes/wayland/xwayland/source/dri3/dri3.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/dri3_priv.h b/local/recipes/wayland/xwayland/source/dri3/dri3_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/dri3_priv.h
rename to local/recipes/wayland/xwayland/source/dri3/dri3_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/dri3_request.c b/local/recipes/wayland/xwayland/source/dri3/dri3_request.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/dri3_request.c
rename to local/recipes/wayland/xwayland/source/dri3/dri3_request.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/dri3_screen.c b/local/recipes/wayland/xwayland/source/dri3/dri3_screen.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/dri3_screen.c
rename to local/recipes/wayland/xwayland/source/dri3/dri3_screen.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/dri3/meson.build b/local/recipes/wayland/xwayland/source/dri3/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/dri3/meson.build
rename to local/recipes/wayland/xwayland/source/dri3/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fb.h b/local/recipes/wayland/xwayland/source/fb/fb.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fb.h
rename to local/recipes/wayland/xwayland/source/fb/fb.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fballpriv.c b/local/recipes/wayland/xwayland/source/fb/fballpriv.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fballpriv.c
rename to local/recipes/wayland/xwayland/source/fb/fballpriv.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbarc.c b/local/recipes/wayland/xwayland/source/fb/fbarc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbarc.c
rename to local/recipes/wayland/xwayland/source/fb/fbarc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbbits.c b/local/recipes/wayland/xwayland/source/fb/fbbits.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbbits.c
rename to local/recipes/wayland/xwayland/source/fb/fbbits.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbbits.h b/local/recipes/wayland/xwayland/source/fb/fbbits.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbbits.h
rename to local/recipes/wayland/xwayland/source/fb/fbbits.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbblt.c b/local/recipes/wayland/xwayland/source/fb/fbblt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbblt.c
rename to local/recipes/wayland/xwayland/source/fb/fbblt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbbltone.c b/local/recipes/wayland/xwayland/source/fb/fbbltone.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbbltone.c
rename to local/recipes/wayland/xwayland/source/fb/fbbltone.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbcmap_mi.c b/local/recipes/wayland/xwayland/source/fb/fbcmap_mi.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbcmap_mi.c
rename to local/recipes/wayland/xwayland/source/fb/fbcmap_mi.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbcopy.c b/local/recipes/wayland/xwayland/source/fb/fbcopy.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbcopy.c
rename to local/recipes/wayland/xwayland/source/fb/fbcopy.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbfill.c b/local/recipes/wayland/xwayland/source/fb/fbfill.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbfill.c
rename to local/recipes/wayland/xwayland/source/fb/fbfill.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbfillrect.c b/local/recipes/wayland/xwayland/source/fb/fbfillrect.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbfillrect.c
rename to local/recipes/wayland/xwayland/source/fb/fbfillrect.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbfillsp.c b/local/recipes/wayland/xwayland/source/fb/fbfillsp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbfillsp.c
rename to local/recipes/wayland/xwayland/source/fb/fbfillsp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbgc.c b/local/recipes/wayland/xwayland/source/fb/fbgc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbgc.c
rename to local/recipes/wayland/xwayland/source/fb/fbgc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbgetsp.c b/local/recipes/wayland/xwayland/source/fb/fbgetsp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbgetsp.c
rename to local/recipes/wayland/xwayland/source/fb/fbgetsp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbglyph.c b/local/recipes/wayland/xwayland/source/fb/fbglyph.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbglyph.c
rename to local/recipes/wayland/xwayland/source/fb/fbglyph.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbimage.c b/local/recipes/wayland/xwayland/source/fb/fbimage.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbimage.c
rename to local/recipes/wayland/xwayland/source/fb/fbimage.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbline.c b/local/recipes/wayland/xwayland/source/fb/fbline.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbline.c
rename to local/recipes/wayland/xwayland/source/fb/fbline.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fboverlay.c b/local/recipes/wayland/xwayland/source/fb/fboverlay.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fboverlay.c
rename to local/recipes/wayland/xwayland/source/fb/fboverlay.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fboverlay.h b/local/recipes/wayland/xwayland/source/fb/fboverlay.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fboverlay.h
rename to local/recipes/wayland/xwayland/source/fb/fboverlay.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbpict.c b/local/recipes/wayland/xwayland/source/fb/fbpict.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbpict.c
rename to local/recipes/wayland/xwayland/source/fb/fbpict.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbpict.h b/local/recipes/wayland/xwayland/source/fb/fbpict.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbpict.h
rename to local/recipes/wayland/xwayland/source/fb/fbpict.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbpixmap.c b/local/recipes/wayland/xwayland/source/fb/fbpixmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbpixmap.c
rename to local/recipes/wayland/xwayland/source/fb/fbpixmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbpoint.c b/local/recipes/wayland/xwayland/source/fb/fbpoint.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbpoint.c
rename to local/recipes/wayland/xwayland/source/fb/fbpoint.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbpush.c b/local/recipes/wayland/xwayland/source/fb/fbpush.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbpush.c
rename to local/recipes/wayland/xwayland/source/fb/fbpush.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbrop.h b/local/recipes/wayland/xwayland/source/fb/fbrop.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbrop.h
rename to local/recipes/wayland/xwayland/source/fb/fbrop.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbscreen.c b/local/recipes/wayland/xwayland/source/fb/fbscreen.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbscreen.c
rename to local/recipes/wayland/xwayland/source/fb/fbscreen.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbseg.c b/local/recipes/wayland/xwayland/source/fb/fbseg.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbseg.c
rename to local/recipes/wayland/xwayland/source/fb/fbseg.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbsetsp.c b/local/recipes/wayland/xwayland/source/fb/fbsetsp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbsetsp.c
rename to local/recipes/wayland/xwayland/source/fb/fbsetsp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbsolid.c b/local/recipes/wayland/xwayland/source/fb/fbsolid.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbsolid.c
rename to local/recipes/wayland/xwayland/source/fb/fbsolid.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbtile.c b/local/recipes/wayland/xwayland/source/fb/fbtile.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbtile.c
rename to local/recipes/wayland/xwayland/source/fb/fbtile.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbtrap.c b/local/recipes/wayland/xwayland/source/fb/fbtrap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbtrap.c
rename to local/recipes/wayland/xwayland/source/fb/fbtrap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbutil.c b/local/recipes/wayland/xwayland/source/fb/fbutil.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbutil.c
rename to local/recipes/wayland/xwayland/source/fb/fbutil.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/fbwindow.c b/local/recipes/wayland/xwayland/source/fb/fbwindow.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/fbwindow.c
rename to local/recipes/wayland/xwayland/source/fb/fbwindow.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/meson.build b/local/recipes/wayland/xwayland/source/fb/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/meson.build
rename to local/recipes/wayland/xwayland/source/fb/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/fb/wfbrename.h b/local/recipes/wayland/xwayland/source/fb/wfbrename.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/fb/wfbrename.h
rename to local/recipes/wayland/xwayland/source/fb/wfbrename.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor.c b/local/recipes/wayland/xwayland/source/glamor/glamor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor.h b/local/recipes/wayland/xwayland/source/glamor/glamor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_addtraps.c b/local/recipes/wayland/xwayland/source/glamor/glamor_addtraps.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_addtraps.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_addtraps.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_composite_glyphs.c b/local/recipes/wayland/xwayland/source/glamor/glamor_composite_glyphs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_composite_glyphs.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_composite_glyphs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_compositerects.c b/local/recipes/wayland/xwayland/source/glamor/glamor_compositerects.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_compositerects.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_compositerects.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_context.h b/local/recipes/wayland/xwayland/source/glamor/glamor_context.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_context.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_context.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_copy.c b/local/recipes/wayland/xwayland/source/glamor/glamor_copy.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_copy.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_copy.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_core.c b/local/recipes/wayland/xwayland/source/glamor/glamor_core.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_core.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_core.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_dash.c b/local/recipes/wayland/xwayland/source/glamor/glamor_dash.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_dash.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_dash.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_debug.h b/local/recipes/wayland/xwayland/source/glamor/glamor_debug.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_debug.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_debug.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl.c b/local/recipes/wayland/xwayland/source/glamor/glamor_egl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_egl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl.h b/local/recipes/wayland/xwayland/source/glamor/glamor_egl.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_egl.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl_ext.h b/local/recipes/wayland/xwayland/source/glamor/glamor_egl_ext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_egl_ext.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_egl_ext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_eglmodule.c b/local/recipes/wayland/xwayland/source/glamor/glamor_eglmodule.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_eglmodule.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_eglmodule.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_fbo.c b/local/recipes/wayland/xwayland/source/glamor/glamor_fbo.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_fbo.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_fbo.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_font.c b/local/recipes/wayland/xwayland/source/glamor/glamor_font.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_font.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_font.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_font.h b/local/recipes/wayland/xwayland/source/glamor/glamor_font.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_font.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_font.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glx_provider.c b/local/recipes/wayland/xwayland/source/glamor/glamor_glx_provider.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glx_provider.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_glx_provider.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glx_provider.h b/local/recipes/wayland/xwayland/source/glamor/glamor_glx_provider.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glx_provider.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_glx_provider.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glyphblt.c b/local/recipes/wayland/xwayland/source/glamor/glamor_glyphblt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_glyphblt.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_glyphblt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_gradient.c b/local/recipes/wayland/xwayland/source/glamor/glamor_gradient.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_gradient.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_gradient.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_image.c b/local/recipes/wayland/xwayland/source/glamor/glamor_image.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_image.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_image.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_largepixmap.c b/local/recipes/wayland/xwayland/source/glamor/glamor_largepixmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_largepixmap.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_largepixmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_lines.c b/local/recipes/wayland/xwayland/source/glamor/glamor_lines.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_lines.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_lines.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_picture.c b/local/recipes/wayland/xwayland/source/glamor/glamor_picture.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_picture.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_picture.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_pixmap.c b/local/recipes/wayland/xwayland/source/glamor/glamor_pixmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_pixmap.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_pixmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_points.c b/local/recipes/wayland/xwayland/source/glamor/glamor_points.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_points.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_points.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_prepare.c b/local/recipes/wayland/xwayland/source/glamor/glamor_prepare.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_prepare.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_prepare.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_prepare.h b/local/recipes/wayland/xwayland/source/glamor/glamor_prepare.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_prepare.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_prepare.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_priv.h b/local/recipes/wayland/xwayland/source/glamor/glamor_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_priv.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_program.c b/local/recipes/wayland/xwayland/source/glamor/glamor_program.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_program.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_program.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_program.h b/local/recipes/wayland/xwayland/source/glamor/glamor_program.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_program.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_program.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_rects.c b/local/recipes/wayland/xwayland/source/glamor/glamor_rects.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_rects.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_rects.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_render.c b/local/recipes/wayland/xwayland/source/glamor/glamor_render.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_render.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_render.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_segs.c b/local/recipes/wayland/xwayland/source/glamor/glamor_segs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_segs.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_segs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_spans.c b/local/recipes/wayland/xwayland/source/glamor/glamor_spans.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_spans.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_spans.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_sync.c b/local/recipes/wayland/xwayland/source/glamor/glamor_sync.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_sync.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_sync.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_text.c b/local/recipes/wayland/xwayland/source/glamor/glamor_text.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_text.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_text.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transfer.c b/local/recipes/wayland/xwayland/source/glamor/glamor_transfer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transfer.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_transfer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transfer.h b/local/recipes/wayland/xwayland/source/glamor/glamor_transfer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transfer.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_transfer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transform.c b/local/recipes/wayland/xwayland/source/glamor/glamor_transform.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transform.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_transform.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transform.h b/local/recipes/wayland/xwayland/source/glamor/glamor_transform.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_transform.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_transform.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_trapezoid.c b/local/recipes/wayland/xwayland/source/glamor/glamor_trapezoid.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_trapezoid.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_trapezoid.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_triangles.c b/local/recipes/wayland/xwayland/source/glamor/glamor_triangles.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_triangles.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_triangles.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_utils.c b/local/recipes/wayland/xwayland/source/glamor/glamor_utils.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_utils.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_utils.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_utils.h b/local/recipes/wayland/xwayland/source/glamor/glamor_utils.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_utils.h
rename to local/recipes/wayland/xwayland/source/glamor/glamor_utils.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_vbo.c b/local/recipes/wayland/xwayland/source/glamor/glamor_vbo.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_vbo.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_vbo.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_window.c b/local/recipes/wayland/xwayland/source/glamor/glamor_window.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_window.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_window.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/glamor_xv.c b/local/recipes/wayland/xwayland/source/glamor/glamor_xv.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/glamor_xv.c
rename to local/recipes/wayland/xwayland/source/glamor/glamor_xv.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glamor/meson.build b/local/recipes/wayland/xwayland/source/glamor/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glamor/meson.build
rename to local/recipes/wayland/xwayland/source/glamor/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/clientinfo.c b/local/recipes/wayland/xwayland/source/glx/clientinfo.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/clientinfo.c
rename to local/recipes/wayland/xwayland/source/glx/clientinfo.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/createcontext.c b/local/recipes/wayland/xwayland/source/glx/createcontext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/createcontext.c
rename to local/recipes/wayland/xwayland/source/glx/createcontext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/extension_string.c b/local/recipes/wayland/xwayland/source/glx/extension_string.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/extension_string.c
rename to local/recipes/wayland/xwayland/source/glx/extension_string.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/extension_string.h b/local/recipes/wayland/xwayland/source/glx/extension_string.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/extension_string.h
rename to local/recipes/wayland/xwayland/source/glx/extension_string.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxbyteorder.h b/local/recipes/wayland/xwayland/source/glx/glxbyteorder.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxbyteorder.h
rename to local/recipes/wayland/xwayland/source/glx/glxbyteorder.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxcmds.c b/local/recipes/wayland/xwayland/source/glx/glxcmds.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxcmds.c
rename to local/recipes/wayland/xwayland/source/glx/glxcmds.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxcmdsswap.c b/local/recipes/wayland/xwayland/source/glx/glxcmdsswap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxcmdsswap.c
rename to local/recipes/wayland/xwayland/source/glx/glxcmdsswap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxcontext.h b/local/recipes/wayland/xwayland/source/glx/glxcontext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxcontext.h
rename to local/recipes/wayland/xwayland/source/glx/glxcontext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxdrawable.h b/local/recipes/wayland/xwayland/source/glx/glxdrawable.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxdrawable.h
rename to local/recipes/wayland/xwayland/source/glx/glxdrawable.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxdri2.c b/local/recipes/wayland/xwayland/source/glx/glxdri2.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxdri2.c
rename to local/recipes/wayland/xwayland/source/glx/glxdri2.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxdricommon.c b/local/recipes/wayland/xwayland/source/glx/glxdricommon.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxdricommon.c
rename to local/recipes/wayland/xwayland/source/glx/glxdricommon.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxdricommon.h b/local/recipes/wayland/xwayland/source/glx/glxdricommon.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxdricommon.h
rename to local/recipes/wayland/xwayland/source/glx/glxdricommon.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxdriswrast.c b/local/recipes/wayland/xwayland/source/glx/glxdriswrast.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxdriswrast.c
rename to local/recipes/wayland/xwayland/source/glx/glxdriswrast.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxext.c b/local/recipes/wayland/xwayland/source/glx/glxext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxext.c
rename to local/recipes/wayland/xwayland/source/glx/glxext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxext.h b/local/recipes/wayland/xwayland/source/glx/glxext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxext.h
rename to local/recipes/wayland/xwayland/source/glx/glxext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxscreens.c b/local/recipes/wayland/xwayland/source/glx/glxscreens.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxscreens.c
rename to local/recipes/wayland/xwayland/source/glx/glxscreens.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxscreens.h b/local/recipes/wayland/xwayland/source/glx/glxscreens.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxscreens.h
rename to local/recipes/wayland/xwayland/source/glx/glxscreens.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxserver.h b/local/recipes/wayland/xwayland/source/glx/glxserver.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxserver.h
rename to local/recipes/wayland/xwayland/source/glx/glxserver.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/glxutil.h b/local/recipes/wayland/xwayland/source/glx/glxutil.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/glxutil.h
rename to local/recipes/wayland/xwayland/source/glx/glxutil.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch.c b/local/recipes/wayland/xwayland/source/glx/indirect_dispatch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_dispatch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch.h b/local/recipes/wayland/xwayland/source/glx/indirect_dispatch.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_dispatch.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch_swap.c b/local/recipes/wayland/xwayland/source/glx/indirect_dispatch_swap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_dispatch_swap.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_dispatch_swap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_program.c b/local/recipes/wayland/xwayland/source/glx/indirect_program.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_program.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_program.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_reqsize.c b/local/recipes/wayland/xwayland/source/glx/indirect_reqsize.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_reqsize.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_reqsize.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_reqsize.h b/local/recipes/wayland/xwayland/source/glx/indirect_reqsize.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_reqsize.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_reqsize.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_size.h b/local/recipes/wayland/xwayland/source/glx/indirect_size.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_size.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_size.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_size_get.c b/local/recipes/wayland/xwayland/source/glx/indirect_size_get.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_size_get.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_size_get.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_size_get.h b/local/recipes/wayland/xwayland/source/glx/indirect_size_get.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_size_get.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_size_get.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_table.c b/local/recipes/wayland/xwayland/source/glx/indirect_table.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_table.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_table.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_table.h b/local/recipes/wayland/xwayland/source/glx/indirect_table.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_table.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_table.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_texture_compression.c b/local/recipes/wayland/xwayland/source/glx/indirect_texture_compression.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_texture_compression.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_texture_compression.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_util.c b/local/recipes/wayland/xwayland/source/glx/indirect_util.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_util.c
rename to local/recipes/wayland/xwayland/source/glx/indirect_util.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/indirect_util.h b/local/recipes/wayland/xwayland/source/glx/indirect_util.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/indirect_util.h
rename to local/recipes/wayland/xwayland/source/glx/indirect_util.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/meson.build b/local/recipes/wayland/xwayland/source/glx/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/meson.build
rename to local/recipes/wayland/xwayland/source/glx/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/render2.c b/local/recipes/wayland/xwayland/source/glx/render2.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/render2.c
rename to local/recipes/wayland/xwayland/source/glx/render2.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/render2swap.c b/local/recipes/wayland/xwayland/source/glx/render2swap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/render2swap.c
rename to local/recipes/wayland/xwayland/source/glx/render2swap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/renderpix.c b/local/recipes/wayland/xwayland/source/glx/renderpix.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/renderpix.c
rename to local/recipes/wayland/xwayland/source/glx/renderpix.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/renderpixswap.c b/local/recipes/wayland/xwayland/source/glx/renderpixswap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/renderpixswap.c
rename to local/recipes/wayland/xwayland/source/glx/renderpixswap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/rensize.c b/local/recipes/wayland/xwayland/source/glx/rensize.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/rensize.c
rename to local/recipes/wayland/xwayland/source/glx/rensize.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/single2.c b/local/recipes/wayland/xwayland/source/glx/single2.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/single2.c
rename to local/recipes/wayland/xwayland/source/glx/single2.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/single2swap.c b/local/recipes/wayland/xwayland/source/glx/single2swap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/single2swap.c
rename to local/recipes/wayland/xwayland/source/glx/single2swap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/singlepix.c b/local/recipes/wayland/xwayland/source/glx/singlepix.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/singlepix.c
rename to local/recipes/wayland/xwayland/source/glx/singlepix.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/singlepixswap.c b/local/recipes/wayland/xwayland/source/glx/singlepixswap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/singlepixswap.c
rename to local/recipes/wayland/xwayland/source/glx/singlepixswap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/singlesize.c b/local/recipes/wayland/xwayland/source/glx/singlesize.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/singlesize.c
rename to local/recipes/wayland/xwayland/source/glx/singlesize.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/singlesize.h b/local/recipes/wayland/xwayland/source/glx/singlesize.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/singlesize.h
rename to local/recipes/wayland/xwayland/source/glx/singlesize.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/swap_interval.c b/local/recipes/wayland/xwayland/source/glx/swap_interval.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/swap_interval.c
rename to local/recipes/wayland/xwayland/source/glx/swap_interval.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/unpack.h b/local/recipes/wayland/xwayland/source/glx/unpack.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/unpack.h
rename to local/recipes/wayland/xwayland/source/glx/unpack.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vnd_dispatch_stubs.c b/local/recipes/wayland/xwayland/source/glx/vnd_dispatch_stubs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vnd_dispatch_stubs.c
rename to local/recipes/wayland/xwayland/source/glx/vnd_dispatch_stubs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndcmds.c b/local/recipes/wayland/xwayland/source/glx/vndcmds.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndcmds.c
rename to local/recipes/wayland/xwayland/source/glx/vndcmds.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndext.c b/local/recipes/wayland/xwayland/source/glx/vndext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndext.c
rename to local/recipes/wayland/xwayland/source/glx/vndext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndserver.h b/local/recipes/wayland/xwayland/source/glx/vndserver.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndserver.h
rename to local/recipes/wayland/xwayland/source/glx/vndserver.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndserver_priv.h b/local/recipes/wayland/xwayland/source/glx/vndserver_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndserver_priv.h
rename to local/recipes/wayland/xwayland/source/glx/vndserver_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndservermapping.c b/local/recipes/wayland/xwayland/source/glx/vndservermapping.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndservermapping.c
rename to local/recipes/wayland/xwayland/source/glx/vndservermapping.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndservervendor.c b/local/recipes/wayland/xwayland/source/glx/vndservervendor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndservervendor.c
rename to local/recipes/wayland/xwayland/source/glx/vndservervendor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/vndservervendor.h b/local/recipes/wayland/xwayland/source/glx/vndservervendor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/vndservervendor.h
rename to local/recipes/wayland/xwayland/source/glx/vndservervendor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/glx/xfont.c b/local/recipes/wayland/xwayland/source/glx/xfont.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/glx/xfont.c
rename to local/recipes/wayland/xwayland/source/glx/xfont.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/meson.build b/local/recipes/wayland/xwayland/source/hw/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/meson.build
rename to local/recipes/wayland/xwayland/source/hw/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/vfb/.gitignore b/local/recipes/wayland/xwayland/source/hw/vfb/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/vfb/.gitignore
rename to local/recipes/wayland/xwayland/source/hw/vfb/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/vfb/InitInput.c b/local/recipes/wayland/xwayland/source/hw/vfb/InitInput.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/vfb/InitInput.c
rename to local/recipes/wayland/xwayland/source/hw/vfb/InitInput.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/vfb/InitOutput.c b/local/recipes/wayland/xwayland/source/hw/vfb/InitOutput.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/vfb/InitOutput.c
rename to local/recipes/wayland/xwayland/source/hw/vfb/InitOutput.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/vfb/meson.build b/local/recipes/wayland/xwayland/source/hw/vfb/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/vfb/meson.build
rename to local/recipes/wayland/xwayland/source/hw/vfb/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xfree86/common/dgaproc_priv.h b/local/recipes/wayland/xwayland/source/hw/xfree86/common/dgaproc_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xfree86/common/dgaproc_priv.h
rename to local/recipes/wayland/xwayland/source/hw/xfree86/common/dgaproc_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/.gitignore b/local/recipes/wayland/xwayland/source/hw/xwayland/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/.gitignore
rename to local/recipes/wayland/xwayland/source/hw/xwayland/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in b/local/recipes/wayland/xwayland/source/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
rename to local/recipes/wayland/xwayland/source/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/drm.xml b/local/recipes/wayland/xwayland/source/hw/xwayland/drm.xml
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/drm.xml
rename to local/recipes/wayland/xwayland/source/hw/xwayland/drm.xml
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/man/Xwayland.man b/local/recipes/wayland/xwayland/source/hw/xwayland/man/Xwayland.man
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/man/Xwayland.man
rename to local/recipes/wayland/xwayland/source/hw/xwayland/man/Xwayland.man
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/meson.build b/local/recipes/wayland/xwayland/source/hw/xwayland/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/meson.build
rename to local/recipes/wayland/xwayland/source/hw/xwayland/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cursor.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cursor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cursor.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cursor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cursor.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cursor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cursor.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cursor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cvt.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cvt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cvt.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cvt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cvt.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cvt.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-cvt.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-cvt.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-dmabuf.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-dmabuf.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-dmabuf.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-dmabuf.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-dmabuf.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-dmabuf.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-dmabuf.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-dmabuf.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-drm-lease.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-drm-lease.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-drm-lease.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-drm-lease.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-drm-lease.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-drm-lease.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-drm-lease.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-drm-lease.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-gbm.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-gbm.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-gbm.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-gbm.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-gbm.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-gbm.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-gbm.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-gbm.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-xv.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-xv.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor-xv.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor-xv.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-glamor.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-glamor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-input.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-input.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-input.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-input.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-input.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-input.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-input.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-input.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-output.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-output.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-output.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-output.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-output.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-output.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-output.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-output.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-pixmap.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-pixmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-pixmap.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-pixmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-pixmap.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-pixmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-pixmap.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-pixmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-present.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-present.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-present.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-present.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-present.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-present.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-present.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-present.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-screen.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-screen.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-screen.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-screen.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-screen.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-screen.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-screen.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-screen.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-shm.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-shm.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-shm.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-shm.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-shm.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-shm.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-shm.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-shm.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-types.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-types.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-types.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-types.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-vidmode.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-vidmode.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-vidmode.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-vidmode.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-vidmode.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-vidmode.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-vidmode.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-vidmode.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window-buffers.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window-buffers.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window-buffers.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window-buffers.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window-buffers.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window-buffers.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window-buffers.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window-buffers.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-window.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-window.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-xtest.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-xtest.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-xtest.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-xtest.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-xtest.h b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-xtest.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland-xtest.h
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland-xtest.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland.c b/local/recipes/wayland/xwayland/source/hw/xwayland/xwayland.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/hw/xwayland/xwayland.c
rename to local/recipes/wayland/xwayland/source/hw/xwayland/xwayland.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/.gitignore b/local/recipes/wayland/xwayland/source/include/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/.gitignore
rename to local/recipes/wayland/xwayland/source/include/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/XIstubs.h b/local/recipes/wayland/xwayland/source/include/XIstubs.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/XIstubs.h
rename to local/recipes/wayland/xwayland/source/include/XIstubs.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/Xprintf.h b/local/recipes/wayland/xwayland/source/include/Xprintf.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/Xprintf.h
rename to local/recipes/wayland/xwayland/source/include/Xprintf.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/Xserver.d b/local/recipes/wayland/xwayland/source/include/Xserver.d
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/Xserver.d
rename to local/recipes/wayland/xwayland/source/include/Xserver.d
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/busfault.h b/local/recipes/wayland/xwayland/source/include/busfault.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/busfault.h
rename to local/recipes/wayland/xwayland/source/include/busfault.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/callback.h b/local/recipes/wayland/xwayland/source/include/callback.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/callback.h
rename to local/recipes/wayland/xwayland/source/include/callback.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/client.h b/local/recipes/wayland/xwayland/source/include/client.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/client.h
rename to local/recipes/wayland/xwayland/source/include/client.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/closestr.h b/local/recipes/wayland/xwayland/source/include/closestr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/closestr.h
rename to local/recipes/wayland/xwayland/source/include/closestr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/closure.h b/local/recipes/wayland/xwayland/source/include/closure.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/closure.h
rename to local/recipes/wayland/xwayland/source/include/closure.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/colormap.h b/local/recipes/wayland/xwayland/source/include/colormap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/colormap.h
rename to local/recipes/wayland/xwayland/source/include/colormap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/colormapst.h b/local/recipes/wayland/xwayland/source/include/colormapst.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/colormapst.h
rename to local/recipes/wayland/xwayland/source/include/colormapst.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/cursor.h b/local/recipes/wayland/xwayland/source/include/cursor.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/cursor.h
rename to local/recipes/wayland/xwayland/source/include/cursor.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/cursorstr.h b/local/recipes/wayland/xwayland/source/include/cursorstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/cursorstr.h
rename to local/recipes/wayland/xwayland/source/include/cursorstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dbus-core.h b/local/recipes/wayland/xwayland/source/include/dbus-core.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dbus-core.h
rename to local/recipes/wayland/xwayland/source/include/dbus-core.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/displaymode.h b/local/recipes/wayland/xwayland/source/include/displaymode.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/displaymode.h
rename to local/recipes/wayland/xwayland/source/include/displaymode.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dix-config-apple-verbatim.h b/local/recipes/wayland/xwayland/source/include/dix-config-apple-verbatim.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dix-config-apple-verbatim.h
rename to local/recipes/wayland/xwayland/source/include/dix-config-apple-verbatim.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dix.h b/local/recipes/wayland/xwayland/source/include/dix.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dix.h
rename to local/recipes/wayland/xwayland/source/include/dix.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixaccess.h b/local/recipes/wayland/xwayland/source/include/dixaccess.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixaccess.h
rename to local/recipes/wayland/xwayland/source/include/dixaccess.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixevents.h b/local/recipes/wayland/xwayland/source/include/dixevents.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixevents.h
rename to local/recipes/wayland/xwayland/source/include/dixevents.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixfont.h b/local/recipes/wayland/xwayland/source/include/dixfont.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixfont.h
rename to local/recipes/wayland/xwayland/source/include/dixfont.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixfontstr.h b/local/recipes/wayland/xwayland/source/include/dixfontstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixfontstr.h
rename to local/recipes/wayland/xwayland/source/include/dixfontstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixgrabs.h b/local/recipes/wayland/xwayland/source/include/dixgrabs.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixgrabs.h
rename to local/recipes/wayland/xwayland/source/include/dixgrabs.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/dixstruct.h b/local/recipes/wayland/xwayland/source/include/dixstruct.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/dixstruct.h
rename to local/recipes/wayland/xwayland/source/include/dixstruct.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/events.h b/local/recipes/wayland/xwayland/source/include/events.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/events.h
rename to local/recipes/wayland/xwayland/source/include/events.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/eventstr.h b/local/recipes/wayland/xwayland/source/include/eventstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/eventstr.h
rename to local/recipes/wayland/xwayland/source/include/eventstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/exevents.h b/local/recipes/wayland/xwayland/source/include/exevents.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/exevents.h
rename to local/recipes/wayland/xwayland/source/include/exevents.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/extension.h b/local/recipes/wayland/xwayland/source/include/extension.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/extension.h
rename to local/recipes/wayland/xwayland/source/include/extension.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/extinit.h b/local/recipes/wayland/xwayland/source/include/extinit.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/extinit.h
rename to local/recipes/wayland/xwayland/source/include/extinit.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/extnsionst.h b/local/recipes/wayland/xwayland/source/include/extnsionst.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/extnsionst.h
rename to local/recipes/wayland/xwayland/source/include/extnsionst.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/fourcc.h b/local/recipes/wayland/xwayland/source/include/fourcc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/fourcc.h
rename to local/recipes/wayland/xwayland/source/include/fourcc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/gc.h b/local/recipes/wayland/xwayland/source/include/gc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/gc.h
rename to local/recipes/wayland/xwayland/source/include/gc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/gcstruct.h b/local/recipes/wayland/xwayland/source/include/gcstruct.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/gcstruct.h
rename to local/recipes/wayland/xwayland/source/include/gcstruct.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/globals.h b/local/recipes/wayland/xwayland/source/include/globals.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/globals.h
rename to local/recipes/wayland/xwayland/source/include/globals.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/glx_extinit.h b/local/recipes/wayland/xwayland/source/include/glx_extinit.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/glx_extinit.h
rename to local/recipes/wayland/xwayland/source/include/glx_extinit.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/glxvndabi.h b/local/recipes/wayland/xwayland/source/include/glxvndabi.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/glxvndabi.h
rename to local/recipes/wayland/xwayland/source/include/glxvndabi.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/input.h b/local/recipes/wayland/xwayland/source/include/input.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/input.h
rename to local/recipes/wayland/xwayland/source/include/input.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/inputstr.h b/local/recipes/wayland/xwayland/source/include/inputstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/inputstr.h
rename to local/recipes/wayland/xwayland/source/include/inputstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/inpututils.h b/local/recipes/wayland/xwayland/source/include/inpututils.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/inpututils.h
rename to local/recipes/wayland/xwayland/source/include/inpututils.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/list.h b/local/recipes/wayland/xwayland/source/include/list.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/list.h
rename to local/recipes/wayland/xwayland/source/include/list.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/meson.build b/local/recipes/wayland/xwayland/source/include/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/meson.build
rename to local/recipes/wayland/xwayland/source/include/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/misc.h b/local/recipes/wayland/xwayland/source/include/misc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/misc.h
rename to local/recipes/wayland/xwayland/source/include/misc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/miscstruct.h b/local/recipes/wayland/xwayland/source/include/miscstruct.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/miscstruct.h
rename to local/recipes/wayland/xwayland/source/include/miscstruct.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/nonsdk_extinit.h b/local/recipes/wayland/xwayland/source/include/nonsdk_extinit.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/nonsdk_extinit.h
rename to local/recipes/wayland/xwayland/source/include/nonsdk_extinit.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/opaque.h b/local/recipes/wayland/xwayland/source/include/opaque.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/opaque.h
rename to local/recipes/wayland/xwayland/source/include/opaque.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/optionstr.h b/local/recipes/wayland/xwayland/source/include/optionstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/optionstr.h
rename to local/recipes/wayland/xwayland/source/include/optionstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/os.h b/local/recipes/wayland/xwayland/source/include/os.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/os.h
rename to local/recipes/wayland/xwayland/source/include/os.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/pixmap.h b/local/recipes/wayland/xwayland/source/include/pixmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/pixmap.h
rename to local/recipes/wayland/xwayland/source/include/pixmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/pixmapstr.h b/local/recipes/wayland/xwayland/source/include/pixmapstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/pixmapstr.h
rename to local/recipes/wayland/xwayland/source/include/pixmapstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/privates.h b/local/recipes/wayland/xwayland/source/include/privates.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/privates.h
rename to local/recipes/wayland/xwayland/source/include/privates.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/probes.h b/local/recipes/wayland/xwayland/source/include/probes.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/probes.h
rename to local/recipes/wayland/xwayland/source/include/probes.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/property.h b/local/recipes/wayland/xwayland/source/include/property.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/property.h
rename to local/recipes/wayland/xwayland/source/include/property.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/propertyst.h b/local/recipes/wayland/xwayland/source/include/propertyst.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/propertyst.h
rename to local/recipes/wayland/xwayland/source/include/propertyst.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/protocol-versions.h b/local/recipes/wayland/xwayland/source/include/protocol-versions.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/protocol-versions.h
rename to local/recipes/wayland/xwayland/source/include/protocol-versions.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/ptrveloc.h b/local/recipes/wayland/xwayland/source/include/ptrveloc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/ptrveloc.h
rename to local/recipes/wayland/xwayland/source/include/ptrveloc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/region.h b/local/recipes/wayland/xwayland/source/include/region.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/region.h
rename to local/recipes/wayland/xwayland/source/include/region.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/regionstr.h b/local/recipes/wayland/xwayland/source/include/regionstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/regionstr.h
rename to local/recipes/wayland/xwayland/source/include/regionstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/resource.h b/local/recipes/wayland/xwayland/source/include/resource.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/resource.h
rename to local/recipes/wayland/xwayland/source/include/resource.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/rgb.h b/local/recipes/wayland/xwayland/source/include/rgb.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/rgb.h
rename to local/recipes/wayland/xwayland/source/include/rgb.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/screenint.h b/local/recipes/wayland/xwayland/source/include/screenint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/screenint.h
rename to local/recipes/wayland/xwayland/source/include/screenint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/scrnintstr.h b/local/recipes/wayland/xwayland/source/include/scrnintstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/scrnintstr.h
rename to local/recipes/wayland/xwayland/source/include/scrnintstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/selection.h b/local/recipes/wayland/xwayland/source/include/selection.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/selection.h
rename to local/recipes/wayland/xwayland/source/include/selection.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/servermd.h b/local/recipes/wayland/xwayland/source/include/servermd.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/servermd.h
rename to local/recipes/wayland/xwayland/source/include/servermd.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/swaprep.h b/local/recipes/wayland/xwayland/source/include/swaprep.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/swaprep.h
rename to local/recipes/wayland/xwayland/source/include/swaprep.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/swapreq.h b/local/recipes/wayland/xwayland/source/include/swapreq.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/swapreq.h
rename to local/recipes/wayland/xwayland/source/include/swapreq.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/systemd-logind.h b/local/recipes/wayland/xwayland/source/include/systemd-logind.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/systemd-logind.h
rename to local/recipes/wayland/xwayland/source/include/systemd-logind.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/validate.h b/local/recipes/wayland/xwayland/source/include/validate.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/validate.h
rename to local/recipes/wayland/xwayland/source/include/validate.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/vidmodestr.h b/local/recipes/wayland/xwayland/source/include/vidmodestr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/vidmodestr.h
rename to local/recipes/wayland/xwayland/source/include/vidmodestr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/window.h b/local/recipes/wayland/xwayland/source/include/window.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/window.h
rename to local/recipes/wayland/xwayland/source/include/window.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/windowstr.h b/local/recipes/wayland/xwayland/source/include/windowstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/windowstr.h
rename to local/recipes/wayland/xwayland/source/include/windowstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xkb-config.h.in b/local/recipes/wayland/xwayland/source/include/xkb-config.h.in
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xkb-config.h.in
rename to local/recipes/wayland/xwayland/source/include/xkb-config.h.in
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xkbfile.h b/local/recipes/wayland/xwayland/source/include/xkbfile.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xkbfile.h
rename to local/recipes/wayland/xwayland/source/include/xkbfile.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xkbrules.h b/local/recipes/wayland/xwayland/source/include/xkbrules.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xkbrules.h
rename to local/recipes/wayland/xwayland/source/include/xkbrules.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xkbsrv.h b/local/recipes/wayland/xwayland/source/include/xkbsrv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xkbsrv.h
rename to local/recipes/wayland/xwayland/source/include/xkbsrv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xkbstr.h b/local/recipes/wayland/xwayland/source/include/xkbstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xkbstr.h
rename to local/recipes/wayland/xwayland/source/include/xkbstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xserver-properties.h b/local/recipes/wayland/xwayland/source/include/xserver-properties.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xserver-properties.h
rename to local/recipes/wayland/xwayland/source/include/xserver-properties.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xserver_poll.h b/local/recipes/wayland/xwayland/source/include/xserver_poll.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xserver_poll.h
rename to local/recipes/wayland/xwayland/source/include/xserver_poll.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/include/xwayland-config.h.meson.in b/local/recipes/wayland/xwayland/source/include/xwayland-config.h.meson.in
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/include/xwayland-config.h.meson.in
rename to local/recipes/wayland/xwayland/source/include/xwayland-config.h.meson.in
diff --git a/local/recipes/wayland/xwayland/source.tmp/man/Xserver.man b/local/recipes/wayland/xwayland/source/man/Xserver.man
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/man/Xserver.man
rename to local/recipes/wayland/xwayland/source/man/Xserver.man
diff --git a/local/recipes/wayland/xwayland/source.tmp/man/meson.build b/local/recipes/wayland/xwayland/source/man/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/man/meson.build
rename to local/recipes/wayland/xwayland/source/man/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/meson.build b/local/recipes/wayland/xwayland/source/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/meson.build
rename to local/recipes/wayland/xwayland/source/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/meson_options.txt b/local/recipes/wayland/xwayland/source/meson_options.txt
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/meson_options.txt
rename to local/recipes/wayland/xwayland/source/meson_options.txt
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/meson.build b/local/recipes/wayland/xwayland/source/mi/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/meson.build
rename to local/recipes/wayland/xwayland/source/mi/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mi.h b/local/recipes/wayland/xwayland/source/mi/mi.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mi.h
rename to local/recipes/wayland/xwayland/source/mi/mi.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miarc.c b/local/recipes/wayland/xwayland/source/mi/miarc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miarc.c
rename to local/recipes/wayland/xwayland/source/mi/miarc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mibitblt.c b/local/recipes/wayland/xwayland/source/mi/mibitblt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mibitblt.c
rename to local/recipes/wayland/xwayland/source/mi/mibitblt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/micmap.c b/local/recipes/wayland/xwayland/source/mi/micmap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/micmap.c
rename to local/recipes/wayland/xwayland/source/mi/micmap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/micmap.h b/local/recipes/wayland/xwayland/source/mi/micmap.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/micmap.h
rename to local/recipes/wayland/xwayland/source/mi/micmap.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/micoord.h b/local/recipes/wayland/xwayland/source/mi/micoord.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/micoord.h
rename to local/recipes/wayland/xwayland/source/mi/micoord.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/micopy.c b/local/recipes/wayland/xwayland/source/mi/micopy.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/micopy.c
rename to local/recipes/wayland/xwayland/source/mi/micopy.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/midash.c b/local/recipes/wayland/xwayland/source/mi/midash.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/midash.c
rename to local/recipes/wayland/xwayland/source/mi/midash.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/midispcur.c b/local/recipes/wayland/xwayland/source/mi/midispcur.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/midispcur.c
rename to local/recipes/wayland/xwayland/source/mi/midispcur.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mieq.c b/local/recipes/wayland/xwayland/source/mi/mieq.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mieq.c
rename to local/recipes/wayland/xwayland/source/mi/mieq.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miexpose.c b/local/recipes/wayland/xwayland/source/mi/miexpose.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miexpose.c
rename to local/recipes/wayland/xwayland/source/mi/miexpose.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mifillarc.c b/local/recipes/wayland/xwayland/source/mi/mifillarc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mifillarc.c
rename to local/recipes/wayland/xwayland/source/mi/mifillarc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mifillarc.h b/local/recipes/wayland/xwayland/source/mi/mifillarc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mifillarc.h
rename to local/recipes/wayland/xwayland/source/mi/mifillarc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mifillrct.c b/local/recipes/wayland/xwayland/source/mi/mifillrct.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mifillrct.c
rename to local/recipes/wayland/xwayland/source/mi/mifillrct.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mifpoly.h b/local/recipes/wayland/xwayland/source/mi/mifpoly.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mifpoly.h
rename to local/recipes/wayland/xwayland/source/mi/mifpoly.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/migc.c b/local/recipes/wayland/xwayland/source/mi/migc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/migc.c
rename to local/recipes/wayland/xwayland/source/mi/migc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/migc.h b/local/recipes/wayland/xwayland/source/mi/migc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/migc.h
rename to local/recipes/wayland/xwayland/source/mi/migc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miglblt.c b/local/recipes/wayland/xwayland/source/mi/miglblt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miglblt.c
rename to local/recipes/wayland/xwayland/source/mi/miglblt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miinitext.c b/local/recipes/wayland/xwayland/source/mi/miinitext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miinitext.c
rename to local/recipes/wayland/xwayland/source/mi/miinitext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miinitext.h b/local/recipes/wayland/xwayland/source/mi/miinitext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miinitext.h
rename to local/recipes/wayland/xwayland/source/mi/miinitext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miline.h b/local/recipes/wayland/xwayland/source/mi/miline.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miline.h
rename to local/recipes/wayland/xwayland/source/mi/miline.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mioverlay.c b/local/recipes/wayland/xwayland/source/mi/mioverlay.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mioverlay.c
rename to local/recipes/wayland/xwayland/source/mi/mioverlay.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mioverlay.h b/local/recipes/wayland/xwayland/source/mi/mioverlay.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mioverlay.h
rename to local/recipes/wayland/xwayland/source/mi/mioverlay.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipointer.c b/local/recipes/wayland/xwayland/source/mi/mipointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipointer.c
rename to local/recipes/wayland/xwayland/source/mi/mipointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipointer.h b/local/recipes/wayland/xwayland/source/mi/mipointer.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipointer.h
rename to local/recipes/wayland/xwayland/source/mi/mipointer.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipointrst.h b/local/recipes/wayland/xwayland/source/mi/mipointrst.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipointrst.h
rename to local/recipes/wayland/xwayland/source/mi/mipointrst.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipoly.c b/local/recipes/wayland/xwayland/source/mi/mipoly.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipoly.c
rename to local/recipes/wayland/xwayland/source/mi/mipoly.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipoly.h b/local/recipes/wayland/xwayland/source/mi/mipoly.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipoly.h
rename to local/recipes/wayland/xwayland/source/mi/mipoly.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipolypnt.c b/local/recipes/wayland/xwayland/source/mi/mipolypnt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipolypnt.c
rename to local/recipes/wayland/xwayland/source/mi/mipolypnt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipolyrect.c b/local/recipes/wayland/xwayland/source/mi/mipolyrect.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipolyrect.c
rename to local/recipes/wayland/xwayland/source/mi/mipolyrect.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipolyseg.c b/local/recipes/wayland/xwayland/source/mi/mipolyseg.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipolyseg.c
rename to local/recipes/wayland/xwayland/source/mi/mipolyseg.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipolytext.c b/local/recipes/wayland/xwayland/source/mi/mipolytext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipolytext.c
rename to local/recipes/wayland/xwayland/source/mi/mipolytext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mipushpxl.c b/local/recipes/wayland/xwayland/source/mi/mipushpxl.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mipushpxl.c
rename to local/recipes/wayland/xwayland/source/mi/mipushpxl.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miscanfill.h b/local/recipes/wayland/xwayland/source/mi/miscanfill.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miscanfill.h
rename to local/recipes/wayland/xwayland/source/mi/miscanfill.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miscrinit.c b/local/recipes/wayland/xwayland/source/mi/miscrinit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miscrinit.c
rename to local/recipes/wayland/xwayland/source/mi/miscrinit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/misprite.c b/local/recipes/wayland/xwayland/source/mi/misprite.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/misprite.c
rename to local/recipes/wayland/xwayland/source/mi/misprite.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/misprite.h b/local/recipes/wayland/xwayland/source/mi/misprite.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/misprite.h
rename to local/recipes/wayland/xwayland/source/mi/misprite.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mistruct.h b/local/recipes/wayland/xwayland/source/mi/mistruct.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mistruct.h
rename to local/recipes/wayland/xwayland/source/mi/mistruct.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mivalidate.h b/local/recipes/wayland/xwayland/source/mi/mivalidate.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mivalidate.h
rename to local/recipes/wayland/xwayland/source/mi/mivalidate.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mivaltree.c b/local/recipes/wayland/xwayland/source/mi/mivaltree.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mivaltree.c
rename to local/recipes/wayland/xwayland/source/mi/mivaltree.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miwideline.c b/local/recipes/wayland/xwayland/source/mi/miwideline.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miwideline.c
rename to local/recipes/wayland/xwayland/source/mi/miwideline.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miwideline.h b/local/recipes/wayland/xwayland/source/mi/miwideline.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miwideline.h
rename to local/recipes/wayland/xwayland/source/mi/miwideline.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/miwindow.c b/local/recipes/wayland/xwayland/source/mi/miwindow.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/miwindow.c
rename to local/recipes/wayland/xwayland/source/mi/miwindow.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mizerarc.c b/local/recipes/wayland/xwayland/source/mi/mizerarc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mizerarc.c
rename to local/recipes/wayland/xwayland/source/mi/mizerarc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mizerarc.h b/local/recipes/wayland/xwayland/source/mi/mizerarc.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mizerarc.h
rename to local/recipes/wayland/xwayland/source/mi/mizerarc.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mizerclip.c b/local/recipes/wayland/xwayland/source/mi/mizerclip.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mizerclip.c
rename to local/recipes/wayland/xwayland/source/mi/mizerclip.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/mi/mizerline.c b/local/recipes/wayland/xwayland/source/mi/mizerline.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/mi/mizerline.c
rename to local/recipes/wayland/xwayland/source/mi/mizerline.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/damage/damage.c b/local/recipes/wayland/xwayland/source/miext/damage/damage.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/damage/damage.c
rename to local/recipes/wayland/xwayland/source/miext/damage/damage.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/damage/damage.h b/local/recipes/wayland/xwayland/source/miext/damage/damage.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/damage/damage.h
rename to local/recipes/wayland/xwayland/source/miext/damage/damage.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/damage/damagestr.h b/local/recipes/wayland/xwayland/source/miext/damage/damagestr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/damage/damagestr.h
rename to local/recipes/wayland/xwayland/source/miext/damage/damagestr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/damage/meson.build b/local/recipes/wayland/xwayland/source/miext/damage/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/damage/meson.build
rename to local/recipes/wayland/xwayland/source/miext/damage/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/meson.build b/local/recipes/wayland/xwayland/source/miext/sync/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/meson.build
rename to local/recipes/wayland/xwayland/source/miext/sync/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misync.c b/local/recipes/wayland/xwayland/source/miext/sync/misync.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misync.c
rename to local/recipes/wayland/xwayland/source/miext/sync/misync.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misync.h b/local/recipes/wayland/xwayland/source/miext/sync/misync.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misync.h
rename to local/recipes/wayland/xwayland/source/miext/sync/misync.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misync_priv.h b/local/recipes/wayland/xwayland/source/miext/sync/misync_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misync_priv.h
rename to local/recipes/wayland/xwayland/source/miext/sync/misync_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncfd.c b/local/recipes/wayland/xwayland/source/miext/sync/misyncfd.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncfd.c
rename to local/recipes/wayland/xwayland/source/miext/sync/misyncfd.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncfd.h b/local/recipes/wayland/xwayland/source/miext/sync/misyncfd.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncfd.h
rename to local/recipes/wayland/xwayland/source/miext/sync/misyncfd.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncshm.c b/local/recipes/wayland/xwayland/source/miext/sync/misyncshm.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncshm.c
rename to local/recipes/wayland/xwayland/source/miext/sync/misyncshm.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncshm.h b/local/recipes/wayland/xwayland/source/miext/sync/misyncshm.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncshm.h
rename to local/recipes/wayland/xwayland/source/miext/sync/misyncshm.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncstr.h b/local/recipes/wayland/xwayland/source/miext/sync/misyncstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/miext/sync/misyncstr.h
rename to local/recipes/wayland/xwayland/source/miext/sync/misyncstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/.gitignore b/local/recipes/wayland/xwayland/source/os/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/.gitignore
rename to local/recipes/wayland/xwayland/source/os/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/WaitFor.c b/local/recipes/wayland/xwayland/source/os/WaitFor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/WaitFor.c
rename to local/recipes/wayland/xwayland/source/os/WaitFor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/access.c b/local/recipes/wayland/xwayland/source/os/access.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/access.c
rename to local/recipes/wayland/xwayland/source/os/access.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/alloc.c b/local/recipes/wayland/xwayland/source/os/alloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/alloc.c
rename to local/recipes/wayland/xwayland/source/os/alloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/auth.c b/local/recipes/wayland/xwayland/source/os/auth.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/auth.c
rename to local/recipes/wayland/xwayland/source/os/auth.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/auth.h b/local/recipes/wayland/xwayland/source/os/auth.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/auth.h
rename to local/recipes/wayland/xwayland/source/os/auth.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/backtrace.c b/local/recipes/wayland/xwayland/source/os/backtrace.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/backtrace.c
rename to local/recipes/wayland/xwayland/source/os/backtrace.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/busfault.c b/local/recipes/wayland/xwayland/source/os/busfault.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/busfault.c
rename to local/recipes/wayland/xwayland/source/os/busfault.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/client.c b/local/recipes/wayland/xwayland/source/os/client.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/client.c
rename to local/recipes/wayland/xwayland/source/os/client.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/connection.c b/local/recipes/wayland/xwayland/source/os/connection.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/connection.c
rename to local/recipes/wayland/xwayland/source/os/connection.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/fmt.c b/local/recipes/wayland/xwayland/source/os/fmt.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/fmt.c
rename to local/recipes/wayland/xwayland/source/os/fmt.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/fmt.h b/local/recipes/wayland/xwayland/source/os/fmt.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/fmt.h
rename to local/recipes/wayland/xwayland/source/os/fmt.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/inputthread.c b/local/recipes/wayland/xwayland/source/os/inputthread.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/inputthread.c
rename to local/recipes/wayland/xwayland/source/os/inputthread.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/io.c b/local/recipes/wayland/xwayland/source/os/io.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/io.c
rename to local/recipes/wayland/xwayland/source/os/io.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/log.c b/local/recipes/wayland/xwayland/source/os/log.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/log.c
rename to local/recipes/wayland/xwayland/source/os/log.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/meson.build b/local/recipes/wayland/xwayland/source/os/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/meson.build
rename to local/recipes/wayland/xwayland/source/os/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/mitauth.c b/local/recipes/wayland/xwayland/source/os/mitauth.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/mitauth.c
rename to local/recipes/wayland/xwayland/source/os/mitauth.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/mitauth.h b/local/recipes/wayland/xwayland/source/os/mitauth.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/mitauth.h
rename to local/recipes/wayland/xwayland/source/os/mitauth.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/oscolor.c b/local/recipes/wayland/xwayland/source/os/oscolor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/oscolor.c
rename to local/recipes/wayland/xwayland/source/os/oscolor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/osdep.h b/local/recipes/wayland/xwayland/source/os/osdep.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/osdep.h
rename to local/recipes/wayland/xwayland/source/os/osdep.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/osinit.c b/local/recipes/wayland/xwayland/source/os/osinit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/osinit.c
rename to local/recipes/wayland/xwayland/source/os/osinit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/ospoll.c b/local/recipes/wayland/xwayland/source/os/ospoll.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/ospoll.c
rename to local/recipes/wayland/xwayland/source/os/ospoll.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/ospoll.h b/local/recipes/wayland/xwayland/source/os/ospoll.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/ospoll.h
rename to local/recipes/wayland/xwayland/source/os/ospoll.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/reallocarray.c b/local/recipes/wayland/xwayland/source/os/reallocarray.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/reallocarray.c
rename to local/recipes/wayland/xwayland/source/os/reallocarray.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/rpcauth.c b/local/recipes/wayland/xwayland/source/os/rpcauth.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/rpcauth.c
rename to local/recipes/wayland/xwayland/source/os/rpcauth.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/rpcauth.h b/local/recipes/wayland/xwayland/source/os/rpcauth.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/rpcauth.h
rename to local/recipes/wayland/xwayland/source/os/rpcauth.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/strcasecmp.c b/local/recipes/wayland/xwayland/source/os/strcasecmp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/strcasecmp.c
rename to local/recipes/wayland/xwayland/source/os/strcasecmp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/strcasestr.c b/local/recipes/wayland/xwayland/source/os/strcasestr.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/strcasestr.c
rename to local/recipes/wayland/xwayland/source/os/strcasestr.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/string.c b/local/recipes/wayland/xwayland/source/os/string.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/string.c
rename to local/recipes/wayland/xwayland/source/os/string.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/strlcat.c b/local/recipes/wayland/xwayland/source/os/strlcat.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/strlcat.c
rename to local/recipes/wayland/xwayland/source/os/strlcat.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/strlcpy.c b/local/recipes/wayland/xwayland/source/os/strlcpy.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/strlcpy.c
rename to local/recipes/wayland/xwayland/source/os/strlcpy.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/strndup.c b/local/recipes/wayland/xwayland/source/os/strndup.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/strndup.c
rename to local/recipes/wayland/xwayland/source/os/strndup.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/timingsafe_memcmp.c b/local/recipes/wayland/xwayland/source/os/timingsafe_memcmp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/timingsafe_memcmp.c
rename to local/recipes/wayland/xwayland/source/os/timingsafe_memcmp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/utils.c b/local/recipes/wayland/xwayland/source/os/utils.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/utils.c
rename to local/recipes/wayland/xwayland/source/os/utils.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xdmauth.c b/local/recipes/wayland/xwayland/source/os/xdmauth.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xdmauth.c
rename to local/recipes/wayland/xwayland/source/os/xdmauth.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xdmauth.h b/local/recipes/wayland/xwayland/source/os/xdmauth.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xdmauth.h
rename to local/recipes/wayland/xwayland/source/os/xdmauth.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xdmcp.c b/local/recipes/wayland/xwayland/source/os/xdmcp.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xdmcp.c
rename to local/recipes/wayland/xwayland/source/os/xdmcp.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xdmcp.h b/local/recipes/wayland/xwayland/source/os/xdmcp.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xdmcp.h
rename to local/recipes/wayland/xwayland/source/os/xdmcp.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xprintf.c b/local/recipes/wayland/xwayland/source/os/xprintf.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xprintf.c
rename to local/recipes/wayland/xwayland/source/os/xprintf.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xserver_poll.c b/local/recipes/wayland/xwayland/source/os/xserver_poll.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xserver_poll.c
rename to local/recipes/wayland/xwayland/source/os/xserver_poll.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xsha1.c b/local/recipes/wayland/xwayland/source/os/xsha1.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xsha1.c
rename to local/recipes/wayland/xwayland/source/os/xsha1.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xsha1.h b/local/recipes/wayland/xwayland/source/os/xsha1.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xsha1.h
rename to local/recipes/wayland/xwayland/source/os/xsha1.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/os/xstrans.c b/local/recipes/wayland/xwayland/source/os/xstrans.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/os/xstrans.c
rename to local/recipes/wayland/xwayland/source/os/xstrans.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/meson.build b/local/recipes/wayland/xwayland/source/present/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/meson.build
rename to local/recipes/wayland/xwayland/source/present/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present.c b/local/recipes/wayland/xwayland/source/present/present.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present.c
rename to local/recipes/wayland/xwayland/source/present/present.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present.h b/local/recipes/wayland/xwayland/source/present/present.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present.h
rename to local/recipes/wayland/xwayland/source/present/present.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_event.c b/local/recipes/wayland/xwayland/source/present/present_event.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_event.c
rename to local/recipes/wayland/xwayland/source/present/present_event.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_execute.c b/local/recipes/wayland/xwayland/source/present/present_execute.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_execute.c
rename to local/recipes/wayland/xwayland/source/present/present_execute.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_fake.c b/local/recipes/wayland/xwayland/source/present/present_fake.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_fake.c
rename to local/recipes/wayland/xwayland/source/present/present_fake.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_fence.c b/local/recipes/wayland/xwayland/source/present/present_fence.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_fence.c
rename to local/recipes/wayland/xwayland/source/present/present_fence.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_notify.c b/local/recipes/wayland/xwayland/source/present/present_notify.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_notify.c
rename to local/recipes/wayland/xwayland/source/present/present_notify.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_priv.h b/local/recipes/wayland/xwayland/source/present/present_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_priv.h
rename to local/recipes/wayland/xwayland/source/present/present_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_request.c b/local/recipes/wayland/xwayland/source/present/present_request.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_request.c
rename to local/recipes/wayland/xwayland/source/present/present_request.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_scmd.c b/local/recipes/wayland/xwayland/source/present/present_scmd.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_scmd.c
rename to local/recipes/wayland/xwayland/source/present/present_scmd.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_screen.c b/local/recipes/wayland/xwayland/source/present/present_screen.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_screen.c
rename to local/recipes/wayland/xwayland/source/present/present_screen.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/present_vblank.c b/local/recipes/wayland/xwayland/source/present/present_vblank.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/present_vblank.c
rename to local/recipes/wayland/xwayland/source/present/present_vblank.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/present/presentext.h b/local/recipes/wayland/xwayland/source/present/presentext.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/present/presentext.h
rename to local/recipes/wayland/xwayland/source/present/presentext.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/meson.build b/local/recipes/wayland/xwayland/source/randr/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/meson.build
rename to local/recipes/wayland/xwayland/source/randr/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/randr.c b/local/recipes/wayland/xwayland/source/randr/randr.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/randr.c
rename to local/recipes/wayland/xwayland/source/randr/randr.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/randrstr.h b/local/recipes/wayland/xwayland/source/randr/randrstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/randrstr.h
rename to local/recipes/wayland/xwayland/source/randr/randrstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/randrstr_priv.h b/local/recipes/wayland/xwayland/source/randr/randrstr_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/randrstr_priv.h
rename to local/recipes/wayland/xwayland/source/randr/randrstr_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrcrtc.c b/local/recipes/wayland/xwayland/source/randr/rrcrtc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrcrtc.c
rename to local/recipes/wayland/xwayland/source/randr/rrcrtc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrdispatch.c b/local/recipes/wayland/xwayland/source/randr/rrdispatch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrdispatch.c
rename to local/recipes/wayland/xwayland/source/randr/rrdispatch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrinfo.c b/local/recipes/wayland/xwayland/source/randr/rrinfo.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrinfo.c
rename to local/recipes/wayland/xwayland/source/randr/rrinfo.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrlease.c b/local/recipes/wayland/xwayland/source/randr/rrlease.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrlease.c
rename to local/recipes/wayland/xwayland/source/randr/rrlease.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrmode.c b/local/recipes/wayland/xwayland/source/randr/rrmode.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrmode.c
rename to local/recipes/wayland/xwayland/source/randr/rrmode.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrmonitor.c b/local/recipes/wayland/xwayland/source/randr/rrmonitor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrmonitor.c
rename to local/recipes/wayland/xwayland/source/randr/rrmonitor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rroutput.c b/local/recipes/wayland/xwayland/source/randr/rroutput.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rroutput.c
rename to local/recipes/wayland/xwayland/source/randr/rroutput.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrpointer.c b/local/recipes/wayland/xwayland/source/randr/rrpointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrpointer.c
rename to local/recipes/wayland/xwayland/source/randr/rrpointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrproperty.c b/local/recipes/wayland/xwayland/source/randr/rrproperty.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrproperty.c
rename to local/recipes/wayland/xwayland/source/randr/rrproperty.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrprovider.c b/local/recipes/wayland/xwayland/source/randr/rrprovider.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrprovider.c
rename to local/recipes/wayland/xwayland/source/randr/rrprovider.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrproviderproperty.c b/local/recipes/wayland/xwayland/source/randr/rrproviderproperty.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrproviderproperty.c
rename to local/recipes/wayland/xwayland/source/randr/rrproviderproperty.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrscreen.c b/local/recipes/wayland/xwayland/source/randr/rrscreen.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrscreen.c
rename to local/recipes/wayland/xwayland/source/randr/rrscreen.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrsdispatch.c b/local/recipes/wayland/xwayland/source/randr/rrsdispatch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrsdispatch.c
rename to local/recipes/wayland/xwayland/source/randr/rrsdispatch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrtransform.c b/local/recipes/wayland/xwayland/source/randr/rrtransform.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrtransform.c
rename to local/recipes/wayland/xwayland/source/randr/rrtransform.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrtransform.h b/local/recipes/wayland/xwayland/source/randr/rrtransform.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrtransform.h
rename to local/recipes/wayland/xwayland/source/randr/rrtransform.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/randr/rrxinerama.c b/local/recipes/wayland/xwayland/source/randr/rrxinerama.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/randr/rrxinerama.c
rename to local/recipes/wayland/xwayland/source/randr/rrxinerama.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/record/meson.build b/local/recipes/wayland/xwayland/source/record/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/record/meson.build
rename to local/recipes/wayland/xwayland/source/record/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/record/record.c b/local/recipes/wayland/xwayland/source/record/record.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/record/record.c
rename to local/recipes/wayland/xwayland/source/record/record.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/record/set.c b/local/recipes/wayland/xwayland/source/record/set.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/record/set.c
rename to local/recipes/wayland/xwayland/source/record/set.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/record/set.h b/local/recipes/wayland/xwayland/source/record/set.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/record/set.h
rename to local/recipes/wayland/xwayland/source/record/set.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/animcur.c b/local/recipes/wayland/xwayland/source/render/animcur.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/animcur.c
rename to local/recipes/wayland/xwayland/source/render/animcur.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/filter.c b/local/recipes/wayland/xwayland/source/render/filter.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/filter.c
rename to local/recipes/wayland/xwayland/source/render/filter.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/glyph.c b/local/recipes/wayland/xwayland/source/render/glyph.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/glyph.c
rename to local/recipes/wayland/xwayland/source/render/glyph.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/glyphstr.h b/local/recipes/wayland/xwayland/source/render/glyphstr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/glyphstr.h
rename to local/recipes/wayland/xwayland/source/render/glyphstr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/glyphstr_priv.h b/local/recipes/wayland/xwayland/source/render/glyphstr_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/glyphstr_priv.h
rename to local/recipes/wayland/xwayland/source/render/glyphstr_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/matrix.c b/local/recipes/wayland/xwayland/source/render/matrix.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/matrix.c
rename to local/recipes/wayland/xwayland/source/render/matrix.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/meson.build b/local/recipes/wayland/xwayland/source/render/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/meson.build
rename to local/recipes/wayland/xwayland/source/render/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/miindex.c b/local/recipes/wayland/xwayland/source/render/miindex.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/miindex.c
rename to local/recipes/wayland/xwayland/source/render/miindex.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/mipict.c b/local/recipes/wayland/xwayland/source/render/mipict.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/mipict.c
rename to local/recipes/wayland/xwayland/source/render/mipict.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/mipict.h b/local/recipes/wayland/xwayland/source/render/mipict.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/mipict.h
rename to local/recipes/wayland/xwayland/source/render/mipict.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/mirect.c b/local/recipes/wayland/xwayland/source/render/mirect.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/mirect.c
rename to local/recipes/wayland/xwayland/source/render/mirect.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/mitrap.c b/local/recipes/wayland/xwayland/source/render/mitrap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/mitrap.c
rename to local/recipes/wayland/xwayland/source/render/mitrap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/mitri.c b/local/recipes/wayland/xwayland/source/render/mitri.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/mitri.c
rename to local/recipes/wayland/xwayland/source/render/mitri.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/picture.c b/local/recipes/wayland/xwayland/source/render/picture.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/picture.c
rename to local/recipes/wayland/xwayland/source/render/picture.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/picture.h b/local/recipes/wayland/xwayland/source/render/picture.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/picture.h
rename to local/recipes/wayland/xwayland/source/render/picture.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/picturestr.h b/local/recipes/wayland/xwayland/source/render/picturestr.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/picturestr.h
rename to local/recipes/wayland/xwayland/source/render/picturestr.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/picturestr_priv.h b/local/recipes/wayland/xwayland/source/render/picturestr_priv.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/picturestr_priv.h
rename to local/recipes/wayland/xwayland/source/render/picturestr_priv.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/render/render.c b/local/recipes/wayland/xwayland/source/render/render.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/render/render.c
rename to local/recipes/wayland/xwayland/source/render/render.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/.gitignore b/local/recipes/wayland/xwayland/source/test/.gitignore
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/.gitignore
rename to local/recipes/wayland/xwayland/source/test/.gitignore
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/README b/local/recipes/wayland/xwayland/source/test/README
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/README
rename to local/recipes/wayland/xwayland/source/test/README
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/bigreq/meson.build b/local/recipes/wayland/xwayland/source/test/bigreq/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/bigreq/meson.build
rename to local/recipes/wayland/xwayland/source/test/bigreq/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/bigreq/request-length.c b/local/recipes/wayland/xwayland/source/test/bigreq/request-length.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/bigreq/request-length.c
rename to local/recipes/wayland/xwayland/source/test/bigreq/request-length.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/damage/meson.build b/local/recipes/wayland/xwayland/source/test/damage/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/damage/meson.build
rename to local/recipes/wayland/xwayland/source/test/damage/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/damage/primitives.c b/local/recipes/wayland/xwayland/source/test/damage/primitives.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/damage/primitives.c
rename to local/recipes/wayland/xwayland/source/test/damage/primitives.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/fixes.c b/local/recipes/wayland/xwayland/source/test/fixes.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/fixes.c
rename to local/recipes/wayland/xwayland/source/test/fixes.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/hashtabletest.c b/local/recipes/wayland/xwayland/source/test/hashtabletest.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/hashtabletest.c
rename to local/recipes/wayland/xwayland/source/test/hashtabletest.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/input.c b/local/recipes/wayland/xwayland/source/test/input.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/input.c
rename to local/recipes/wayland/xwayland/source/test/input.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/list.c b/local/recipes/wayland/xwayland/source/test/list.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/list.c
rename to local/recipes/wayland/xwayland/source/test/list.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/meson.build b/local/recipes/wayland/xwayland/source/test/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/meson.build
rename to local/recipes/wayland/xwayland/source/test/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/misc.c b/local/recipes/wayland/xwayland/source/test/misc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/misc.c
rename to local/recipes/wayland/xwayland/source/test/misc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/run-piglit.sh b/local/recipes/wayland/xwayland/source/test/scripts/run-piglit.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/run-piglit.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/run-piglit.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/xephyr-glamor-gles2-piglit.sh b/local/recipes/wayland/xwayland/source/test/scripts/xephyr-glamor-gles2-piglit.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/xephyr-glamor-gles2-piglit.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/xephyr-glamor-gles2-piglit.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/xephyr-glamor-gles3-piglit.sh b/local/recipes/wayland/xwayland/source/test/scripts/xephyr-glamor-gles3-piglit.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/xephyr-glamor-gles3-piglit.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/xephyr-glamor-gles3-piglit.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/xinit-piglit-session.sh b/local/recipes/wayland/xwayland/source/test/scripts/xinit-piglit-session.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/xinit-piglit-session.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/xinit-piglit-session.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/xvfb-piglit.sh b/local/recipes/wayland/xwayland/source/test/scripts/xvfb-piglit.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/xvfb-piglit.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/xvfb-piglit.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/scripts/xwayland-piglit.sh b/local/recipes/wayland/xwayland/source/test/scripts/xwayland-piglit.sh
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/scripts/xwayland-piglit.sh
rename to local/recipes/wayland/xwayland/source/test/scripts/xwayland-piglit.sh
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/signal-logging.c b/local/recipes/wayland/xwayland/source/test/signal-logging.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/signal-logging.c
rename to local/recipes/wayland/xwayland/source/test/signal-logging.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/simple-xinit.c b/local/recipes/wayland/xwayland/source/test/simple-xinit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/simple-xinit.c
rename to local/recipes/wayland/xwayland/source/test/simple-xinit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/string.c b/local/recipes/wayland/xwayland/source/test/string.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/string.c
rename to local/recipes/wayland/xwayland/source/test/string.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/sync/meson.build b/local/recipes/wayland/xwayland/source/test/sync/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/sync/meson.build
rename to local/recipes/wayland/xwayland/source/test/sync/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/sync/sync.c b/local/recipes/wayland/xwayland/source/test/sync/sync.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/sync/sync.c
rename to local/recipes/wayland/xwayland/source/test/sync/sync.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/test_xkb.c b/local/recipes/wayland/xwayland/source/test/test_xkb.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/test_xkb.c
rename to local/recipes/wayland/xwayland/source/test/test_xkb.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/tests-common.c b/local/recipes/wayland/xwayland/source/test/tests-common.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/tests-common.c
rename to local/recipes/wayland/xwayland/source/test/tests-common.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/tests-common.h b/local/recipes/wayland/xwayland/source/test/tests-common.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/tests-common.h
rename to local/recipes/wayland/xwayland/source/test/tests-common.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/tests.c b/local/recipes/wayland/xwayland/source/test/tests.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/tests.c
rename to local/recipes/wayland/xwayland/source/test/tests.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/tests.h b/local/recipes/wayland/xwayland/source/test/tests.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/tests.h
rename to local/recipes/wayland/xwayland/source/test/tests.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/touch.c b/local/recipes/wayland/xwayland/source/test/touch.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/touch.c
rename to local/recipes/wayland/xwayland/source/test/touch.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi1/protocol-xchangedevicecontrol.c b/local/recipes/wayland/xwayland/source/test/xi1/protocol-xchangedevicecontrol.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi1/protocol-xchangedevicecontrol.c
rename to local/recipes/wayland/xwayland/source/test/xi1/protocol-xchangedevicecontrol.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-common.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-common.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-common.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-common.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-common.h b/local/recipes/wayland/xwayland/source/test/xi2/protocol-common.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-common.h
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-common.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-eventconvert.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-eventconvert.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-eventconvert.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-eventconvert.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xigetclientpointer.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xigetclientpointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xigetclientpointer.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xigetclientpointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xigetselectedevents.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xigetselectedevents.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xigetselectedevents.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xigetselectedevents.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xipassivegrabdevice.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xipassivegrabdevice.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xipassivegrabdevice.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xipassivegrabdevice.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiquerydevice.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xiquerydevice.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiquerydevice.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xiquerydevice.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiquerypointer.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xiquerypointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiquerypointer.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xiquerypointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiqueryversion.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xiqueryversion.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiqueryversion.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xiqueryversion.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiselectevents.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xiselectevents.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiselectevents.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xiselectevents.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xisetclientpointer.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xisetclientpointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xisetclientpointer.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xisetclientpointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiwarppointer.c b/local/recipes/wayland/xwayland/source/test/xi2/protocol-xiwarppointer.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/protocol-xiwarppointer.c
rename to local/recipes/wayland/xwayland/source/test/xi2/protocol-xiwarppointer.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xi2/xi2.c b/local/recipes/wayland/xwayland/source/test/xi2/xi2.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xi2/xi2.c
rename to local/recipes/wayland/xwayland/source/test/xi2/xi2.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/test/xtest.c b/local/recipes/wayland/xwayland/source/test/xtest.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/test/xtest.c
rename to local/recipes/wayland/xwayland/source/test/xtest.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/cursor.c b/local/recipes/wayland/xwayland/source/xfixes/cursor.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/cursor.c
rename to local/recipes/wayland/xwayland/source/xfixes/cursor.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/disconnect.c b/local/recipes/wayland/xwayland/source/xfixes/disconnect.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/disconnect.c
rename to local/recipes/wayland/xwayland/source/xfixes/disconnect.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/meson.build b/local/recipes/wayland/xwayland/source/xfixes/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/meson.build
rename to local/recipes/wayland/xwayland/source/xfixes/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/region.c b/local/recipes/wayland/xwayland/source/xfixes/region.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/region.c
rename to local/recipes/wayland/xwayland/source/xfixes/region.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/saveset.c b/local/recipes/wayland/xwayland/source/xfixes/saveset.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/saveset.c
rename to local/recipes/wayland/xwayland/source/xfixes/saveset.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/select.c b/local/recipes/wayland/xwayland/source/xfixes/select.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/select.c
rename to local/recipes/wayland/xwayland/source/xfixes/select.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/xfixes.c b/local/recipes/wayland/xwayland/source/xfixes/xfixes.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/xfixes.c
rename to local/recipes/wayland/xwayland/source/xfixes/xfixes.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/xfixes.h b/local/recipes/wayland/xwayland/source/xfixes/xfixes.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/xfixes.h
rename to local/recipes/wayland/xwayland/source/xfixes/xfixes.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/xfixes/xfixesint.h b/local/recipes/wayland/xwayland/source/xfixes/xfixesint.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xfixes/xfixesint.h
rename to local/recipes/wayland/xwayland/source/xfixes/xfixesint.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/README.compiled b/local/recipes/wayland/xwayland/source/xkb/README.compiled
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/README.compiled
rename to local/recipes/wayland/xwayland/source/xkb/README.compiled
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/XKBAlloc.c b/local/recipes/wayland/xwayland/source/xkb/XKBAlloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/XKBAlloc.c
rename to local/recipes/wayland/xwayland/source/xkb/XKBAlloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/XKBGAlloc.c b/local/recipes/wayland/xwayland/source/xkb/XKBGAlloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/XKBGAlloc.c
rename to local/recipes/wayland/xwayland/source/xkb/XKBGAlloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/XKBMAlloc.c b/local/recipes/wayland/xwayland/source/xkb/XKBMAlloc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/XKBMAlloc.c
rename to local/recipes/wayland/xwayland/source/xkb/XKBMAlloc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/XKBMisc.c b/local/recipes/wayland/xwayland/source/xkb/XKBMisc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/XKBMisc.c
rename to local/recipes/wayland/xwayland/source/xkb/XKBMisc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/XKM_file_format.txt b/local/recipes/wayland/xwayland/source/xkb/XKM_file_format.txt
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/XKM_file_format.txt
rename to local/recipes/wayland/xwayland/source/xkb/XKM_file_format.txt
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxBeep.c b/local/recipes/wayland/xwayland/source/xkb/ddxBeep.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxBeep.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxBeep.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxCtrls.c b/local/recipes/wayland/xwayland/source/xkb/ddxCtrls.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxCtrls.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxCtrls.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxKillSrv.c b/local/recipes/wayland/xwayland/source/xkb/ddxKillSrv.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxKillSrv.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxKillSrv.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxLEDs.c b/local/recipes/wayland/xwayland/source/xkb/ddxLEDs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxLEDs.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxLEDs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxLoad.c b/local/recipes/wayland/xwayland/source/xkb/ddxLoad.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxLoad.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxLoad.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxPrivate.c b/local/recipes/wayland/xwayland/source/xkb/ddxPrivate.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxPrivate.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxPrivate.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/ddxVT.c b/local/recipes/wayland/xwayland/source/xkb/ddxVT.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/ddxVT.c
rename to local/recipes/wayland/xwayland/source/xkb/ddxVT.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/maprules.c b/local/recipes/wayland/xwayland/source/xkb/maprules.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/maprules.c
rename to local/recipes/wayland/xwayland/source/xkb/maprules.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/meson.build b/local/recipes/wayland/xwayland/source/xkb/meson.build
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/meson.build
rename to local/recipes/wayland/xwayland/source/xkb/meson.build
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkb-procs.h b/local/recipes/wayland/xwayland/source/xkb/xkb-procs.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkb-procs.h
rename to local/recipes/wayland/xwayland/source/xkb/xkb-procs.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkb.c b/local/recipes/wayland/xwayland/source/xkb/xkb.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkb.c
rename to local/recipes/wayland/xwayland/source/xkb/xkb.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbAccessX.c b/local/recipes/wayland/xwayland/source/xkb/xkbAccessX.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbAccessX.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbAccessX.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbActions.c b/local/recipes/wayland/xwayland/source/xkb/xkbActions.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbActions.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbActions.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbDflts.h b/local/recipes/wayland/xwayland/source/xkb/xkbDflts.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbDflts.h
rename to local/recipes/wayland/xwayland/source/xkb/xkbDflts.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbEvents.c b/local/recipes/wayland/xwayland/source/xkb/xkbEvents.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbEvents.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbEvents.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbInit.c b/local/recipes/wayland/xwayland/source/xkb/xkbInit.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbInit.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbInit.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbLEDs.c b/local/recipes/wayland/xwayland/source/xkb/xkbLEDs.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbLEDs.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbLEDs.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbPrKeyEv.c b/local/recipes/wayland/xwayland/source/xkb/xkbPrKeyEv.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbPrKeyEv.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbPrKeyEv.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbSwap.c b/local/recipes/wayland/xwayland/source/xkb/xkbSwap.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbSwap.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbSwap.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbUtils.c b/local/recipes/wayland/xwayland/source/xkb/xkbUtils.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbUtils.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbUtils.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbfmisc.c b/local/recipes/wayland/xwayland/source/xkb/xkbfmisc.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbfmisc.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbfmisc.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbgeom.h b/local/recipes/wayland/xwayland/source/xkb/xkbgeom.h
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbgeom.h
rename to local/recipes/wayland/xwayland/source/xkb/xkbgeom.h
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbout.c b/local/recipes/wayland/xwayland/source/xkb/xkbout.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbout.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbout.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkbtext.c b/local/recipes/wayland/xwayland/source/xkb/xkbtext.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkbtext.c
rename to local/recipes/wayland/xwayland/source/xkb/xkbtext.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xkb/xkmread.c b/local/recipes/wayland/xwayland/source/xkb/xkmread.c
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xkb/xkmread.c
rename to local/recipes/wayland/xwayland/source/xkb/xkmread.c
diff --git a/local/recipes/wayland/xwayland/source.tmp/xserver.ent.in b/local/recipes/wayland/xwayland/source/xserver.ent.in
similarity index 100%
rename from local/recipes/wayland/xwayland/source.tmp/xserver.ent.in
rename to local/recipes/wayland/xwayland/source/xserver.ent.in