diff --git a/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD
similarity index 100%
rename from binutils-aarch64/APKBUILD
rename to cross/binutils-aarch64/APKBUILD
diff --git a/binutils-aarch64/CVE-2017-7614.patch b/cross/binutils-aarch64/CVE-2017-7614.patch
similarity index 100%
rename from binutils-aarch64/CVE-2017-7614.patch
rename to cross/binutils-aarch64/CVE-2017-7614.patch
diff --git a/binutils-aarch64/binutils-ld-fix-static-linking.patch b/cross/binutils-aarch64/binutils-ld-fix-static-linking.patch
similarity index 100%
rename from binutils-aarch64/binutils-ld-fix-static-linking.patch
rename to cross/binutils-aarch64/binutils-ld-fix-static-linking.patch
diff --git a/binutils-aarch64/hash-style-gnu.patch b/cross/binutils-aarch64/hash-style-gnu.patch
similarity index 100%
rename from binutils-aarch64/hash-style-gnu.patch
rename to cross/binutils-aarch64/hash-style-gnu.patch
diff --git a/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD
similarity index 100%
rename from binutils-armhf/APKBUILD
rename to cross/binutils-armhf/APKBUILD
diff --git a/binutils-armhf/CVE-2017-7614.patch b/cross/binutils-armhf/CVE-2017-7614.patch
similarity index 100%
rename from binutils-armhf/CVE-2017-7614.patch
rename to cross/binutils-armhf/CVE-2017-7614.patch
diff --git a/binutils-armhf/binutils-ld-fix-static-linking.patch b/cross/binutils-armhf/binutils-ld-fix-static-linking.patch
similarity index 100%
rename from binutils-armhf/binutils-ld-fix-static-linking.patch
rename to cross/binutils-armhf/binutils-ld-fix-static-linking.patch
diff --git a/binutils-armhf/hash-style-gnu.patch b/cross/binutils-armhf/hash-style-gnu.patch
similarity index 100%
rename from binutils-armhf/hash-style-gnu.patch
rename to cross/binutils-armhf/hash-style-gnu.patch
diff --git a/busybox-static-aarch64/APKBUILD b/cross/busybox-static-aarch64/APKBUILD
similarity index 100%
rename from busybox-static-aarch64/APKBUILD
rename to cross/busybox-static-aarch64/APKBUILD
diff --git a/busybox-static-armhf/APKBUILD b/cross/busybox-static-armhf/APKBUILD
similarity index 100%
rename from busybox-static-armhf/APKBUILD
rename to cross/busybox-static-armhf/APKBUILD
diff --git a/gcc-aarch64/001_all_default-ssp-strong.patch b/cross/gcc-aarch64/001_all_default-ssp-strong.patch
similarity index 100%
rename from gcc-aarch64/001_all_default-ssp-strong.patch
rename to cross/gcc-aarch64/001_all_default-ssp-strong.patch
diff --git a/gcc-aarch64/002_all_default-relro.patch b/cross/gcc-aarch64/002_all_default-relro.patch
similarity index 100%
rename from gcc-aarch64/002_all_default-relro.patch
rename to cross/gcc-aarch64/002_all_default-relro.patch
diff --git a/gcc-aarch64/003_all_default-fortify-source.patch b/cross/gcc-aarch64/003_all_default-fortify-source.patch
similarity index 100%
rename from gcc-aarch64/003_all_default-fortify-source.patch
rename to cross/gcc-aarch64/003_all_default-fortify-source.patch
diff --git a/gcc-aarch64/005_all_default-as-needed.patch b/cross/gcc-aarch64/005_all_default-as-needed.patch
similarity index 100%
rename from gcc-aarch64/005_all_default-as-needed.patch
rename to cross/gcc-aarch64/005_all_default-as-needed.patch
diff --git a/gcc-aarch64/011_all_default-warn-format-security.patch b/cross/gcc-aarch64/011_all_default-warn-format-security.patch
similarity index 100%
rename from gcc-aarch64/011_all_default-warn-format-security.patch
rename to cross/gcc-aarch64/011_all_default-warn-format-security.patch
diff --git a/gcc-aarch64/012_all_default-warn-trampolines.patch b/cross/gcc-aarch64/012_all_default-warn-trampolines.patch
similarity index 100%
rename from gcc-aarch64/012_all_default-warn-trampolines.patch
rename to cross/gcc-aarch64/012_all_default-warn-trampolines.patch
diff --git a/gcc-aarch64/020_all_msgfmt-libstdc++-link.patch b/cross/gcc-aarch64/020_all_msgfmt-libstdc++-link.patch
similarity index 100%
rename from gcc-aarch64/020_all_msgfmt-libstdc++-link.patch
rename to cross/gcc-aarch64/020_all_msgfmt-libstdc++-link.patch
diff --git a/gcc-aarch64/050_all_libiberty-asprintf.patch b/cross/gcc-aarch64/050_all_libiberty-asprintf.patch
similarity index 100%
rename from gcc-aarch64/050_all_libiberty-asprintf.patch
rename to cross/gcc-aarch64/050_all_libiberty-asprintf.patch
diff --git a/gcc-aarch64/051_all_libiberty-pic.patch b/cross/gcc-aarch64/051_all_libiberty-pic.patch
similarity index 100%
rename from gcc-aarch64/051_all_libiberty-pic.patch
rename to cross/gcc-aarch64/051_all_libiberty-pic.patch
diff --git a/gcc-aarch64/053_all_libitm-no-fortify-source.patch b/cross/gcc-aarch64/053_all_libitm-no-fortify-source.patch
similarity index 100%
rename from gcc-aarch64/053_all_libitm-no-fortify-source.patch
rename to cross/gcc-aarch64/053_all_libitm-no-fortify-source.patch
diff --git a/gcc-aarch64/067_all_gcc-poison-system-directories.patch b/cross/gcc-aarch64/067_all_gcc-poison-system-directories.patch
similarity index 100%
rename from gcc-aarch64/067_all_gcc-poison-system-directories.patch
rename to cross/gcc-aarch64/067_all_gcc-poison-system-directories.patch
diff --git a/gcc-aarch64/090_all_pr55930-dependency-tracking.patch b/cross/gcc-aarch64/090_all_pr55930-dependency-tracking.patch
similarity index 100%
rename from gcc-aarch64/090_all_pr55930-dependency-tracking.patch
rename to cross/gcc-aarch64/090_all_pr55930-dependency-tracking.patch
diff --git a/gcc-aarch64/201-cilkrts.patch b/cross/gcc-aarch64/201-cilkrts.patch
similarity index 100%
rename from gcc-aarch64/201-cilkrts.patch
rename to cross/gcc-aarch64/201-cilkrts.patch
diff --git a/gcc-aarch64/203-libgcc_s.patch b/cross/gcc-aarch64/203-libgcc_s.patch
similarity index 100%
rename from gcc-aarch64/203-libgcc_s.patch
rename to cross/gcc-aarch64/203-libgcc_s.patch
diff --git a/gcc-aarch64/204-linux_libc_has_function.patch b/cross/gcc-aarch64/204-linux_libc_has_function.patch
similarity index 100%
rename from gcc-aarch64/204-linux_libc_has_function.patch
rename to cross/gcc-aarch64/204-linux_libc_has_function.patch
diff --git a/gcc-aarch64/205-nopie.patch b/cross/gcc-aarch64/205-nopie.patch
similarity index 100%
rename from gcc-aarch64/205-nopie.patch
rename to cross/gcc-aarch64/205-nopie.patch
diff --git a/gcc-aarch64/207-static-pie.patch b/cross/gcc-aarch64/207-static-pie.patch
similarity index 100%
rename from gcc-aarch64/207-static-pie.patch
rename to cross/gcc-aarch64/207-static-pie.patch
diff --git a/gcc-aarch64/300-main-gcc-add-musl-s390x-dynamic-linker.patch b/cross/gcc-aarch64/300-main-gcc-add-musl-s390x-dynamic-linker.patch
similarity index 100%
rename from gcc-aarch64/300-main-gcc-add-musl-s390x-dynamic-linker.patch
rename to cross/gcc-aarch64/300-main-gcc-add-musl-s390x-dynamic-linker.patch
diff --git a/gcc-aarch64/310-build-gcj-s390x.patch b/cross/gcc-aarch64/310-build-gcj-s390x.patch
similarity index 100%
rename from gcc-aarch64/310-build-gcj-s390x.patch
rename to cross/gcc-aarch64/310-build-gcj-s390x.patch
diff --git a/gcc-aarch64/320-libffi-gnulinux.patch b/cross/gcc-aarch64/320-libffi-gnulinux.patch
similarity index 100%
rename from gcc-aarch64/320-libffi-gnulinux.patch
rename to cross/gcc-aarch64/320-libffi-gnulinux.patch
diff --git a/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
similarity index 100%
rename from gcc-aarch64/APKBUILD
rename to cross/gcc-aarch64/APKBUILD
diff --git a/gcc-aarch64/ada-aarch64-multiarch.patch b/cross/gcc-aarch64/ada-aarch64-multiarch.patch
similarity index 100%
rename from gcc-aarch64/ada-aarch64-multiarch.patch
rename to cross/gcc-aarch64/ada-aarch64-multiarch.patch
diff --git a/gcc-aarch64/ada-fixes.patch b/cross/gcc-aarch64/ada-fixes.patch
similarity index 100%
rename from gcc-aarch64/ada-fixes.patch
rename to cross/gcc-aarch64/ada-fixes.patch
diff --git a/gcc-aarch64/ada-musl.patch b/cross/gcc-aarch64/ada-musl.patch
similarity index 100%
rename from gcc-aarch64/ada-musl.patch
rename to cross/gcc-aarch64/ada-musl.patch
diff --git a/gcc-aarch64/ada-shared.patch b/cross/gcc-aarch64/ada-shared.patch
similarity index 100%
rename from gcc-aarch64/ada-shared.patch
rename to cross/gcc-aarch64/ada-shared.patch
diff --git a/gcc-aarch64/boehm-gc-musl.patch b/cross/gcc-aarch64/boehm-gc-musl.patch
similarity index 100%
rename from gcc-aarch64/boehm-gc-musl.patch
rename to cross/gcc-aarch64/boehm-gc-musl.patch
diff --git a/gcc-aarch64/fix-cxxflags-passing.patch b/cross/gcc-aarch64/fix-cxxflags-passing.patch
similarity index 100%
rename from gcc-aarch64/fix-cxxflags-passing.patch
rename to cross/gcc-aarch64/fix-cxxflags-passing.patch
diff --git a/gcc-aarch64/fix-gcj-iconv-musl.patch b/cross/gcc-aarch64/fix-gcj-iconv-musl.patch
similarity index 100%
rename from gcc-aarch64/fix-gcj-iconv-musl.patch
rename to cross/gcc-aarch64/fix-gcj-iconv-musl.patch
diff --git a/gcc-aarch64/fix-gcj-musl.patch b/cross/gcc-aarch64/fix-gcj-musl.patch
similarity index 100%
rename from gcc-aarch64/fix-gcj-musl.patch
rename to cross/gcc-aarch64/fix-gcj-musl.patch
diff --git a/gcc-aarch64/fix-gcj-stdgnu14-link.patch b/cross/gcc-aarch64/fix-gcj-stdgnu14-link.patch
similarity index 100%
rename from gcc-aarch64/fix-gcj-stdgnu14-link.patch
rename to cross/gcc-aarch64/fix-gcj-stdgnu14-link.patch
diff --git a/gcc-aarch64/fix-rs6000-pie.patch b/cross/gcc-aarch64/fix-rs6000-pie.patch
similarity index 100%
rename from gcc-aarch64/fix-rs6000-pie.patch
rename to cross/gcc-aarch64/fix-rs6000-pie.patch
diff --git a/gcc-aarch64/gcc-4.8-build-args.patch b/cross/gcc-aarch64/gcc-4.8-build-args.patch
similarity index 100%
rename from gcc-aarch64/gcc-4.8-build-args.patch
rename to cross/gcc-aarch64/gcc-4.8-build-args.patch
diff --git a/gcc-aarch64/gcc-4.9-musl-fortify.patch b/cross/gcc-aarch64/gcc-4.9-musl-fortify.patch
similarity index 100%
rename from gcc-aarch64/gcc-4.9-musl-fortify.patch
rename to cross/gcc-aarch64/gcc-4.9-musl-fortify.patch
diff --git a/gcc-aarch64/gcc-6.1-musl-libssp.patch b/cross/gcc-aarch64/gcc-6.1-musl-libssp.patch
similarity index 100%
rename from gcc-aarch64/gcc-6.1-musl-libssp.patch
rename to cross/gcc-aarch64/gcc-6.1-musl-libssp.patch
diff --git a/gcc-aarch64/gcc-pure64.patch b/cross/gcc-aarch64/gcc-pure64.patch
similarity index 100%
rename from gcc-aarch64/gcc-pure64.patch
rename to cross/gcc-aarch64/gcc-pure64.patch
diff --git a/gcc-aarch64/libgcc-always-build-gcceh.a.patch b/cross/gcc-aarch64/libgcc-always-build-gcceh.a.patch
similarity index 100%
rename from gcc-aarch64/libgcc-always-build-gcceh.a.patch
rename to cross/gcc-aarch64/libgcc-always-build-gcceh.a.patch
diff --git a/gcc-armhf/001_all_default-ssp-strong.patch b/cross/gcc-armhf/001_all_default-ssp-strong.patch
similarity index 100%
rename from gcc-armhf/001_all_default-ssp-strong.patch
rename to cross/gcc-armhf/001_all_default-ssp-strong.patch
diff --git a/gcc-armhf/002_all_default-relro.patch b/cross/gcc-armhf/002_all_default-relro.patch
similarity index 100%
rename from gcc-armhf/002_all_default-relro.patch
rename to cross/gcc-armhf/002_all_default-relro.patch
diff --git a/gcc-armhf/003_all_default-fortify-source.patch b/cross/gcc-armhf/003_all_default-fortify-source.patch
similarity index 100%
rename from gcc-armhf/003_all_default-fortify-source.patch
rename to cross/gcc-armhf/003_all_default-fortify-source.patch
diff --git a/gcc-armhf/005_all_default-as-needed.patch b/cross/gcc-armhf/005_all_default-as-needed.patch
similarity index 100%
rename from gcc-armhf/005_all_default-as-needed.patch
rename to cross/gcc-armhf/005_all_default-as-needed.patch
diff --git a/gcc-armhf/011_all_default-warn-format-security.patch b/cross/gcc-armhf/011_all_default-warn-format-security.patch
similarity index 100%
rename from gcc-armhf/011_all_default-warn-format-security.patch
rename to cross/gcc-armhf/011_all_default-warn-format-security.patch
diff --git a/gcc-armhf/012_all_default-warn-trampolines.patch b/cross/gcc-armhf/012_all_default-warn-trampolines.patch
similarity index 100%
rename from gcc-armhf/012_all_default-warn-trampolines.patch
rename to cross/gcc-armhf/012_all_default-warn-trampolines.patch
diff --git a/gcc-armhf/020_all_msgfmt-libstdc++-link.patch b/cross/gcc-armhf/020_all_msgfmt-libstdc++-link.patch
similarity index 100%
rename from gcc-armhf/020_all_msgfmt-libstdc++-link.patch
rename to cross/gcc-armhf/020_all_msgfmt-libstdc++-link.patch
diff --git a/gcc-armhf/050_all_libiberty-asprintf.patch b/cross/gcc-armhf/050_all_libiberty-asprintf.patch
similarity index 100%
rename from gcc-armhf/050_all_libiberty-asprintf.patch
rename to cross/gcc-armhf/050_all_libiberty-asprintf.patch
diff --git a/gcc-armhf/051_all_libiberty-pic.patch b/cross/gcc-armhf/051_all_libiberty-pic.patch
similarity index 100%
rename from gcc-armhf/051_all_libiberty-pic.patch
rename to cross/gcc-armhf/051_all_libiberty-pic.patch
diff --git a/gcc-armhf/053_all_libitm-no-fortify-source.patch b/cross/gcc-armhf/053_all_libitm-no-fortify-source.patch
similarity index 100%
rename from gcc-armhf/053_all_libitm-no-fortify-source.patch
rename to cross/gcc-armhf/053_all_libitm-no-fortify-source.patch
diff --git a/gcc-armhf/067_all_gcc-poison-system-directories.patch b/cross/gcc-armhf/067_all_gcc-poison-system-directories.patch
similarity index 100%
rename from gcc-armhf/067_all_gcc-poison-system-directories.patch
rename to cross/gcc-armhf/067_all_gcc-poison-system-directories.patch
diff --git a/gcc-armhf/090_all_pr55930-dependency-tracking.patch b/cross/gcc-armhf/090_all_pr55930-dependency-tracking.patch
similarity index 100%
rename from gcc-armhf/090_all_pr55930-dependency-tracking.patch
rename to cross/gcc-armhf/090_all_pr55930-dependency-tracking.patch
diff --git a/gcc-armhf/201-cilkrts.patch b/cross/gcc-armhf/201-cilkrts.patch
similarity index 100%
rename from gcc-armhf/201-cilkrts.patch
rename to cross/gcc-armhf/201-cilkrts.patch
diff --git a/gcc-armhf/203-libgcc_s.patch b/cross/gcc-armhf/203-libgcc_s.patch
similarity index 100%
rename from gcc-armhf/203-libgcc_s.patch
rename to cross/gcc-armhf/203-libgcc_s.patch
diff --git a/gcc-armhf/204-linux_libc_has_function.patch b/cross/gcc-armhf/204-linux_libc_has_function.patch
similarity index 100%
rename from gcc-armhf/204-linux_libc_has_function.patch
rename to cross/gcc-armhf/204-linux_libc_has_function.patch
diff --git a/gcc-armhf/205-nopie.patch b/cross/gcc-armhf/205-nopie.patch
similarity index 100%
rename from gcc-armhf/205-nopie.patch
rename to cross/gcc-armhf/205-nopie.patch
diff --git a/gcc-armhf/207-static-pie.patch b/cross/gcc-armhf/207-static-pie.patch
similarity index 100%
rename from gcc-armhf/207-static-pie.patch
rename to cross/gcc-armhf/207-static-pie.patch
diff --git a/gcc-armhf/300-main-gcc-add-musl-s390x-dynamic-linker.patch b/cross/gcc-armhf/300-main-gcc-add-musl-s390x-dynamic-linker.patch
similarity index 100%
rename from gcc-armhf/300-main-gcc-add-musl-s390x-dynamic-linker.patch
rename to cross/gcc-armhf/300-main-gcc-add-musl-s390x-dynamic-linker.patch
diff --git a/gcc-armhf/310-build-gcj-s390x.patch b/cross/gcc-armhf/310-build-gcj-s390x.patch
similarity index 100%
rename from gcc-armhf/310-build-gcj-s390x.patch
rename to cross/gcc-armhf/310-build-gcj-s390x.patch
diff --git a/gcc-armhf/320-libffi-gnulinux.patch b/cross/gcc-armhf/320-libffi-gnulinux.patch
similarity index 100%
rename from gcc-armhf/320-libffi-gnulinux.patch
rename to cross/gcc-armhf/320-libffi-gnulinux.patch
diff --git a/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
similarity index 100%
rename from gcc-armhf/APKBUILD
rename to cross/gcc-armhf/APKBUILD
diff --git a/gcc-armhf/ada-aarch64-multiarch.patch b/cross/gcc-armhf/ada-aarch64-multiarch.patch
similarity index 100%
rename from gcc-armhf/ada-aarch64-multiarch.patch
rename to cross/gcc-armhf/ada-aarch64-multiarch.patch
diff --git a/gcc-armhf/ada-fixes.patch b/cross/gcc-armhf/ada-fixes.patch
similarity index 100%
rename from gcc-armhf/ada-fixes.patch
rename to cross/gcc-armhf/ada-fixes.patch
diff --git a/gcc-armhf/ada-musl.patch b/cross/gcc-armhf/ada-musl.patch
similarity index 100%
rename from gcc-armhf/ada-musl.patch
rename to cross/gcc-armhf/ada-musl.patch
diff --git a/gcc-armhf/ada-shared.patch b/cross/gcc-armhf/ada-shared.patch
similarity index 100%
rename from gcc-armhf/ada-shared.patch
rename to cross/gcc-armhf/ada-shared.patch
diff --git a/gcc-armhf/boehm-gc-musl.patch b/cross/gcc-armhf/boehm-gc-musl.patch
similarity index 100%
rename from gcc-armhf/boehm-gc-musl.patch
rename to cross/gcc-armhf/boehm-gc-musl.patch
diff --git a/gcc-armhf/fix-cxxflags-passing.patch b/cross/gcc-armhf/fix-cxxflags-passing.patch
similarity index 100%
rename from gcc-armhf/fix-cxxflags-passing.patch
rename to cross/gcc-armhf/fix-cxxflags-passing.patch
diff --git a/gcc-armhf/fix-gcj-iconv-musl.patch b/cross/gcc-armhf/fix-gcj-iconv-musl.patch
similarity index 100%
rename from gcc-armhf/fix-gcj-iconv-musl.patch
rename to cross/gcc-armhf/fix-gcj-iconv-musl.patch
diff --git a/gcc-armhf/fix-gcj-musl.patch b/cross/gcc-armhf/fix-gcj-musl.patch
similarity index 100%
rename from gcc-armhf/fix-gcj-musl.patch
rename to cross/gcc-armhf/fix-gcj-musl.patch
diff --git a/gcc-armhf/fix-gcj-stdgnu14-link.patch b/cross/gcc-armhf/fix-gcj-stdgnu14-link.patch
similarity index 100%
rename from gcc-armhf/fix-gcj-stdgnu14-link.patch
rename to cross/gcc-armhf/fix-gcj-stdgnu14-link.patch
diff --git a/gcc-armhf/fix-rs6000-pie.patch b/cross/gcc-armhf/fix-rs6000-pie.patch
similarity index 100%
rename from gcc-armhf/fix-rs6000-pie.patch
rename to cross/gcc-armhf/fix-rs6000-pie.patch
diff --git a/gcc-armhf/gcc-4.8-build-args.patch b/cross/gcc-armhf/gcc-4.8-build-args.patch
similarity index 100%
rename from gcc-armhf/gcc-4.8-build-args.patch
rename to cross/gcc-armhf/gcc-4.8-build-args.patch
diff --git a/gcc-armhf/gcc-4.9-musl-fortify.patch b/cross/gcc-armhf/gcc-4.9-musl-fortify.patch
similarity index 100%
rename from gcc-armhf/gcc-4.9-musl-fortify.patch
rename to cross/gcc-armhf/gcc-4.9-musl-fortify.patch
diff --git a/gcc-armhf/gcc-6.1-musl-libssp.patch b/cross/gcc-armhf/gcc-6.1-musl-libssp.patch
similarity index 100%
rename from gcc-armhf/gcc-6.1-musl-libssp.patch
rename to cross/gcc-armhf/gcc-6.1-musl-libssp.patch
diff --git a/gcc-armhf/gcc-pure64.patch b/cross/gcc-armhf/gcc-pure64.patch
similarity index 100%
rename from gcc-armhf/gcc-pure64.patch
rename to cross/gcc-armhf/gcc-pure64.patch
diff --git a/gcc-armhf/libgcc-always-build-gcceh.a.patch b/cross/gcc-armhf/libgcc-always-build-gcceh.a.patch
similarity index 100%
rename from gcc-armhf/libgcc-always-build-gcceh.a.patch
rename to cross/gcc-armhf/libgcc-always-build-gcceh.a.patch
diff --git a/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD
similarity index 100%
rename from musl-aarch64/APKBUILD
rename to cross/musl-aarch64/APKBUILD
diff --git a/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD
similarity index 100%
rename from musl-armhf/APKBUILD
rename to cross/musl-armhf/APKBUILD
diff --git a/qemu-user-static-repack/APKBUILD b/cross/qemu-user-static-repack/APKBUILD
similarity index 100%
rename from qemu-user-static-repack/APKBUILD
rename to cross/qemu-user-static-repack/APKBUILD
diff --git a/device-asus-grouper/90-android-touch-dev.rules b/device/device-asus-grouper/90-android-touch-dev.rules
similarity index 100%
rename from device-asus-grouper/90-android-touch-dev.rules
rename to device/device-asus-grouper/90-android-touch-dev.rules
diff --git a/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD
similarity index 100%
rename from device-asus-grouper/APKBUILD
rename to device/device-asus-grouper/APKBUILD
diff --git a/device-asus-grouper/deviceinfo b/device/device-asus-grouper/deviceinfo
similarity index 100%
rename from device-asus-grouper/deviceinfo
rename to device/device-asus-grouper/deviceinfo
diff --git a/device-asus-grouper/initfs-hook.sh b/device/device-asus-grouper/initfs-hook.sh
similarity index 100%
rename from device-asus-grouper/initfs-hook.sh
rename to device/device-asus-grouper/initfs-hook.sh
diff --git a/device-htc-ace/90-android-touch-dev.rules b/device/device-htc-ace/90-android-touch-dev.rules
similarity index 100%
rename from device-htc-ace/90-android-touch-dev.rules
rename to device/device-htc-ace/90-android-touch-dev.rules
diff --git a/device-htc-ace/APKBUILD b/device/device-htc-ace/APKBUILD
similarity index 100%
rename from device-htc-ace/APKBUILD
rename to device/device-htc-ace/APKBUILD
diff --git a/device-htc-ace/deviceinfo b/device/device-htc-ace/deviceinfo
similarity index 100%
rename from device-htc-ace/deviceinfo
rename to device/device-htc-ace/deviceinfo
diff --git a/device-htc-ace/initfs-hook.sh b/device/device-htc-ace/initfs-hook.sh
similarity index 100%
rename from device-htc-ace/initfs-hook.sh
rename to device/device-htc-ace/initfs-hook.sh
diff --git a/device-htc-bravo/90-android-touch-dev.rules b/device/device-htc-bravo/90-android-touch-dev.rules
similarity index 100%
rename from device-htc-bravo/90-android-touch-dev.rules
rename to device/device-htc-bravo/90-android-touch-dev.rules
diff --git a/device-htc-bravo/APKBUILD b/device/device-htc-bravo/APKBUILD
similarity index 100%
rename from device-htc-bravo/APKBUILD
rename to device/device-htc-bravo/APKBUILD
diff --git a/device-htc-bravo/deviceinfo b/device/device-htc-bravo/deviceinfo
similarity index 100%
rename from device-htc-bravo/deviceinfo
rename to device/device-htc-bravo/deviceinfo
diff --git a/device-htc-bravo/initfs-hook.sh b/device/device-htc-bravo/initfs-hook.sh
similarity index 100%
rename from device-htc-bravo/initfs-hook.sh
rename to device/device-htc-bravo/initfs-hook.sh
diff --git a/device-lg-d855/90-android.rules b/device/device-lg-d855/90-android.rules
similarity index 100%
rename from device-lg-d855/90-android.rules
rename to device/device-lg-d855/90-android.rules
diff --git a/device-lg-d855/APKBUILD b/device/device-lg-d855/APKBUILD
similarity index 100%
rename from device-lg-d855/APKBUILD
rename to device/device-lg-d855/APKBUILD
diff --git a/device-lg-d855/deviceinfo b/device/device-lg-d855/deviceinfo
similarity index 100%
rename from device-lg-d855/deviceinfo
rename to device/device-lg-d855/deviceinfo
diff --git a/device-lg-d855/initfs-hook.sh b/device/device-lg-d855/initfs-hook.sh
similarity index 100%
rename from device-lg-d855/initfs-hook.sh
rename to device/device-lg-d855/initfs-hook.sh
diff --git a/device-lg-hammerhead/90-android-touch-dev.rules b/device/device-lg-hammerhead/90-android-touch-dev.rules
similarity index 100%
rename from device-lg-hammerhead/90-android-touch-dev.rules
rename to device/device-lg-hammerhead/90-android-touch-dev.rules
diff --git a/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD
similarity index 100%
rename from device-lg-hammerhead/APKBUILD
rename to device/device-lg-hammerhead/APKBUILD
diff --git a/device-lg-hammerhead/bcmdhd.cal b/device/device-lg-hammerhead/bcmdhd.cal
similarity index 100%
rename from device-lg-hammerhead/bcmdhd.cal
rename to device/device-lg-hammerhead/bcmdhd.cal
diff --git a/device-lg-hammerhead/deviceinfo b/device/device-lg-hammerhead/deviceinfo
similarity index 100%
rename from device-lg-hammerhead/deviceinfo
rename to device/device-lg-hammerhead/deviceinfo
diff --git a/device-lg-hammerhead/initfs-hook.sh b/device/device-lg-hammerhead/initfs-hook.sh
similarity index 100%
rename from device-lg-hammerhead/initfs-hook.sh
rename to device/device-lg-hammerhead/initfs-hook.sh
diff --git a/device-lg-hammerhead/profile.sh b/device/device-lg-hammerhead/profile.sh
similarity index 100%
rename from device-lg-hammerhead/profile.sh
rename to device/device-lg-hammerhead/profile.sh
diff --git a/device-lg-mako/90-android-touch-dev.rules b/device/device-lg-mako/90-android-touch-dev.rules
similarity index 100%
rename from device-lg-mako/90-android-touch-dev.rules
rename to device/device-lg-mako/90-android-touch-dev.rules
diff --git a/device-lg-mako/APKBUILD b/device/device-lg-mako/APKBUILD
similarity index 100%
rename from device-lg-mako/APKBUILD
rename to device/device-lg-mako/APKBUILD
diff --git a/device-lg-mako/deviceinfo b/device/device-lg-mako/deviceinfo
similarity index 100%
rename from device-lg-mako/deviceinfo
rename to device/device-lg-mako/deviceinfo
diff --git a/device-lg-mako/initfs-hook.sh b/device/device-lg-mako/initfs-hook.sh
similarity index 100%
rename from device-lg-mako/initfs-hook.sh
rename to device/device-lg-mako/initfs-hook.sh
diff --git a/device-lg-mako/profile.sh b/device/device-lg-mako/profile.sh
similarity index 100%
rename from device-lg-mako/profile.sh
rename to device/device-lg-mako/profile.sh
diff --git a/device-motorola-titan/90-android-touch-dev.rules b/device/device-motorola-titan/90-android-touch-dev.rules
similarity index 100%
rename from device-motorola-titan/90-android-touch-dev.rules
rename to device/device-motorola-titan/90-android-touch-dev.rules
diff --git a/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD
similarity index 100%
rename from device-motorola-titan/APKBUILD
rename to device/device-motorola-titan/APKBUILD
diff --git a/device-motorola-titan/deviceinfo b/device/device-motorola-titan/deviceinfo
similarity index 100%
rename from device-motorola-titan/deviceinfo
rename to device/device-motorola-titan/deviceinfo
diff --git a/device-motorola-titan/initfs-hook.sh b/device/device-motorola-titan/initfs-hook.sh
similarity index 100%
rename from device-motorola-titan/initfs-hook.sh
rename to device/device-motorola-titan/initfs-hook.sh
diff --git a/device-motorola-titan/profile.sh b/device/device-motorola-titan/profile.sh
similarity index 100%
rename from device-motorola-titan/profile.sh
rename to device/device-motorola-titan/profile.sh
diff --git a/device-nokia-rx51/90-touchscreen-dev.rules b/device/device-nokia-rx51/90-touchscreen-dev.rules
similarity index 100%
rename from device-nokia-rx51/90-touchscreen-dev.rules
rename to device/device-nokia-rx51/90-touchscreen-dev.rules
diff --git a/device-nokia-rx51/APKBUILD b/device/device-nokia-rx51/APKBUILD
similarity index 100%
rename from device-nokia-rx51/APKBUILD
rename to device/device-nokia-rx51/APKBUILD
diff --git a/device-nokia-rx51/acpi.map b/device/device-nokia-rx51/acpi.map
similarity index 100%
rename from device-nokia-rx51/acpi.map
rename to device/device-nokia-rx51/acpi.map
diff --git a/device-nokia-rx51/acpi_handler.sh b/device/device-nokia-rx51/acpi_handler.sh
similarity index 100%
rename from device-nokia-rx51/acpi_handler.sh
rename to device/device-nokia-rx51/acpi_handler.sh
diff --git a/device-nokia-rx51/backlight-enable.sh b/device/device-nokia-rx51/backlight-enable.sh
similarity index 100%
rename from device-nokia-rx51/backlight-enable.sh
rename to device/device-nokia-rx51/backlight-enable.sh
diff --git a/device-nokia-rx51/device-nokia-rx51.post-install b/device/device-nokia-rx51/device-nokia-rx51.post-install
similarity index 100%
rename from device-nokia-rx51/device-nokia-rx51.post-install
rename to device/device-nokia-rx51/device-nokia-rx51.post-install
diff --git a/device-nokia-rx51/deviceinfo b/device/device-nokia-rx51/deviceinfo
similarity index 100%
rename from device-nokia-rx51/deviceinfo
rename to device/device-nokia-rx51/deviceinfo
diff --git a/device-nokia-rx51/uboot-script.cmd b/device/device-nokia-rx51/uboot-script.cmd
similarity index 100%
rename from device-nokia-rx51/uboot-script.cmd
rename to device/device-nokia-rx51/uboot-script.cmd
diff --git a/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
similarity index 100%
rename from device-qemu-amd64/APKBUILD
rename to device/device-qemu-amd64/APKBUILD
diff --git a/device-qemu-amd64/deviceinfo b/device/device-qemu-amd64/deviceinfo
similarity index 100%
rename from device-qemu-amd64/deviceinfo
rename to device/device-qemu-amd64/deviceinfo
diff --git a/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD
similarity index 100%
rename from device-qemu-vexpress/APKBUILD
rename to device/device-qemu-vexpress/APKBUILD
diff --git a/device-qemu-vexpress/deviceinfo b/device/device-qemu-vexpress/deviceinfo
similarity index 100%
rename from device-qemu-vexpress/deviceinfo
rename to device/device-qemu-vexpress/deviceinfo
diff --git a/device-samsung-i9070/90-android.rules b/device/device-samsung-i9070/90-android.rules
similarity index 100%
rename from device-samsung-i9070/90-android.rules
rename to device/device-samsung-i9070/90-android.rules
diff --git a/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD
similarity index 100%
rename from device-samsung-i9070/APKBUILD
rename to device/device-samsung-i9070/APKBUILD
diff --git a/device-samsung-i9070/deviceinfo b/device/device-samsung-i9070/deviceinfo
similarity index 100%
rename from device-samsung-i9070/deviceinfo
rename to device/device-samsung-i9070/deviceinfo
diff --git a/device-samsung-i9070/initfs-hook.sh b/device/device-samsung-i9070/initfs-hook.sh
similarity index 100%
rename from device-samsung-i9070/initfs-hook.sh
rename to device/device-samsung-i9070/initfs-hook.sh
diff --git a/device-samsung-i9070/modules-load.conf b/device/device-samsung-i9070/modules-load.conf
similarity index 100%
rename from device-samsung-i9070/modules-load.conf
rename to device/device-samsung-i9070/modules-load.conf
diff --git a/device-samsung-i9100/90-android.rules b/device/device-samsung-i9100/90-android.rules
similarity index 100%
rename from device-samsung-i9100/90-android.rules
rename to device/device-samsung-i9100/90-android.rules
diff --git a/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD
similarity index 100%
rename from device-samsung-i9100/APKBUILD
rename to device/device-samsung-i9100/APKBUILD
diff --git a/device-samsung-i9100/deviceinfo b/device/device-samsung-i9100/deviceinfo
similarity index 100%
rename from device-samsung-i9100/deviceinfo
rename to device/device-samsung-i9100/deviceinfo
diff --git a/device-samsung-i9100/initfs-hook.sh b/device/device-samsung-i9100/initfs-hook.sh
similarity index 100%
rename from device-samsung-i9100/initfs-hook.sh
rename to device/device-samsung-i9100/initfs-hook.sh
diff --git a/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
similarity index 100%
rename from device-samsung-maguro/APKBUILD
rename to device/device-samsung-maguro/APKBUILD
diff --git a/device-samsung-maguro/deviceinfo b/device/device-samsung-maguro/deviceinfo
similarity index 100%
rename from device-samsung-maguro/deviceinfo
rename to device/device-samsung-maguro/deviceinfo
diff --git a/device-sony-amami/90-android.rules b/device/device-sony-amami/90-android.rules
similarity index 100%
rename from device-sony-amami/90-android.rules
rename to device/device-sony-amami/90-android.rules
diff --git a/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
similarity index 100%
rename from device-sony-amami/APKBUILD
rename to device/device-sony-amami/APKBUILD
diff --git a/device-sony-amami/deviceinfo b/device/device-sony-amami/deviceinfo
similarity index 100%
rename from device-sony-amami/deviceinfo
rename to device/device-sony-amami/deviceinfo
diff --git a/device-sony-amami/initfs-hook.sh b/device/device-sony-amami/initfs-hook.sh
similarity index 100%
rename from device-sony-amami/initfs-hook.sh
rename to device/device-sony-amami/initfs-hook.sh
diff --git a/linux-asus-grouper/APKBUILD b/device/linux-asus-grouper/APKBUILD
similarity index 100%
rename from linux-asus-grouper/APKBUILD
rename to device/linux-asus-grouper/APKBUILD
diff --git a/linux-asus-grouper/compiler-gcc6.h b/device/linux-asus-grouper/compiler-gcc6.h
similarity index 100%
rename from linux-asus-grouper/compiler-gcc6.h
rename to device/linux-asus-grouper/compiler-gcc6.h
diff --git a/linux-asus-grouper/config-asus-grouper.armhf b/device/linux-asus-grouper/config-asus-grouper.armhf
similarity index 100%
rename from linux-asus-grouper/config-asus-grouper.armhf
rename to device/linux-asus-grouper/config-asus-grouper.armhf
diff --git a/linux-asus-grouper/duplicate-return-address-definition.patch b/device/linux-asus-grouper/duplicate-return-address-definition.patch
similarity index 100%
rename from linux-asus-grouper/duplicate-return-address-definition.patch
rename to device/linux-asus-grouper/duplicate-return-address-definition.patch
diff --git a/linux-htc-ace/APKBUILD b/device/linux-htc-ace/APKBUILD
similarity index 100%
rename from linux-htc-ace/APKBUILD
rename to device/linux-htc-ace/APKBUILD
diff --git a/linux-htc-ace/compiler-gcc6.h b/device/linux-htc-ace/compiler-gcc6.h
similarity index 100%
rename from linux-htc-ace/compiler-gcc6.h
rename to device/linux-htc-ace/compiler-gcc6.h
diff --git a/linux-htc-ace/config-htc-ace.armhf b/device/linux-htc-ace/config-htc-ace.armhf
similarity index 100%
rename from linux-htc-ace/config-htc-ace.armhf
rename to device/linux-htc-ace/config-htc-ace.armhf
diff --git a/linux-htc-ace/gpu-msm-fix-gcc5-compile.patch b/device/linux-htc-ace/gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from linux-htc-ace/gpu-msm-fix-gcc5-compile.patch
rename to device/linux-htc-ace/gpu-msm-fix-gcc5-compile.patch
diff --git a/linux-htc-bravo/APKBUILD b/device/linux-htc-bravo/APKBUILD
similarity index 100%
rename from linux-htc-bravo/APKBUILD
rename to device/linux-htc-bravo/APKBUILD
diff --git a/linux-htc-bravo/compiler-gcc6.h b/device/linux-htc-bravo/compiler-gcc6.h
similarity index 100%
rename from linux-htc-bravo/compiler-gcc6.h
rename to device/linux-htc-bravo/compiler-gcc6.h
diff --git a/linux-htc-bravo/config-htc-bravo.armhf b/device/linux-htc-bravo/config-htc-bravo.armhf
similarity index 100%
rename from linux-htc-bravo/config-htc-bravo.armhf
rename to device/linux-htc-bravo/config-htc-bravo.armhf
diff --git a/linux-lg-d855/APKBUILD b/device/linux-lg-d855/APKBUILD
similarity index 100%
rename from linux-lg-d855/APKBUILD
rename to device/linux-lg-d855/APKBUILD
diff --git a/linux-lg-d855/compiler-gcc6.h b/device/linux-lg-d855/compiler-gcc6.h
similarity index 100%
rename from linux-lg-d855/compiler-gcc6.h
rename to device/linux-lg-d855/compiler-gcc6.h
diff --git a/linux-lg-d855/config-lg-d855.armhf b/device/linux-lg-d855/config-lg-d855.armhf
similarity index 100%
rename from linux-lg-d855/config-lg-d855.armhf
rename to device/linux-lg-d855/config-lg-d855.armhf
diff --git a/linux-lg-d855/gpu-msm-fix-gcc5-compile.patch b/device/linux-lg-d855/gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from linux-lg-d855/gpu-msm-fix-gcc5-compile.patch
rename to device/linux-lg-d855/gpu-msm-fix-gcc5-compile.patch
diff --git a/linux-lg-hammerhead/APKBUILD b/device/linux-lg-hammerhead/APKBUILD
similarity index 100%
rename from linux-lg-hammerhead/APKBUILD
rename to device/linux-lg-hammerhead/APKBUILD
diff --git a/linux-lg-hammerhead/aeea3592a13bf12861943e44fc48f1f270941f8d.patch b/device/linux-lg-hammerhead/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
similarity index 100%
rename from linux-lg-hammerhead/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
rename to device/linux-lg-hammerhead/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
diff --git a/linux-lg-hammerhead/compiler-gcc6.h b/device/linux-lg-hammerhead/compiler-gcc6.h
similarity index 100%
rename from linux-lg-hammerhead/compiler-gcc6.h
rename to device/linux-lg-hammerhead/compiler-gcc6.h
diff --git a/linux-lg-hammerhead/config-lg-hammerhead.armhf b/device/linux-lg-hammerhead/config-lg-hammerhead.armhf
similarity index 100%
rename from linux-lg-hammerhead/config-lg-hammerhead.armhf
rename to device/linux-lg-hammerhead/config-lg-hammerhead.armhf
diff --git a/linux-lg-hammerhead/gpu-msm-fix-gcc5-compile.patch b/device/linux-lg-hammerhead/gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from linux-lg-hammerhead/gpu-msm-fix-gcc5-compile.patch
rename to device/linux-lg-hammerhead/gpu-msm-fix-gcc5-compile.patch
diff --git a/linux-lg-mako/APKBUILD b/device/linux-lg-mako/APKBUILD
similarity index 100%
rename from linux-lg-mako/APKBUILD
rename to device/linux-lg-mako/APKBUILD
diff --git a/linux-lg-mako/compiler-gcc6.h b/device/linux-lg-mako/compiler-gcc6.h
similarity index 100%
rename from linux-lg-mako/compiler-gcc6.h
rename to device/linux-lg-mako/compiler-gcc6.h
diff --git a/linux-lg-mako/config-lg-mako.armhf b/device/linux-lg-mako/config-lg-mako.armhf
similarity index 100%
rename from linux-lg-mako/config-lg-mako.armhf
rename to device/linux-lg-mako/config-lg-mako.armhf
diff --git a/linux-lg-mako/gpu-msm-fix-gcc5-compile.patch b/device/linux-lg-mako/gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from linux-lg-mako/gpu-msm-fix-gcc5-compile.patch
rename to device/linux-lg-mako/gpu-msm-fix-gcc5-compile.patch
diff --git a/linux-motorola-titan/APKBUILD b/device/linux-motorola-titan/APKBUILD
similarity index 100%
rename from linux-motorola-titan/APKBUILD
rename to device/linux-motorola-titan/APKBUILD
diff --git a/linux-motorola-titan/Wno-error.patch b/device/linux-motorola-titan/Wno-error.patch
similarity index 100%
rename from linux-motorola-titan/Wno-error.patch
rename to device/linux-motorola-titan/Wno-error.patch
diff --git a/linux-motorola-titan/changes1.patch b/device/linux-motorola-titan/changes1.patch
similarity index 100%
rename from linux-motorola-titan/changes1.patch
rename to device/linux-motorola-titan/changes1.patch
diff --git a/linux-motorola-titan/compiler-gcc6.h b/device/linux-motorola-titan/compiler-gcc6.h
similarity index 100%
rename from linux-motorola-titan/compiler-gcc6.h
rename to device/linux-motorola-titan/compiler-gcc6.h
diff --git a/linux-motorola-titan/config-motorola-titan.armhf b/device/linux-motorola-titan/config-motorola-titan.armhf
similarity index 100%
rename from linux-motorola-titan/config-motorola-titan.armhf
rename to device/linux-motorola-titan/config-motorola-titan.armhf
diff --git a/linux-motorola-titan/gcc5-compile.patch b/device/linux-motorola-titan/gcc5-compile.patch
similarity index 100%
rename from linux-motorola-titan/gcc5-compile.patch
rename to device/linux-motorola-titan/gcc5-compile.patch
diff --git a/linux-postmarketos/APKBUILD b/device/linux-postmarketos/APKBUILD
similarity index 100%
rename from linux-postmarketos/APKBUILD
rename to device/linux-postmarketos/APKBUILD
diff --git a/linux-postmarketos/config-postmarketos.armhf b/device/linux-postmarketos/config-postmarketos.armhf
similarity index 100%
rename from linux-postmarketos/config-postmarketos.armhf
rename to device/linux-postmarketos/config-postmarketos.armhf
diff --git a/linux-postmarketos/config-postmarketos.x86_64 b/device/linux-postmarketos/config-postmarketos.x86_64
similarity index 100%
rename from linux-postmarketos/config-postmarketos.x86_64
rename to device/linux-postmarketos/config-postmarketos.x86_64
diff --git a/linux-samsung-i9070/00_fix_return_address.patch b/device/linux-samsung-i9070/00_fix_return_address.patch
similarity index 100%
rename from linux-samsung-i9070/00_fix_return_address.patch
rename to device/linux-samsung-i9070/00_fix_return_address.patch
diff --git a/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch b/device/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch
similarity index 100%
rename from linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch
rename to device/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch
diff --git a/linux-samsung-i9070/02_reduce_lzo_compression.patch b/device/linux-samsung-i9070/02_reduce_lzo_compression.patch
similarity index 100%
rename from linux-samsung-i9070/02_reduce_lzo_compression.patch
rename to device/linux-samsung-i9070/02_reduce_lzo_compression.patch
diff --git a/linux-samsung-i9070/03_change_modules_install_dir.patch b/device/linux-samsung-i9070/03_change_modules_install_dir.patch
similarity index 100%
rename from linux-samsung-i9070/03_change_modules_install_dir.patch
rename to device/linux-samsung-i9070/03_change_modules_install_dir.patch
diff --git a/linux-samsung-i9070/04_change_dhd_firmware_dir.patch b/device/linux-samsung-i9070/04_change_dhd_firmware_dir.patch
similarity index 100%
rename from linux-samsung-i9070/04_change_dhd_firmware_dir.patch
rename to device/linux-samsung-i9070/04_change_dhd_firmware_dir.patch
diff --git a/linux-samsung-i9070/APKBUILD b/device/linux-samsung-i9070/APKBUILD
similarity index 100%
rename from linux-samsung-i9070/APKBUILD
rename to device/linux-samsung-i9070/APKBUILD
diff --git a/linux-samsung-i9070/compiler-gcc6.h b/device/linux-samsung-i9070/compiler-gcc6.h
similarity index 100%
rename from linux-samsung-i9070/compiler-gcc6.h
rename to device/linux-samsung-i9070/compiler-gcc6.h
diff --git a/linux-samsung-i9070/config-samsung-i9070.armhf b/device/linux-samsung-i9070/config-samsung-i9070.armhf
similarity index 100%
rename from linux-samsung-i9070/config-samsung-i9070.armhf
rename to device/linux-samsung-i9070/config-samsung-i9070.armhf
diff --git a/linux-samsung-i9070/init b/device/linux-samsung-i9070/init
similarity index 100%
rename from linux-samsung-i9070/init
rename to device/linux-samsung-i9070/init
diff --git a/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD
similarity index 100%
rename from linux-samsung-i9100/APKBUILD
rename to device/linux-samsung-i9100/APKBUILD
diff --git a/linux-samsung-i9100/compiler-gcc6.h b/device/linux-samsung-i9100/compiler-gcc6.h
similarity index 100%
rename from linux-samsung-i9100/compiler-gcc6.h
rename to device/linux-samsung-i9100/compiler-gcc6.h
diff --git a/linux-samsung-i9100/config-samsung-i9100.armhf b/device/linux-samsung-i9100/config-samsung-i9100.armhf
similarity index 100%
rename from linux-samsung-i9100/config-samsung-i9100.armhf
rename to device/linux-samsung-i9100/config-samsung-i9100.armhf
diff --git a/linux-samsung-i9100/init b/device/linux-samsung-i9100/init
similarity index 100%
rename from linux-samsung-i9100/init
rename to device/linux-samsung-i9100/init
diff --git a/linux-samsung-tuna/APKBUILD b/device/linux-samsung-tuna/APKBUILD
similarity index 100%
rename from linux-samsung-tuna/APKBUILD
rename to device/linux-samsung-tuna/APKBUILD
diff --git a/linux-samsung-tuna/android_paranoid_network.patch b/device/linux-samsung-tuna/android_paranoid_network.patch
similarity index 100%
rename from linux-samsung-tuna/android_paranoid_network.patch
rename to device/linux-samsung-tuna/android_paranoid_network.patch
diff --git a/linux-samsung-tuna/compiler-gcc6.h b/device/linux-samsung-tuna/compiler-gcc6.h
similarity index 100%
rename from linux-samsung-tuna/compiler-gcc6.h
rename to device/linux-samsung-tuna/compiler-gcc6.h
diff --git a/linux-samsung-tuna/config-samsung_tuna.armhf b/device/linux-samsung-tuna/config-samsung_tuna.armhf
similarity index 100%
rename from linux-samsung-tuna/config-samsung_tuna.armhf
rename to device/linux-samsung-tuna/config-samsung_tuna.armhf
diff --git a/linux-samsung-tuna/fix_old_perl_code.patch b/device/linux-samsung-tuna/fix_old_perl_code.patch
similarity index 100%
rename from linux-samsung-tuna/fix_old_perl_code.patch
rename to device/linux-samsung-tuna/fix_old_perl_code.patch
diff --git a/linux-sony-amami/APKBUILD b/device/linux-sony-amami/APKBUILD
similarity index 100%
rename from linux-sony-amami/APKBUILD
rename to device/linux-sony-amami/APKBUILD
diff --git a/linux-sony-amami/compiler-gcc6.h b/device/linux-sony-amami/compiler-gcc6.h
similarity index 100%
rename from linux-sony-amami/compiler-gcc6.h
rename to device/linux-sony-amami/compiler-gcc6.h
diff --git a/linux-sony-amami/config-sony-amami.armhf b/device/linux-sony-amami/config-sony-amami.armhf
similarity index 100%
rename from linux-sony-amami/config-sony-amami.armhf
rename to device/linux-sony-amami/config-sony-amami.armhf
diff --git a/0xffff/APKBUILD b/main/0xffff/APKBUILD
similarity index 100%
rename from 0xffff/APKBUILD
rename to main/0xffff/APKBUILD
diff --git a/ccache-cross-symlinks/APKBUILD b/main/ccache-cross-symlinks/APKBUILD
similarity index 100%
rename from ccache-cross-symlinks/APKBUILD
rename to main/ccache-cross-symlinks/APKBUILD
diff --git a/dtbtool/APKBUILD b/main/dtbtool/APKBUILD
similarity index 100%
rename from dtbtool/APKBUILD
rename to main/dtbtool/APKBUILD
diff --git a/dtbtool/Makefile b/main/dtbtool/Makefile
similarity index 100%
rename from dtbtool/Makefile
rename to main/dtbtool/Makefile
diff --git a/extract-dtb/APKBUILD b/main/extract-dtb/APKBUILD
similarity index 100%
rename from extract-dtb/APKBUILD
rename to main/extract-dtb/APKBUILD
diff --git a/gcc-cross-wrappers/APKBUILD b/main/gcc-cross-wrappers/APKBUILD
similarity index 100%
rename from gcc-cross-wrappers/APKBUILD
rename to main/gcc-cross-wrappers/APKBUILD
diff --git a/heimdall/APKBUILD b/main/heimdall/APKBUILD
similarity index 100%
rename from heimdall/APKBUILD
rename to main/heimdall/APKBUILD
diff --git a/heimdall/heimdall_flash_kernel.sh b/main/heimdall/heimdall_flash_kernel.sh
similarity index 100%
rename from heimdall/heimdall_flash_kernel.sh
rename to main/heimdall/heimdall_flash_kernel.sh
diff --git a/heimdall/heimdall_wait_for_device.sh b/main/heimdall/heimdall_wait_for_device.sh
similarity index 100%
rename from heimdall/heimdall_wait_for_device.sh
rename to main/heimdall/heimdall_wait_for_device.sh
diff --git a/hello-world-wrapper/APKBUILD b/main/hello-world-wrapper/APKBUILD
similarity index 100%
rename from hello-world-wrapper/APKBUILD
rename to main/hello-world-wrapper/APKBUILD
diff --git a/hello-world-wrapper/hello-world-wrapper.sh b/main/hello-world-wrapper/hello-world-wrapper.sh
similarity index 100%
rename from hello-world-wrapper/hello-world-wrapper.sh
rename to main/hello-world-wrapper/hello-world-wrapper.sh
diff --git a/hello-world/APKBUILD b/main/hello-world/APKBUILD
similarity index 100%
rename from hello-world/APKBUILD
rename to main/hello-world/APKBUILD
diff --git a/hello-world/Makefile b/main/hello-world/Makefile
similarity index 100%
rename from hello-world/Makefile
rename to main/hello-world/Makefile
diff --git a/hello-world/main.c b/main/hello-world/main.c
similarity index 100%
rename from hello-world/main.c
rename to main/hello-world/main.c
diff --git a/mkbootimg/APKBUILD b/main/mkbootimg/APKBUILD
similarity index 100%
rename from mkbootimg/APKBUILD
rename to main/mkbootimg/APKBUILD
diff --git a/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
similarity index 100%
rename from postmarketos-base/APKBUILD
rename to main/postmarketos-base/APKBUILD
diff --git a/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install
similarity index 100%
rename from postmarketos-base/postmarketos-base.post-install
rename to main/postmarketos-base/postmarketos-base.post-install
diff --git a/postmarketos-base/sudoers b/main/postmarketos-base/sudoers
similarity index 100%
rename from postmarketos-base/sudoers
rename to main/postmarketos-base/sudoers
diff --git a/postmarketos-demos/APKBUILD b/main/postmarketos-demos/APKBUILD
similarity index 100%
rename from postmarketos-demos/APKBUILD
rename to main/postmarketos-demos/APKBUILD
diff --git a/postmarketos-demos/Makefile b/main/postmarketos-demos/Makefile
similarity index 100%
rename from postmarketos-demos/Makefile
rename to main/postmarketos-demos/Makefile
diff --git a/postmarketos-demos/main.c b/main/postmarketos-demos/main.c
similarity index 100%
rename from postmarketos-demos/main.c
rename to main/postmarketos-demos/main.c
diff --git a/postmarketos-mkinitfs-hook-usb-shell/20-usb-shell.sh b/main/postmarketos-mkinitfs-hook-usb-shell/20-usb-shell.sh
similarity index 100%
rename from postmarketos-mkinitfs-hook-usb-shell/20-usb-shell.sh
rename to main/postmarketos-mkinitfs-hook-usb-shell/20-usb-shell.sh
diff --git a/postmarketos-mkinitfs-hook-usb-shell/APKBUILD b/main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD
similarity index 100%
rename from postmarketos-mkinitfs-hook-usb-shell/APKBUILD
rename to main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD
diff --git a/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
similarity index 100%
rename from postmarketos-mkinitfs/APKBUILD
rename to main/postmarketos-mkinitfs/APKBUILD
diff --git a/postmarketos-mkinitfs/TODO b/main/postmarketos-mkinitfs/TODO
similarity index 100%
rename from postmarketos-mkinitfs/TODO
rename to main/postmarketos-mkinitfs/TODO
diff --git a/postmarketos-mkinitfs/init.sh.in b/main/postmarketos-mkinitfs/init.sh.in
similarity index 100%
rename from postmarketos-mkinitfs/init.sh.in
rename to main/postmarketos-mkinitfs/init.sh.in
diff --git a/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh
similarity index 100%
rename from postmarketos-mkinitfs/init_functions.sh
rename to main/postmarketos-mkinitfs/init_functions.sh
diff --git a/postmarketos-mkinitfs/mkinitfs.sh b/main/postmarketos-mkinitfs/mkinitfs.sh
similarity index 100%
rename from postmarketos-mkinitfs/mkinitfs.sh
rename to main/postmarketos-mkinitfs/mkinitfs.sh
diff --git a/postmarketos-mkinitfs/postmarketos-mkinitfs.trigger b/main/postmarketos-mkinitfs/postmarketos-mkinitfs.trigger
similarity index 100%
rename from postmarketos-mkinitfs/postmarketos-mkinitfs.trigger
rename to main/postmarketos-mkinitfs/postmarketos-mkinitfs.trigger
diff --git a/postmarketos-splash/APKBUILD b/main/postmarketos-splash/APKBUILD
similarity index 100%
rename from postmarketos-splash/APKBUILD
rename to main/postmarketos-splash/APKBUILD
diff --git a/postmarketos-splash/config.ini b/main/postmarketos-splash/config.ini
similarity index 100%
rename from postmarketos-splash/config.ini
rename to main/postmarketos-splash/config.ini
diff --git a/postmarketos-splash/make-splash.py b/main/postmarketos-splash/make-splash.py
similarity index 100%
rename from postmarketos-splash/make-splash.py
rename to main/postmarketos-splash/make-splash.py
diff --git a/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD
similarity index 100%
rename from postmarketos-ui-weston/APKBUILD
rename to main/postmarketos-ui-weston/APKBUILD
diff --git a/postmarketos-ui-weston/postmarketos-ui-weston.post-install b/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
similarity index 100%
rename from postmarketos-ui-weston/postmarketos-ui-weston.post-install
rename to main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
diff --git a/postmarketos-ui-weston/start_weston.sh b/main/postmarketos-ui-weston/start_weston.sh
similarity index 100%
rename from postmarketos-ui-weston/start_weston.sh
rename to main/postmarketos-ui-weston/start_weston.sh
diff --git a/unpackbootimg/APKBUILD b/main/unpackbootimg/APKBUILD
similarity index 100%
rename from unpackbootimg/APKBUILD
rename to main/unpackbootimg/APKBUILD
diff --git a/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch b/main/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch
similarity index 100%
rename from weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch
rename to main/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch
diff --git a/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch b/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch
similarity index 100%
rename from weston/0002-compositor-fbdev-Add-support-for-ABGR.patch
rename to main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch
diff --git a/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch b/main/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch
similarity index 100%
rename from weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch
rename to main/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch
diff --git a/weston/APKBUILD b/main/weston/APKBUILD
similarity index 100%
rename from weston/APKBUILD
rename to main/weston/APKBUILD
diff --git a/weston/no_0hz_refresh_rate.patch b/main/weston/no_0hz_refresh_rate.patch
similarity index 100%
rename from weston/no_0hz_refresh_rate.patch
rename to main/weston/no_0hz_refresh_rate.patch
diff --git a/acpid/APKBUILD b/unmaintained/acpid/APKBUILD
similarity index 100%
rename from acpid/APKBUILD
rename to unmaintained/acpid/APKBUILD