diff --git a/pkgs/bmake/build.sh b/base/bmake/build.sh
similarity index 100%
rename from pkgs/bmake/build.sh
rename to base/bmake/build.sh
diff --git a/pkgs/bmake/install.patch b/base/bmake/install.patch
similarity index 100%
rename from pkgs/bmake/install.patch
rename to base/bmake/install.patch
diff --git a/pkgs/bmake/no-test.patch b/base/bmake/no-test.patch
similarity index 100%
rename from pkgs/bmake/no-test.patch
rename to base/bmake/no-test.patch
diff --git a/pkgs/byacc/build.sh b/base/byacc/build.sh
similarity index 100%
rename from pkgs/byacc/build.sh
rename to base/byacc/build.sh
diff --git a/pkgs/byacc/reader-mesa.patch b/base/byacc/reader-mesa.patch
similarity index 100%
rename from pkgs/byacc/reader-mesa.patch
rename to base/byacc/reader-mesa.patch
diff --git a/pkgs/ca-certificates/build.sh b/base/ca-certificates/build.sh
similarity index 100%
rename from pkgs/ca-certificates/build.sh
rename to base/ca-certificates/build.sh
diff --git a/pkgs/ca-certificates/libressl-update-rehash.patch b/base/ca-certificates/libressl-update-rehash.patch
similarity index 100%
rename from pkgs/ca-certificates/libressl-update-rehash.patch
rename to base/ca-certificates/libressl-update-rehash.patch
diff --git a/pkgs/cmake/build.sh b/base/cmake/build.sh
similarity index 100%
rename from pkgs/cmake/build.sh
rename to base/cmake/build.sh
diff --git a/pkgs/curl/build.sh b/base/curl/build.sh
similarity index 100%
rename from pkgs/curl/build.sh
rename to base/curl/build.sh
diff --git a/pkgs/expat/build.sh b/base/expat/build.sh
similarity index 100%
rename from pkgs/expat/build.sh
rename to base/expat/build.sh
diff --git a/pkgs/gettext-tiny/build.sh b/base/gettext-tiny/build.sh
similarity index 100%
rename from pkgs/gettext-tiny/build.sh
rename to base/gettext-tiny/build.sh
diff --git a/pkgs/git/build.sh b/base/git/build.sh
similarity index 100%
rename from pkgs/git/build.sh
rename to base/git/build.sh
diff --git a/pkgs/kakoune/build.sh b/base/kakoune/build.sh
similarity index 100%
rename from pkgs/kakoune/build.sh
rename to base/kakoune/build.sh
diff --git a/pkgs/kati/build.sh b/base/kati/build.sh
similarity index 100%
rename from pkgs/kati/build.sh
rename to base/kati/build.sh
diff --git a/pkgs/lc-make/build.sh b/base/lc-make/build.sh
similarity index 100%
rename from pkgs/lc-make/build.sh
rename to base/lc-make/build.sh
diff --git a/pkgs/libexecinfo/build.sh b/base/libexecinfo/build.sh
similarity index 100%
rename from pkgs/libexecinfo/build.sh
rename to base/libexecinfo/build.sh
diff --git a/pkgs/libressl/build.sh b/base/libressl/build.sh
similarity index 100%
rename from pkgs/libressl/build.sh
rename to base/libressl/build.sh
diff --git a/pkgs/llvm/build.sh b/base/llvm/build.sh
similarity index 100%
rename from pkgs/llvm/build.sh
rename to base/llvm/build.sh
diff --git a/pkgs/llvm/default.llvm.conf b/base/llvm/default.llvm.conf
similarity index 100%
rename from pkgs/llvm/default.llvm.conf
rename to base/llvm/default.llvm.conf
diff --git a/pkgs/meson/build.sh b/base/meson/build.sh
similarity index 100%
rename from pkgs/meson/build.sh
rename to base/meson/build.sh
diff --git a/pkgs/meson/not-darwin.patch b/base/meson/not-darwin.patch
similarity index 100%
rename from pkgs/meson/not-darwin.patch
rename to base/meson/not-darwin.patch
diff --git a/pkgs/mksh/build.sh b/base/mksh/build.sh
similarity index 100%
rename from pkgs/mksh/build.sh
rename to base/mksh/build.sh
diff --git a/pkgs/netbsd-curses/build.sh b/base/netbsd-curses/build.sh
similarity index 100%
rename from pkgs/netbsd-curses/build.sh
rename to base/netbsd-curses/build.sh
diff --git a/pkgs/om4/build.sh b/base/om4/build.sh
similarity index 100%
rename from pkgs/om4/build.sh
rename to base/om4/build.sh
diff --git a/pkgs/openpam/build.sh b/base/openpam/build.sh
similarity index 100%
rename from pkgs/openpam/build.sh
rename to base/openpam/build.sh
diff --git a/pkgs/pci-ids/build.sh b/base/pci-ids/build.sh
similarity index 100%
rename from pkgs/pci-ids/build.sh
rename to base/pci-ids/build.sh
diff --git a/pkgs/python/build.sh b/base/python/build.sh
similarity index 100%
rename from pkgs/python/build.sh
rename to base/python/build.sh
diff --git a/pkgs/reflex/build.sh b/base/reflex/build.sh
similarity index 100%
rename from pkgs/reflex/build.sh
rename to base/reflex/build.sh
diff --git a/pkgs/rust/abyss-install-template-shebang.patch b/base/rust/abyss-install-template-shebang.patch
similarity index 100%
rename from pkgs/rust/abyss-install-template-shebang.patch
rename to base/rust/abyss-install-template-shebang.patch
diff --git a/pkgs/rust/abyss-libunwind.patch b/base/rust/abyss-libunwind.patch
similarity index 100%
rename from pkgs/rust/abyss-libunwind.patch
rename to base/rust/abyss-libunwind.patch
diff --git a/pkgs/rust/alpine-crt.patch b/base/rust/alpine-crt.patch
similarity index 100%
rename from pkgs/rust/alpine-crt.patch
rename to base/rust/alpine-crt.patch
diff --git a/pkgs/rust/alpine-move-py.patch b/base/rust/alpine-move-py.patch
similarity index 100%
rename from pkgs/rust/alpine-move-py.patch
rename to base/rust/alpine-move-py.patch
diff --git a/pkgs/rust/build.sh b/base/rust/build.sh
similarity index 100%
rename from pkgs/rust/build.sh
rename to base/rust/build.sh
diff --git a/pkgs/rust/libexec.patch b/base/rust/libexec.patch
similarity index 100%
rename from pkgs/rust/libexec.patch
rename to base/rust/libexec.patch
diff --git a/pkgs/rust/libressl.patch b/base/rust/libressl.patch
similarity index 100%
rename from pkgs/rust/libressl.patch
rename to base/rust/libressl.patch
diff --git a/pkgs/rust/llvm_crt.patch b/base/rust/llvm_crt.patch
similarity index 100%
rename from pkgs/rust/llvm_crt.patch
rename to base/rust/llvm_crt.patch
diff --git a/pkgs/rust/unfreeze.patch b/base/rust/unfreeze.patch
similarity index 100%
rename from pkgs/rust/unfreeze.patch
rename to base/rust/unfreeze.patch
diff --git a/pkgs/rust/vendored-ssl.patch b/base/rust/vendored-ssl.patch
similarity index 100%
rename from pkgs/rust/vendored-ssl.patch
rename to base/rust/vendored-ssl.patch
diff --git a/pkgs/samurai/build.sh b/base/samurai/build.sh
similarity index 100%
rename from pkgs/samurai/build.sh
rename to base/samurai/build.sh
diff --git a/pkgs/toybox/build.sh b/base/toybox/build.sh
similarity index 100%
rename from pkgs/toybox/build.sh
rename to base/toybox/build.sh
diff --git a/pkgs/toybox/ls-colour.patch b/base/toybox/ls-colour.patch
similarity index 100%
rename from pkgs/toybox/ls-colour.patch
rename to base/toybox/ls-colour.patch
diff --git a/pkgs/toybox/mksh-make.patch b/base/toybox/mksh-make.patch
similarity index 100%
rename from pkgs/toybox/mksh-make.patch
rename to base/toybox/mksh-make.patch
diff --git a/pkgs/zig/build.sh b/base/zig/build.sh
similarity index 100%
rename from pkgs/zig/build.sh
rename to base/zig/build.sh
diff --git a/pkgs/zig/llvm-req-arch.patch b/base/zig/llvm-req-arch.patch
similarity index 100%
rename from pkgs/zig/llvm-req-arch.patch
rename to base/zig/llvm-req-arch.patch
diff --git a/pkgs/zlib-ng/build.sh b/base/zlib-ng/build.sh
similarity index 100%
rename from pkgs/zlib-ng/build.sh
rename to base/zlib-ng/build.sh
diff --git a/pkgs/weston/build.sh b/gui/weston/build.sh
similarity index 100%
rename from pkgs/weston/build.sh
rename to gui/weston/build.sh
diff --git a/pkgs/weston/no-tests.patch b/gui/weston/no-tests.patch
similarity index 100%
rename from pkgs/weston/no-tests.patch
rename to gui/weston/no-tests.patch
diff --git a/pkgs/musl/build.sh b/linux/musl/build.sh
similarity index 100%
rename from pkgs/musl/build.sh
rename to linux/musl/build.sh