diff --git a/x11-packages/angle-android/args.gn.in b/packages/angle-android/args.gn.in
similarity index 100%
rename from x11-packages/angle-android/args.gn.in
rename to packages/angle-android/args.gn.in
diff --git a/x11-packages/angle-android/build.sh b/packages/angle-android/build.sh
similarity index 100%
rename from x11-packages/angle-android/build.sh
rename to packages/angle-android/build.sh
diff --git a/x11-packages/libepoxy/build.sh b/packages/libepoxy/build.sh
similarity index 100%
rename from x11-packages/libepoxy/build.sh
rename to packages/libepoxy/build.sh
diff --git a/x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch b/packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch
similarity index 100%
rename from x11-packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch
rename to packages/libepoxy/libepoxy-1.5.3_src_dispatch_common.c.patch
diff --git a/x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild b/packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
rename to packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0002-avoid-gnu-offsetof-extensions-error.patch.beforehostbuild b/packages/virglrenderer-android/0002-avoid-gnu-offsetof-extensions-error.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0002-avoid-gnu-offsetof-extensions-error.patch.beforehostbuild
rename to packages/virglrenderer-android/0002-avoid-gnu-offsetof-extensions-error.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0003-test-angle.patch.beforehostbuild b/packages/virglrenderer-android/0003-test-angle.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0003-test-angle.patch.beforehostbuild
rename to packages/virglrenderer-android/0003-test-angle.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0004-Fallback-to-ashmem.patch.beforehostbuild b/packages/virglrenderer-android/0004-Fallback-to-ashmem.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0004-Fallback-to-ashmem.patch.beforehostbuild
rename to packages/virglrenderer-android/0004-Fallback-to-ashmem.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild b/packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
rename to packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0006-Disable-feature-feat_dual_src_blend.patch.beforehostbuild b/packages/virglrenderer-android/0006-Disable-feature-feat_dual_src_blend.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0006-Disable-feature-feat_dual_src_blend.patch.beforehostbuild
rename to packages/virglrenderer-android/0006-Disable-feature-feat_dual_src_blend.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0007-Ensure-EGL-and-GLES.patch.beforehostbuild b/packages/virglrenderer-android/0007-Ensure-EGL-and-GLES.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0007-Ensure-EGL-and-GLES.patch.beforehostbuild
rename to packages/virglrenderer-android/0007-Ensure-EGL-and-GLES.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0008-Change-vtest-socket-path.patch.beforehostbuild b/packages/virglrenderer-android/0008-Change-vtest-socket-path.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0008-Change-vtest-socket-path.patch.beforehostbuild
rename to packages/virglrenderer-android/0008-Change-vtest-socket-path.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/0009-Impl-DXTn-S3TC-texture-decompression-in-virglrenderer.patch.beforehostbuild b/packages/virglrenderer-android/0009-Impl-DXTn-S3TC-texture-decompression-in-virglrenderer.patch.beforehostbuild
similarity index 100%
rename from x11-packages/virglrenderer-android/0009-Impl-DXTn-S3TC-texture-decompression-in-virglrenderer.patch.beforehostbuild
rename to packages/virglrenderer-android/0009-Impl-DXTn-S3TC-texture-decompression-in-virglrenderer.patch.beforehostbuild
diff --git a/x11-packages/virglrenderer-android/COPYING-gl4es b/packages/virglrenderer-android/COPYING-gl4es
similarity index 100%
rename from x11-packages/virglrenderer-android/COPYING-gl4es
rename to packages/virglrenderer-android/COPYING-gl4es
diff --git a/x11-packages/virglrenderer-android/build.sh b/packages/virglrenderer-android/build.sh
similarity index 100%
rename from x11-packages/virglrenderer-android/build.sh
rename to packages/virglrenderer-android/build.sh
diff --git a/x11-packages/virglrenderer-android/virgl_test_server_android.in b/packages/virglrenderer-android/virgl_test_server_android.in
similarity index 100%
rename from x11-packages/virglrenderer-android/virgl_test_server_android.in
rename to packages/virglrenderer-android/virgl_test_server_android.in
diff --git a/x11-packages/virglrenderer/build.sh b/packages/virglrenderer/build.sh
similarity index 100%
rename from x11-packages/virglrenderer/build.sh
rename to packages/virglrenderer/build.sh
diff --git a/x11-packages/virglrenderer/vtest-vtest_protocol.h.patch b/packages/virglrenderer/vtest-vtest_protocol.h.patch
similarity index 100%
rename from x11-packages/virglrenderer/vtest-vtest_protocol.h.patch
rename to packages/virglrenderer/vtest-vtest_protocol.h.patch