Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

506 files changed, 660 insertions, 593 deletions

diff --git a/.gitignore b/.gitignore
index 269c8b01..91a93a38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/config.rc
 /out
 local.ninja
 local.perms
diff --git a/.gitmodules b/.gitmodules
index 12381d46..74e76da2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,223 +1,223 @@
-[submodule "core/awk/src"]
-	path = core/awk/src
+[submodule "pkg/alsa-lib/src"]
+	path = pkg/alsa-lib/src
+	url = git://git.alsa-project.org/alsa-lib.git
+	ignore = all
+[submodule "pkg/alsa-utils/src"]
+	path = pkg/alsa-utils/src
+	url = git://git.alsa-project.org/alsa-utils.git
+	ignore = all
+[submodule "pkg/awk/src"]
+	path = pkg/awk/src
 	url = https://github.com/onetrueawk/awk
 	ignore = all
-[submodule "core/curl/src"]
-	path = core/curl/src
+[submodule "pkg/ccid/src"]
+	path = pkg/ccid/src
+	url = https://anonscm.debian.org/git/pcsclite/CCID.git
+	ignore = all
+[submodule "pkg/curl/src"]
+	path = pkg/curl/src
 	url = https://github.com/curl/curl
-[submodule "core/e2fsprogs/src"]
-	path = core/e2fsprogs/src
+[submodule "pkg/dmenu/src"]
+	path = pkg/dmenu/src
+	url = git://git.suckless.org/dmenu
+	ignore = all
+[submodule "pkg/e2fsprogs/src"]
+	path = pkg/e2fsprogs/src
 	url = https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
-[submodule "core/file/src"]
-	path = core/file/src
+[submodule "pkg/efibootmgr/src"]
+	path = pkg/efibootmgr/src
+	url = https://github.com/rhinstaller/efibootmgr
+[submodule "pkg/efivar/src"]
+	path = pkg/efivar/src
+	url = https://github.com/rhinstaller/efivar
+	ignore = all
+[submodule "pkg/expat/src"]
+	path = pkg/expat/src
+	url = git://git.code.sf.net/p/expat/code_git
+[submodule "pkg/ffmpeg/src"]
+	path = pkg/ffmpeg/src
+	url = https://git.ffmpeg.org/ffmpeg.git
+	ignore = all
+[submodule "pkg/file/src"]
+	path = pkg/file/src
 	url = https://github.com/file/file
-[submodule "core/git/src"]
-	path = core/git/src
+[submodule "pkg/fontconfig/src"]
+	path = pkg/fontconfig/src
+	url = https://anongit.freedesktop.org/git/fontconfig
+	ignore = all
+[submodule "pkg/freetype/src"]
+	path = pkg/freetype/src
+	url = git://git.sv.nongnu.org/freetype/freetype2.git
+[submodule "pkg/fribidi/src"]
+	path = pkg/fribidi/src
+	url = https://anongit.freedesktop.org/git/fribidi/fribidi.git
+[submodule "pkg/git/src"]
+	path = pkg/git/src
 	url = https://github.com/git/git
 	ignore = all
-[submodule "core/iproute2/src"]
-	path = core/iproute2/src
+[submodule "pkg/hostap/src"]
+	path = pkg/hostap/src
+	url = git://w1.fi/hostap.git
+	ignore = all
+[submodule "pkg/ii/src"]
+	path = pkg/ii/src
+	url = git://git.suckless.org/ii
+[submodule "pkg/iproute2/src"]
+	path = pkg/iproute2/src
 	url = https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
 	ignore = all
-[submodule "core/kbd/src"]
-	path = core/kbd/src
+[submodule "pkg/kbd/src"]
+	path = pkg/kbd/src
 	url = https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git
 	ignore = all
-[submodule "core/libressl/src"]
-	path = core/libressl/src
+[submodule "pkg/libass/src"]
+	path = pkg/libass/src
+	url = https://github.com/libass/libass
+[submodule "pkg/libdrm/src"]
+	path = pkg/libdrm/src
+	url = https://cgit.freedesktop.org/mesa/drm
+[submodule "pkg/libevdev/src"]
+	path = pkg/libevdev/src
+	url = https://anongit.freedesktop.org/git/libevdev.git
+	ignore = all
+[submodule "pkg/libevent/src"]
+	path = pkg/libevent/src
+	url = https://github.com/libevent/libevent
+[submodule "pkg/libffi/src"]
+	path = pkg/libffi/src
+	url = https://github.com/libffi/libffi
+[submodule "pkg/libfuse/src"]
+	path = pkg/libfuse/src
+	url = https://github.com/libfuse/libfuse
+	ignore = all
+[submodule "pkg/libnl/src"]
+	path = pkg/libnl/src
+	url = https://github.com/thom311/libnl
+[submodule "pkg/libpciaccess/src"]
+	path = pkg/libpciaccess/src
+	url = https://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git
+	ignore = all
+[submodule "pkg/libressl/src"]
+	path = pkg/libressl/src
 	url = https://github.com/libressl-portable/openbsd
 	ignore = all
-[submodule "core/loksh/src"]
-	path = core/loksh/src
+[submodule "pkg/libusb/src"]
+	path = pkg/libusb/src
+	url = https://github.com/libusb/libusb
+[submodule "pkg/libxkbcommon/src"]
+	path = pkg/libxkbcommon/src
+	url = https://github.com/xkbcommon/libxkbcommon
+	ignore = all
+[submodule "pkg/loksh/src"]
+	path = pkg/loksh/src
 	url = https://github.com/dimkr/loksh
 	ignore = all
-[submodule "core/ninja/src"]
-	path = core/ninja/src
+[submodule "pkg/make/src"]
+	path = pkg/make/src
+	url = git://git.sv.gnu.org/make.git
+[submodule "pkg/mc/src"]
+	path = pkg/mc/src
+	url = https://github.com/oridb/mc
+[submodule "pkg/mpv/src"]
+	path = pkg/mpv/src
+	url = https://github.com/mpv-player/mpv
+	ignore = all
+[submodule "pkg/msmtp/src"]
+	path = pkg/msmtp/src
+	url = git://git.code.sf.net/p/msmtp/code
+	ignore = all
+[submodule "pkg/ninja/src"]
+	path = pkg/ninja/src
 	url = https://github.com/ninja-build/ninja
-[submodule "core/openssh/src"]
-	path = core/openssh/src
+[submodule "pkg/openssh/src"]
+	path = pkg/openssh/src
 	url = https://github.com/openssh/openssh-portable
-[submodule "core/pigz/src"]
-	path = core/pigz/src
+[submodule "pkg/pcsc/src"]
+	path = pkg/pcsc/src
+	url = https://anonscm.debian.org/git/pcsclite/PCSC.git
+	ignore = all
+[submodule "pkg/pigz/src"]
+	path = pkg/pigz/src
 	url = https://github.com/madler/pigz
 	ignore = all
-[submodule "core/plan9port/src"]
-	path = core/plan9port/src
+[submodule "pkg/pixman/src"]
+	path = pkg/pixman/src
+	url = https://anongit.freedesktop.org/git/pixman.git
+[submodule "pkg/plan9fonts/src"]
+	path = pkg/plan9fonts/src
+	url = https://github.com/rtrn/plan9fonts
+[submodule "pkg/plan9port/src"]
+	path = pkg/plan9port/src
 	url = https://github.com/9fans/plan9port
 	ignore = all
-[submodule "core/sbase/src"]
-	path = core/sbase/src
+[submodule "pkg/qbe/src"]
+	path = pkg/qbe/src
+	url = git://c9x.me/qbe.git
+[submodule "pkg/sbase/src"]
+	path = pkg/sbase/src
 	url = git://git.suckless.org/sbase
 	ignore = all
-[submodule "core/sdhcp/src"]
-	path = core/sdhcp/src
+[submodule "pkg/scc/src"]
+	path = pkg/scc/src
+	url = git://git.suckless.org/scc
+[submodule "pkg/sdhcp/src"]
+	path = pkg/sdhcp/src
 	url = git://git.2f30.org/sdhcp
 	ignore = all
-[submodule "core/sinit/src"]
-	path = core/sinit/src
+[submodule "pkg/sinit/src"]
+	path = pkg/sinit/src
 	url = git://git.suckless.org/sinit
-[submodule "core/tz/src"]
-	path = core/tz/src
-	url = https://github.com/eggert/tz
-[submodule "core/ubase/src"]
-	path = core/ubase/src
-	url = git://git.suckless.org/ubase
-	ignore = all
-[submodule "core/util-linux/src"]
-	path = core/util-linux/src
-	url = https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
-[submodule "core/zlib/src"]
-	path = core/zlib/src
-	url = https://github.com/madler/zlib
-[submodule "core/xz/src"]
-	path = core/xz/src
-	url = http://git.tukaani.org/xz.git
-[submodule "desktop/dmenu/src"]
-	path = desktop/dmenu/src
-	url = git://git.suckless.org/dmenu
-	ignore = all
-[submodule "desktop/expat/src"]
-	path = desktop/expat/src
-	url = git://git.code.sf.net/p/expat/code_git
-[submodule "desktop/fontconfig/src"]
-	path = desktop/fontconfig/src
-	url = https://anongit.freedesktop.org/git/fontconfig
-	ignore = all
-[submodule "desktop/freetype/src"]
-	path = desktop/freetype/src
-	url = git://git.sv.nongnu.org/freetype/freetype2.git
-[submodule "desktop/libdrm/src"]
-	path = desktop/libdrm/src
-	url = https://cgit.freedesktop.org/mesa/drm
-[submodule "desktop/libevdev/src"]
-	path = desktop/libevdev/src
-	url = https://anongit.freedesktop.org/git/libevdev.git
-	ignore = all
-[submodule "desktop/libffi/src"]
-	path = desktop/libffi/src
-	url = https://github.com/libffi/libffi
-[submodule "desktop/libpciaccess/src"]
-	path = desktop/libpciaccess/src
-	url = https://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git
-	ignore = all
-[submodule "desktop/libxkbcommon/src"]
-	path = desktop/libxkbcommon/src
-	url = https://github.com/xkbcommon/libxkbcommon
+[submodule "pkg/sshfs/src"]
+	path = pkg/sshfs/src
+	url = https://github.com/libfuse/sshfs
 	ignore = all
-[submodule "desktop/pixman/src"]
-	path = desktop/pixman/src
-	url = https://anongit.freedesktop.org/git/pixman.git
-[submodule "desktop/plan9fonts/src"]
-	path = desktop/plan9fonts/src
-	url = https://github.com/rtrn/plan9fonts
-[submodule "desktop/st/src"]
-	path = desktop/st/src
+[submodule "pkg/st/src"]
+	path = pkg/st/src
 	url = git://git.suckless.org/st
 	ignore = all
-[submodule "desktop/swc/src"]
-	path = desktop/swc/src
+[submodule "pkg/swc/src"]
+	path = pkg/swc/src
 	url = https://github.com/michaelforney/swc
-[submodule "desktop/velox/src"]
-	path = desktop/velox/src
+[submodule "pkg/the_silver_searcher/src"]
+	path = pkg/the_silver_searcher/src
+	url = https://github.com/ggreer/the_silver_searcher
+[submodule "pkg/tz/src"]
+	path = pkg/tz/src
+	url = https://github.com/eggert/tz
+[submodule "pkg/ubase/src"]
+	path = pkg/ubase/src
+	url = git://git.suckless.org/ubase
+	ignore = all
+[submodule "pkg/util-linux/src"]
+	path = pkg/util-linux/src
+	url = https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
+[submodule "pkg/velox/src"]
+	path = pkg/velox/src
 	url = https://github.com/michaelforney/velox
-[submodule "desktop/wayland/src"]
-	path = desktop/wayland/src
-	url = https://anongit.freedesktop.org/git/wayland/wayland.git
+[submodule "pkg/vis/src"]
+	path = pkg/vis/src
+	url = https://github.com/martanne/vis
 	ignore = all
-[submodule "desktop/wayland-protocols/src"]
-	path = desktop/wayland-protocols/src
+[submodule "pkg/wayland-protocols/src"]
+	path = pkg/wayland-protocols/src
 	url = https://anongit.freedesktop.org/git/wayland/wayland-protocols.git
-[submodule "desktop/wld/src"]
-	path = desktop/wld/src
+[submodule "pkg/wayland/src"]
+	path = pkg/wayland/src
+	url = https://anongit.freedesktop.org/git/wayland/wayland.git
+	ignore = all
+[submodule "pkg/wld/src"]
+	path = pkg/wld/src
 	url = https://github.com/michaelforney/wld
-[submodule "desktop/xkeyboard-config/src"]
-	path = desktop/xkeyboard-config/src
+[submodule "pkg/xkeyboard-config/src"]
+	path = pkg/xkeyboard-config/src
 	url = https://anongit.freedesktop.org/git/xkeyboard-config.git
-[submodule "devel/make/src"]
-	path = devel/make/src
-	url = git://git.sv.gnu.org/make.git
-[submodule "devel/qbe/src"]
-	path = devel/qbe/src
-	url = git://c9x.me/qbe.git
-[submodule "extra/ccid/src"]
-	path = extra/ccid/src
-	url = https://anonscm.debian.org/git/pcsclite/CCID.git
-	ignore = all
-[submodule "extra/efibootmgr/src"]
-	path = extra/efibootmgr/src
-	url = https://github.com/rhinstaller/efibootmgr
-[submodule "extra/efivar/src"]
-	path = extra/efivar/src
-	url = https://github.com/rhinstaller/efivar
-	ignore = all
-[submodule "extra/fribidi/src"]
-	path = extra/fribidi/src
-	url = https://anongit.freedesktop.org/git/fribidi/fribidi.git
-[submodule "extra/hostap/src"]
-	path = extra/hostap/src
-	url = git://w1.fi/hostap.git
-	ignore = all
-[submodule "extra/ii/src"]
-	path = extra/ii/src
-	url = git://git.suckless.org/ii
-[submodule "extra/libevent/src"]
-	path = extra/libevent/src
-	url = https://github.com/libevent/libevent
-[submodule "extra/libfuse/src"]
-	path = extra/libfuse/src
-	url = https://github.com/libfuse/libfuse
-	ignore = all
-[submodule "extra/libnl/src"]
-	path = extra/libnl/src
-	url = https://github.com/thom311/libnl
-[submodule "extra/libusb/src"]
-	path = extra/libusb/src
-	url = https://github.com/libusb/libusb
-[submodule "extra/msmtp/src"]
-	path = extra/msmtp/src
-	url = git://git.code.sf.net/p/msmtp/code
-	ignore = all
-[submodule "extra/pcsc/src"]
-	path = extra/pcsc/src
-	url = https://anonscm.debian.org/git/pcsclite/PCSC.git
-	ignore = all
-[submodule "extra/sshfs/src"]
-	path = extra/sshfs/src
-	url = https://github.com/libfuse/sshfs
-	ignore = all
-[submodule "extra/the_silver_searcher/src"]
-	path = extra/the_silver_searcher/src
-	url = https://github.com/ggreer/the_silver_searcher
-[submodule "extra/vis/src"]
-	path = extra/vis/src
-	url = https://github.com/martanne/vis
-	ignore = all
-[submodule "lang/mc/src"]
-	path = lang/mc/src
-	url = https://github.com/oridb/mc
-[submodule "lang/scc/src"]
-	path = lang/scc/src
-	url = git://git.suckless.org/scc
-[submodule "media/alsa-lib/src"]
-	path = media/alsa-lib/src
-	url = git://git.alsa-project.org/alsa-lib.git
-	ignore = all
-[submodule "media/alsa-utils/src"]
-	path = media/alsa-utils/src
-	url = git://git.alsa-project.org/alsa-utils.git
-	ignore = all
-[submodule "media/ffmpeg/src"]
-	path = media/ffmpeg/src
-	url = https://git.ffmpeg.org/ffmpeg.git
-	ignore = all
-[submodule "media/libass/src"]
-	path = media/libass/src
-	url = https://github.com/libass/libass
-[submodule "media/mpv/src"]
-	path = media/mpv/src
-	url = https://github.com/mpv-player/mpv
-	ignore = all
-[submodule "media/youtube-dl/src"]
-	path = media/youtube-dl/src
+[submodule "pkg/xz/src"]
+	path = pkg/xz/src
+	url = http://git.tukaani.org/xz.git
+[submodule "pkg/youtube-dl/src"]
+	path = pkg/youtube-dl/src
 	url = https://github.com/rg3/youtube-dl
 	ignore = all
+[submodule "pkg/zlib/src"]
+	path = pkg/zlib/src
+	url = https://github.com/madler/zlib
diff --git a/config.rc b/config.def.rc
index a6a6c51e..07723f03 100644
--- a/config.rc
+++ b/config.def.rc
@@ -1,9 +1,11 @@
+. ./sets.rc
+
+pkgs=$core
+
 fn fs {
 	switch($1) {
-	case core/*
+	case $pkgs
 		! ~ $2 include/* lib/*.a
-	case util .
-		true
 	case *
 		false
 	}
diff --git a/core/gen.rc b/core/gen.rc
deleted file mode 100644
index 0dcf6af7..00000000
--- a/core/gen.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-subgen awk
-subgen bc
-subgen bzip2
-subgen curl
-subgen e2fsprogs
-subgen file
-subgen git
-subgen iproute2
-subgen kbd
-subgen libressl
-subgen loksh
-subgen mdocml
-subgen ninja
-subgen openbsd
-subgen openssh
-subgen perp
-subgen pigz
-subgen plan9port
-subgen sbase
-subgen sdhcp
-subgen sinit
-subgen skeleton
-subgen tz
-subgen ubase
-subgen util-linux
-subgen xz
-subgen zlib
diff --git a/desktop/dmenu/gen.rc b/desktop/dmenu/gen.rc
deleted file mode 100644
index 7500c452..00000000
--- a/desktop/dmenu/gen.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-cflags\
-	-D 'VERSION=''"4.6"''' \
-	-isystem desktop/fontconfig/src\
-	-isystem desktop/libxkbcommon/src\
-	-isystem '$builddir'/desktop/pixman/include\
-	-isystem '$builddir'/desktop/swc/include\
-	-isystem '$builddir'/desktop/wayland/include\
-	-isystem '$builddir'/desktop/wld/include\
-	-I '$dir'
-
-phony deps\
-	'$builddir'/desktop/^(fontconfig libxkbcommon)^/fetch.stamp\
-	desktop/^(pixman swc wayland wld)^/headers
-
-exe dmenu -d '$dir'/deps dmenu.c drw.c util.c '$builddir'/^(\
-	desktop/swc/swc-protocol.c.o\
-	desktop/libxkbcommon/libxkbcommon.a\
-	desktop/wld/libwld.a.d\
-	desktop/fontconfig/libfontconfig.a.d\
-	desktop/wayland/libwayland-client.a.d\
-)
-file bin/dmenu '$outdir'/dmenu 755
-file share/man/man1/dmenu.1 '$srcdir'/dmenu.1 644
-
-exe stest stest.c
-file bin/stest '$outdir'/stest 755
-file share/man/man1/stest.1 '$srcdir'/stest.1 644
-
-for(f in dmenu_path dmenu_run)
-	file bin/$f '$srcdir'/$f 755
-
-fetch git
diff --git a/desktop/gen.rc b/desktop/gen.rc
deleted file mode 100644
index e0ee85f0..00000000
--- a/desktop/gen.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-subgen dmenu
-subgen expat
-subgen fontconfig
-subgen freetype
-subgen libdrm
-subgen libevdev
-subgen libffi
-subgen libpciaccess
-subgen libxkbcommon
-subgen pixman
-subgen plan9fonts
-subgen st
-subgen swc
-subgen terminus-font
-subgen velox
-subgen wayland
-subgen wayland-protocols
-subgen wld
-subgen xkeyboard-config
diff --git a/desktop/st/gen.rc b/desktop/st/gen.rc
deleted file mode 100644
index 843e5b72..00000000
--- a/desktop/st/gen.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-cflags\
-	-D 'VERSION=''"0.7"''' \
-	-isystem desktop/fontconfig/src\
-	-isystem desktop/libxkbcommon/src\
-	-isystem '$builddir'/desktop/pixman/include\
-	-isystem '$builddir'/desktop/wayland/include\
-	-isystem '$builddir'/desktop/wayland-protocols/include\
-	-isystem '$builddir'/desktop/wld/include\
-	-I '$dir'
-
-phony deps\
-	'$builddir'/desktop/^(fontconfig libxkbcommon)^/fetch.stamp\
-	desktop/^(pixman wayland wayland-protocols wld)^/headers
-
-exe st -d '$dir'/deps st.c '$builddir'/^(\
-	desktop/libxkbcommon/libxkbcommon.a\
-	desktop/wayland/libwayland-client.a.d\
-	desktop/wayland/libwayland-cursor.a.d\
-	desktop/wayland-protocols/xdg-shell-unstable-v5-protocol.c.o\
-	desktop/wld/libwld.a.d\
-)
-file bin/st '$outdir'/st 755
-file share/man/man1/st.1 '$srcdir'/st.1 644
-
-terminfo=s/^(st st-256color)
-terminfo_outs='$outdir'/$terminfo
-build $"terminfo_outs tic '$srcdir'/st.info ; with\
-	ticflags '-x -o $outdir'
-for(t in $terminfo)
-	file share/terminfo/$t '$outdir'/$t 644
-
-fetch git
diff --git a/desktop/velox/gen.rc b/desktop/velox/gen.rc
deleted file mode 100644
index f0217c44..00000000
--- a/desktop/velox/gen.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-cflags\
-	-D 'VELOX_LIBEXEC=''"/libexec/velox"''' \
-	-isystem desktop/fontconfig/src\
-	-isystem desktop/libxkbcommon/src\
-	-isystem '$builddir'/desktop/pixman/include\
-	-isystem '$builddir'/desktop/swc/include\
-	-isystem '$builddir'/desktop/wayland/include\
-	-isystem '$builddir'/desktop/wld/include\
-	-I '$outdir'
-
-waylandproto protocol/velox.xml\
-	protocol/velox-^(client server)^-protocol.h velox-protocol.c
-build '$outdir'/protocol/swc-client-protocol.h copy '$builddir'/desktop/swc/include/swc-client-protocol.h
-
-phony deps\
-	'$outdir'/protocol/^(swc-client velox-^(client server))^-protocol.h\
-	'$builddir'/desktop/^(fontconfig libxkbcommon swc)^/fetch.stamp\
-	desktop/^(pixman swc wayland wld)^/headers
-
-exe velox -d '$dir'/deps \
-	config.c\
-	layout.c\
-	screen.c\
-	tag.c\
-	util.c\
-	velox.c\
-	velox-protocol.c.o\
-	window.c\
-	'$builddir'/^(\
-		desktop/swc/libswc.a.d\
-		desktop/wayland/libwayland-server.a.d\
-	)
-file bin/velox '$outdir'/velox 755
-
-exe status_bar -d '$dir'/deps clients/status_bar.c velox-protocol.c.o '$builddir'/^(\
-	desktop/swc/swc-protocol.c.o\
-	desktop/wld/libwld.a.d\
-	desktop/wayland/libwayland-client.a.d\
-)
-file libexec/velox/status_bar '$outdir'/status_bar 755
-
-fetch git
diff --git a/devel/gen.rc b/devel/gen.rc
deleted file mode 100644
index d3590d17..00000000
--- a/devel/gen.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-subgen make
-subgen nasm
-subgen qbe
diff --git a/extra/gen.rc b/extra/gen.rc
deleted file mode 100644
index 084f615c..00000000
--- a/extra/gen.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-subgen ccid
-subgen efibootmgr
-subgen efivar
-subgen fribidi
-subgen hostap
-subgen ii
-subgen less
-subgen libevent
-subgen libfuse
-subgen libnl
-subgen libtermkey
-subgen libusb
-subgen lpeg
-subgen man-pages-posix
-subgen msmtp
-subgen ncurses
-subgen pcre
-subgen pcsc
-subgen sshfs
-subgen the_silver_searcher
-subgen transmission
-subgen unzip
-subgen vis
diff --git a/extra/libtermkey/gen.rc b/extra/libtermkey/gen.rc
deleted file mode 100644
index ba8f9d89..00000000
--- a/extra/libtermkey/gen.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-cflags\
-	'-std=c99' -Wall\
-	-isystem '$builddir'/extra/ncurses/include
-
-lib libtermkey.a -d extra/ncurses/headers\
-	termkey.c driver-csi.c driver-ti.c\
-	'$builddir'/extra/ncurses/libncurses.a
-
-fetch curl
diff --git a/gen.rc b/gen.rc
index ad9f7e55..ba02c2c8 100644
--- a/gen.rc
+++ b/gen.rc
@@ -1,10 +1,4 @@
-subgen core
-subgen desktop
-subgen devel
-subgen extra
-subgen lang
-subgen media
-
+subgen pkg
 subgen util
 
 file .perms '$outdir'/root.perms 644
diff --git a/lang/gen.rc b/lang/gen.rc
deleted file mode 100644
index de857541..00000000
--- a/lang/gen.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-subgen lua
-subgen mc
-subgen python
-subgen scc
diff --git a/media/gen.rc b/media/gen.rc
deleted file mode 100644
index 4512341f..00000000
--- a/media/gen.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-subgen alsa-lib
-subgen alsa-utils
-subgen ffmpeg
-subgen libass
-subgen mpv
-subgen youtube-dl
diff --git a/ninja.rc b/ninja.rc
index 2d2267aa..d9a049f2 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -153,14 +153,14 @@ fn waylandproto {
 	build '$outdir'/$1 waylandproto $proto ; with type client-header
 	build '$outdir'/$2 waylandproto $proto ; with type server-header
 	build '$outdir'/$3 waylandproto $proto ; with type code
-	cc '$outdir'/$3 '||' desktop/wayland/headers
+	cc '$outdir'/$3 '||' pkg/wayland/headers
 }
 
 # packaging rules
 
 fn file {
 	~ $#* 3
-	if(fs $dir $1) {
+	if(~ $dir . util || fs $pkg $1) {
 		out='$builddir/$repo.hash'/$1
 		mode=`{printf %4s $3 | tr ' ' 0 | tail -c 4}
 		build $out githash $2 '|' '$builddir/$repo.stamp' scripts/hash.rc ; with\
@@ -174,13 +174,14 @@ fn file {
 
 fn dir {
 	~ $#* 2
-	if(fs $dir $1) tree_perms=($tree_perms '040'$2' '$1)
+	if(~ $dir . util || fs $pkg $1)
+		tree_perms=($tree_perms '040'$2' '$1)
 	status=()
 }
 
 fn sym {
 	~ $#* 2
-	if(fs $dir $1) {
+	if(~ $dir . util || fs $pkg $1) {
 		out='$builddir/$repo.hash'/$1
 		build $out githash '|' '$builddir/$repo.stamp' scripts/hash.rc ; with\
 			args 120000' '$1' '$2
diff --git a/media/alsa-lib/alsa/asoundlib.h b/pkg/alsa-lib/alsa/asoundlib.h
index 1c2560f2..1c2560f2 100644
--- a/media/alsa-lib/alsa/asoundlib.h
+++ b/pkg/alsa-lib/alsa/asoundlib.h
diff --git a/media/alsa-lib/alsa/version.h b/pkg/alsa-lib/alsa/version.h
index d7c11cbc..d7c11cbc 100644
--- a/media/alsa-lib/alsa/version.h
+++ b/pkg/alsa-lib/alsa/version.h
diff --git a/media/alsa-lib/config.h b/pkg/alsa-lib/config.h
index 82f9e706..82f9e706 100644
--- a/media/alsa-lib/config.h
+++ b/pkg/alsa-lib/config.h
diff --git a/media/alsa-lib/ctl_symbols_list.c b/pkg/alsa-lib/ctl_symbols_list.c
index 6731168b..6731168b 100644
--- a/media/alsa-lib/ctl_symbols_list.c
+++ b/pkg/alsa-lib/ctl_symbols_list.c
diff --git a/media/alsa-lib/gen.rc b/pkg/alsa-lib/gen.rc
index 88157433..88157433 100644
--- a/media/alsa-lib/gen.rc
+++ b/pkg/alsa-lib/gen.rc
diff --git a/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch b/pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch
index b4dc2291..b4dc2291 100644
--- a/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch
+++ b/pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch
diff --git a/media/alsa-lib/patch/0002-Add-include-alsa-symlink.patch b/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch
index 915378df..915378df 100644
--- a/media/alsa-lib/patch/0002-Add-include-alsa-symlink.patch
+++ b/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch
diff --git a/media/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch b/pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch
index 158c53c4..158c53c4 100644
--- a/media/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch
+++ b/pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch
diff --git a/media/alsa-lib/pcm_symbols_list.c b/pkg/alsa-lib/pcm_symbols_list.c
index 53b07bb5..53b07bb5 100644
--- a/media/alsa-lib/pcm_symbols_list.c
+++ b/pkg/alsa-lib/pcm_symbols_list.c
diff --git a/core/awk/rev b/pkg/alsa-lib/rev
index 0cfbf088..0cfbf088 100644
--- a/core/awk/rev
+++ b/pkg/alsa-lib/rev
diff --git a/media/alsa-lib/src b/pkg/alsa-lib/src
-Subproject 1bf144013cffdeb41a5df3a11a8eb2596c5ea2b
+Subproject 1bf144013cffdeb41a5df3a11a8eb2596c5ea2b
diff --git a/media/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h
index 2d82c61e..2d82c61e 100644
--- a/media/alsa-utils/aconfig.h
+++ b/pkg/alsa-utils/aconfig.h
diff --git a/media/alsa-utils/gen.rc b/pkg/alsa-utils/gen.rc
index 83603735..957ef4f6 100644
--- a/media/alsa-utils/gen.rc
+++ b/pkg/alsa-utils/gen.rc
@@ -1,5 +1,5 @@
 cflags\
-	-isystem '$builddir'/media/alsa-lib/include\
+	-isystem '$builddir'/pkg/alsa-lib/include\
 	-I include\
 	-I '$dir' \
 	-I '$srcdir'/include
@@ -7,8 +7,8 @@ cflags\
 fn x {
 	name=$1
 	shift
-	exe bin/$name -d media/alsa-lib/headers $*\
-		'$builddir'/media/alsa-lib/libasound.a
+	exe bin/$name -d pkg/alsa-lib/headers $*\
+		'$builddir'/pkg/alsa-lib/libasound.a
 	file bin/$name '$outdir'/bin/$name 755
 	file share/man/man1/$name.1 '$srcdir'/$name/$name.1 644
 }
diff --git a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
index 6423a770..6423a770 100644
--- a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
+++ b/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
diff --git a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
index 83cf3821..83cf3821 100644
--- a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
+++ b/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
diff --git a/core/bzip2/rev b/pkg/alsa-utils/rev
index 0cfbf088..0cfbf088 100644
--- a/core/bzip2/rev
+++ b/pkg/alsa-utils/rev
diff --git a/media/alsa-utils/src b/pkg/alsa-utils/src
-Subproject 675619eb295f8eb35903ef227e6939a86d8c1e7
+Subproject 675619eb295f8eb35903ef227e6939a86d8c1e7
diff --git a/media/alsa-utils/version.h b/pkg/alsa-utils/version.h
index 991790bc..991790bc 100644
--- a/media/alsa-utils/version.h
+++ b/pkg/alsa-utils/version.h
diff --git a/core/awk/.gitignore b/pkg/awk/.gitignore
index 012dc66e..012dc66e 100644
--- a/core/awk/.gitignore
+++ b/pkg/awk/.gitignore
diff --git a/core/awk/gen.rc b/pkg/awk/gen.rc
index 9d9b3a2e..9d9b3a2e 100644
--- a/core/awk/gen.rc
+++ b/pkg/awk/gen.rc
diff --git a/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch b/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
index cf62346a..cf62346a 100644
--- a/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
+++ b/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
diff --git a/core/e2fsprogs/rev b/pkg/awk/rev
index 0cfbf088..0cfbf088 100644
--- a/core/e2fsprogs/rev
+++ b/pkg/awk/rev
diff --git a/core/awk/src b/pkg/awk/src
-Subproject e37f882d7273c61cb0b33c47d5fed3801ad38a6
+Subproject e37f882d7273c61cb0b33c47d5fed3801ad38a6
diff --git a/core/bc/.gitignore b/pkg/bc/.gitignore
index dce428a7..dce428a7 100644
--- a/core/bc/.gitignore
+++ b/pkg/bc/.gitignore
diff --git a/core/bc/config.h b/pkg/bc/config.h
index 35627d41..35627d41 100644
--- a/core/bc/config.h
+++ b/pkg/bc/config.h
diff --git a/core/bc/gen.rc b/pkg/bc/gen.rc
index c75aff92..c75aff92 100644
--- a/core/bc/gen.rc
+++ b/pkg/bc/gen.rc
diff --git a/core/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch b/pkg/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
index 2b91dc9b..2b91dc9b 100644
--- a/core/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
+++ b/pkg/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
diff --git a/core/bc/rev b/pkg/bc/rev
index d00491fd..d00491fd 100644
--- a/core/bc/rev
+++ b/pkg/bc/rev
diff --git a/core/bc/sha256 b/pkg/bc/sha256
index 5aebdc1f..5aebdc1f 100644
--- a/core/bc/sha256
+++ b/pkg/bc/sha256
diff --git a/core/bc/url b/pkg/bc/url
index 29e9268a..29e9268a 100644
--- a/core/bc/url
+++ b/pkg/bc/url
diff --git a/core/bzip2/.gitignore b/pkg/bzip2/.gitignore
index fc553f38..fc553f38 100644
--- a/core/bzip2/.gitignore
+++ b/pkg/bzip2/.gitignore
diff --git a/core/bzip2/gen.rc b/pkg/bzip2/gen.rc
index 5cd9c64c..5cd9c64c 100644
--- a/core/bzip2/gen.rc
+++ b/pkg/bzip2/gen.rc
diff --git a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch b/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch
index 7b322a21..7b322a21 100644
--- a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch
+++ b/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch
diff --git a/core/file/rev b/pkg/bzip2/rev
index 0cfbf088..0cfbf088 100644
--- a/core/file/rev
+++ b/pkg/bzip2/rev
diff --git a/core/bzip2/sha256 b/pkg/bzip2/sha256
index 45eb8e18..45eb8e18 100644
--- a/core/bzip2/sha256
+++ b/pkg/bzip2/sha256
diff --git a/core/bzip2/url b/pkg/bzip2/url
index 9648ced9..9648ced9 100644
--- a/core/bzip2/url
+++ b/pkg/bzip2/url
diff --git a/extra/ccid/config.h b/pkg/ccid/config.h
index cc49a808..cc49a808 100644
--- a/extra/ccid/config.h
+++ b/pkg/ccid/config.h
diff --git a/extra/ccid/gen.rc b/pkg/ccid/gen.rc
index 8cd552f3..4f541ac8 100644
--- a/extra/ccid/gen.rc
+++ b/pkg/ccid/gen.rc
@@ -1,13 +1,13 @@
 version=1.4.24
 cflags\
 	-D HAVE_CONFIG_H\
-	-isystem '$builddir'/extra/libusb/include\
-	-isystem '$builddir'/extra/pcsc/include\
+	-isystem '$builddir'/pkg/libusb/include\
+	-isystem '$builddir'/pkg/pcsc/include\
 	-I include\
 	-I '$dir' \
 	-I '$srcdir'/src\
 
-phony deps extra/^(libusb pcsc)^/headers
+phony deps pkg/^(libusb pcsc)^/headers
 
 lib libccid.a -d '$dir'/deps src/^(\
 	ccid.c \
diff --git a/extra/ccid/info_plist.awk b/pkg/ccid/info_plist.awk
index 50b3fcf7..50b3fcf7 100644
--- a/extra/ccid/info_plist.awk
+++ b/pkg/ccid/info_plist.awk
diff --git a/extra/ccid/patch/0001-Check-in-source-files-from-ccid-1.4.24-distribution.patch b/pkg/ccid/patch/0001-Check-in-source-files-from-ccid-1.4.24-distribution.patch
index 75f32470..75f32470 100644
--- a/extra/ccid/patch/0001-Check-in-source-files-from-ccid-1.4.24-distribution.patch
+++ b/pkg/ccid/patch/0001-Check-in-source-files-from-ccid-1.4.24-distribution.patch
diff --git a/core/kbd/rev b/pkg/ccid/rev
index d00491fd..d00491fd 100644
--- a/core/kbd/rev
+++ b/pkg/ccid/rev
diff --git a/extra/ccid/src b/pkg/ccid/src
-Subproject a1197c49cee479f4187dfd05c900224b99127e1
+Subproject a1197c49cee479f4187dfd05c900224b99127e1
diff --git a/core/curl/curl_config.h b/pkg/curl/curl_config.h
index 65855097..65855097 100644
--- a/core/curl/curl_config.h
+++ b/pkg/curl/curl_config.h
diff --git a/core/curl/gen.rc b/pkg/curl/gen.rc
index 60974d86..f7174efe 100644
--- a/core/curl/gen.rc
+++ b/pkg/curl/gen.rc
@@ -1,7 +1,7 @@
 cflags\
 	-D HAVE_CONFIG_H\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/zlib/include\
+	-isystem '$builddir'/pkg/libressl/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I include\
 	-I '$dir' \
 	-I '$outdir'/include/curl\
@@ -14,7 +14,7 @@ for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
 build '$outdir'/include/curl/curlbuild.h copy '$srcdir'/include/curl/curlbuild.h.dist
 phony headers '$outdir'/^($hdrs include/curl/curlbuild.h)
 
-phony deps core/^(libressl zlib)^/headers
+phony deps pkg/^(libressl zlib)^/headers
 
 # src/lib/Makefile.inc:/^CSOURCES
 lib libcurl.a -d '$dir'/deps lib/^(\
@@ -47,10 +47,9 @@ lib libcurl.a -d '$dir'/deps lib/^(\
 		cyassl.c schannel.c darwinssl.c gskit.c\
 		mbedtls.c\
 	)\
-) '$builddir'/^(\
-	core/libressl/libssl.a.d\
-	core/libressl/libcrypto.a.d\
-	core/zlib/libz.a\
+) '$builddir'/pkg/^(\
+	libressl/^(libssl.a.d libcrypto.a.d)\
+	zlib/libz.a\
 )
 
 build '$outdir'/tool_hugehelp.c.o cc '$dir'/tool_hugehelp.c '||' '$srcdir'/src/tool_hugehelp.h
diff --git a/core/curl/rev b/pkg/curl/rev
index b8626c4c..b8626c4c 100644
--- a/core/curl/rev
+++ b/pkg/curl/rev
diff --git a/core/curl/src b/pkg/curl/src
-Subproject 3c561c657c2f0e553b19115a506592a8bbd744b
+Subproject 3c561c657c2f0e553b19115a506592a8bbd744b
diff --git a/core/curl/tool_hugehelp.c b/pkg/curl/tool_hugehelp.c
index bc33e2f1..bc33e2f1 100644
--- a/core/curl/tool_hugehelp.c
+++ b/pkg/curl/tool_hugehelp.c
diff --git a/desktop/dmenu/config.h b/pkg/dmenu/config.h
index 7ed23a78..7ed23a78 100644
--- a/desktop/dmenu/config.h
+++ b/pkg/dmenu/config.h
diff --git a/pkg/dmenu/gen.rc b/pkg/dmenu/gen.rc
new file mode 100644
index 00000000..5f681433
--- /dev/null
+++ b/pkg/dmenu/gen.rc
@@ -0,0 +1,32 @@
+cflags\
+	-D 'VERSION=''"4.6"''' \
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/libxkbcommon/src\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/swc/include\
+	-isystem '$builddir'/pkg/wayland/include\
+	-isystem '$builddir'/pkg/wld/include\
+	-I '$dir'
+
+phony deps\
+	'$builddir'/pkg/^(fontconfig libxkbcommon)^/fetch.stamp\
+	pkg/^(pixman swc wayland wld)^/headers
+
+exe dmenu -d '$dir'/deps dmenu.c drw.c util.c '$builddir'/pkg/^(\
+	swc/swc-protocol.c.o\
+	libxkbcommon/libxkbcommon.a\
+	wld/libwld.a.d\
+	fontconfig/libfontconfig.a.d\
+	wayland/libwayland-client.a.d\
+)
+file bin/dmenu '$outdir'/dmenu 755
+file share/man/man1/dmenu.1 '$srcdir'/dmenu.1 644
+
+exe stest stest.c
+file bin/stest '$outdir'/stest 755
+file share/man/man1/stest.1 '$srcdir'/stest.1 644
+
+for(f in dmenu_path dmenu_run)
+	file bin/$f '$srcdir'/$f 755
+
+fetch git
diff --git a/desktop/dmenu/patch/0001-Port-to-wayland-using-wld-and-swc-panels.patch b/pkg/dmenu/patch/0001-Port-to-wayland-using-wld-and-swc-panels.patch
index 3c059c36..3c059c36 100644
--- a/desktop/dmenu/patch/0001-Port-to-wayland-using-wld-and-swc-panels.patch
+++ b/pkg/dmenu/patch/0001-Port-to-wayland-using-wld-and-swc-panels.patch
diff --git a/core/perp/rev b/pkg/dmenu/rev
index d00491fd..d00491fd 100644
--- a/core/perp/rev
+++ b/pkg/dmenu/rev
diff --git a/desktop/dmenu/src b/pkg/dmenu/src
-Subproject a9a5c6cc2d7d55ed7e556a4fe9d75307c6df2e8
+Subproject a9a5c6cc2d7d55ed7e556a4fe9d75307c6df2e8
diff --git a/core/e2fsprogs/.gitignore b/pkg/e2fsprogs/.gitignore
index 012dc66e..012dc66e 100644
--- a/core/e2fsprogs/.gitignore
+++ b/pkg/e2fsprogs/.gitignore
diff --git a/core/e2fsprogs/blkid_types.h b/pkg/e2fsprogs/blkid_types.h
index ee9b980a..ee9b980a 100644
--- a/core/e2fsprogs/blkid_types.h
+++ b/pkg/e2fsprogs/blkid_types.h
diff --git a/core/e2fsprogs/config.h b/pkg/e2fsprogs/config.h
index 6f018398..6f018398 100644
--- a/core/e2fsprogs/config.h
+++ b/pkg/e2fsprogs/config.h
diff --git a/core/e2fsprogs/dirpaths.h b/pkg/e2fsprogs/dirpaths.h
index 6b0ac378..6b0ac378 100644
--- a/core/e2fsprogs/dirpaths.h
+++ b/pkg/e2fsprogs/dirpaths.h
diff --git a/core/e2fsprogs/ext2_types.h b/pkg/e2fsprogs/ext2_types.h
index c0c25c09..c0c25c09 100644
--- a/core/e2fsprogs/ext2_types.h
+++ b/pkg/e2fsprogs/ext2_types.h
diff --git a/core/e2fsprogs/gen.rc b/pkg/e2fsprogs/gen.rc
index 21b56b42..21b56b42 100644
--- a/core/e2fsprogs/gen.rc
+++ b/pkg/e2fsprogs/gen.rc
diff --git a/core/mdocml/rev b/pkg/e2fsprogs/rev
index 0cfbf088..0cfbf088 100644
--- a/core/mdocml/rev
+++ b/pkg/e2fsprogs/rev
diff --git a/core/e2fsprogs/src b/pkg/e2fsprogs/src
-Subproject 4e52870eeb08ed7532bf4fd3d5cb1538f714bdc
+Subproject 4e52870eeb08ed7532bf4fd3d5cb1538f714bdc
diff --git a/extra/efibootmgr/gen.rc b/pkg/efibootmgr/gen.rc
index 2e0cc06e..25feac5b 100644
--- a/extra/efibootmgr/gen.rc
+++ b/pkg/efibootmgr/gen.rc
@@ -1,10 +1,10 @@
 cflags\
-	-I '$builddir'/extra/efivar/include\
+	-I '$builddir'/pkg/efivar/include\
 	-I '$srcdir'/src/include
 
-exe efibootmgr -d extra/efivar/headers\
+exe efibootmgr -d pkg/efivar/headers\
 	src/^(efibootmgr/efibootmgr.c lib/^(efi.c unparse_path.c))\
-	'$builddir'/extra/efivar/^(libefiboot.a libefivar.a)
+	'$builddir'/pkg/efivar/^(libefiboot.a libefivar.a)
 file bin/efibootmgr '$outdir'/efibootmgr 755
 file share/man/man8/efibootmgr.8 '$srcdir'/src/man/man8/efibootmgr.8 644
 
diff --git a/core/util-linux/rev b/pkg/efibootmgr/rev
index d00491fd..d00491fd 100644
--- a/core/util-linux/rev
+++ b/pkg/efibootmgr/rev
diff --git a/extra/efibootmgr/src b/pkg/efibootmgr/src
-Subproject bedb008bbc464818dbeabce6cbd0fec88b5d938
+Subproject bedb008bbc464818dbeabce6cbd0fec88b5d938
diff --git a/desktop/swc/.gitignore b/pkg/efivar/.gitignore
index 012dc66e..012dc66e 100644
--- a/desktop/swc/.gitignore
+++ b/pkg/efivar/.gitignore
diff --git a/extra/efivar/compat.h b/pkg/efivar/compat.h
index 4f4842f7..4f4842f7 100644
--- a/extra/efivar/compat.h
+++ b/pkg/efivar/compat.h
diff --git a/extra/efivar/gen.rc b/pkg/efivar/gen.rc
index 4dc6f8fd..4dc6f8fd 100644
--- a/extra/efivar/gen.rc
+++ b/pkg/efivar/gen.rc
diff --git a/extra/efivar/patch/0001-Workaround-rename-of-linux-nvme.h.patch b/pkg/efivar/patch/0001-Workaround-rename-of-linux-nvme.h.patch
index d18b779f..d18b779f 100644
--- a/extra/efivar/patch/0001-Workaround-rename-of-linux-nvme.h.patch
+++ b/pkg/efivar/patch/0001-Workaround-rename-of-linux-nvme.h.patch
diff --git a/core/xz/rev b/pkg/efivar/rev
index d00491fd..d00491fd 100644
--- a/core/xz/rev
+++ b/pkg/efivar/rev
diff --git a/extra/efivar/src b/pkg/efivar/src
-Subproject 6478af5af7e2fc8fa2247a47b6db9f2a5dc9136
+Subproject 6478af5af7e2fc8fa2247a47b6db9f2a5dc9136
diff --git a/desktop/expat/expat_config.h b/pkg/expat/expat_config.h
index 2fb97f3c..2fb97f3c 100644
--- a/desktop/expat/expat_config.h
+++ b/pkg/expat/expat_config.h
diff --git a/desktop/expat/gen.rc b/pkg/expat/gen.rc
index e1bb03c8..e1bb03c8 100644
--- a/desktop/expat/gen.rc
+++ b/pkg/expat/gen.rc
diff --git a/core/zlib/rev b/pkg/expat/rev
index d00491fd..d00491fd 100644
--- a/core/zlib/rev
+++ b/pkg/expat/rev
diff --git a/desktop/expat/src b/pkg/expat/src
-Subproject fbc46fa2be307280648147543c053d05910f7a8
+Subproject fbc46fa2be307280648147543c053d05910f7a8
diff --git a/media/ffmpeg/avconfig.awk b/pkg/ffmpeg/avconfig.awk
index b1f9628f..b1f9628f 100644
--- a/media/ffmpeg/avconfig.awk
+++ b/pkg/ffmpeg/avconfig.awk
diff --git a/media/ffmpeg/bitstream_filters.awk b/pkg/ffmpeg/bitstream_filters.awk
index 878f87e6..878f87e6 100644
--- a/media/ffmpeg/bitstream_filters.awk
+++ b/pkg/ffmpeg/bitstream_filters.awk
diff --git a/media/ffmpeg/config.h b/pkg/ffmpeg/config.h
index 1d12d38e..1d12d38e 100644
--- a/media/ffmpeg/config.h
+++ b/pkg/ffmpeg/config.h
diff --git a/media/ffmpeg/config.mak b/pkg/ffmpeg/config.mak
index 5cb3ecf3..5cb3ecf3 100644
--- a/media/ffmpeg/config.mak
+++ b/pkg/ffmpeg/config.mak
diff --git a/media/ffmpeg/gen.rc b/pkg/ffmpeg/gen.rc
index 2d3269a3..767e532a 100644
--- a/media/ffmpeg/gen.rc
+++ b/pkg/ffmpeg/gen.rc
@@ -4,8 +4,8 @@ cflags\
 	-Wno-deprecated-declarations\
 	-Wno-discarded-qualifiers\
 	-D HAVE_AV_CONFIG_H\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/media/alsa-lib/include\
+	-isystem '$builddir'/pkg/alsa-lib/include\
+	-isystem '$builddir'/pkg/libressl/include\
 	-I '$dir' \
 	-I '$outdir'/include\
 	-I '$outdir'/internal\
@@ -36,7 +36,7 @@ phony headers '$outdir'/include/libavutil/^(avconfig.h ffversion.h)
 
 phony deps\
 	'$outdir'/config.asm\
-	('$dir' core/libressl media/alsa-lib)^/headers
+	('$dir' pkg/libressl pkg/alsa-lib)^/headers
 
 fn fflib {
 	name=$1 srcs=() libs=()
@@ -129,7 +129,7 @@ fflib libavformat\
 	url.c\
 	utils.c\
 	libavcodec.a.d libavutil.a\
-	'$builddir'/core/libressl/libssl.a.d
+	'$builddir'/pkg/libressl/libssl.a.d
 
 fflib libavutil\
 	adler32.c\
diff --git a/media/ffmpeg/options.h b/pkg/ffmpeg/options.h
index 7130924f..7130924f 100644
--- a/media/ffmpeg/options.h
+++ b/pkg/ffmpeg/options.h
diff --git a/media/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch b/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch
index 79c67461..79c67461 100644
--- a/media/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch
+++ b/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch
diff --git a/media/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch b/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch
index d6b67728..d6b67728 100644
--- a/media/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch
+++ b/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch
diff --git a/media/ffmpeg/protocols.awk b/pkg/ffmpeg/protocols.awk
index fb0bab68..fb0bab68 100644
--- a/media/ffmpeg/protocols.awk
+++ b/pkg/ffmpeg/protocols.awk
diff --git a/core/openbsd/rev b/pkg/ffmpeg/rev
index 7f8f011e..7f8f011e 100644
--- a/core/openbsd/rev
+++ b/pkg/ffmpeg/rev
diff --git a/media/ffmpeg/scripts/README.md b/pkg/ffmpeg/scripts/README.md
index 344e246a..344e246a 100644
--- a/media/ffmpeg/scripts/README.md
+++ b/pkg/ffmpeg/scripts/README.md
diff --git a/media/ffmpeg/scripts/sources.mk b/pkg/ffmpeg/scripts/sources.mk
index 8e0d363e..8e0d363e 100644
--- a/media/ffmpeg/scripts/sources.mk
+++ b/pkg/ffmpeg/scripts/sources.mk
diff --git a/media/ffmpeg/scripts/sources.rc b/pkg/ffmpeg/scripts/sources.rc
index d963e714..d963e714 100755
--- a/media/ffmpeg/scripts/sources.rc
+++ b/pkg/ffmpeg/scripts/sources.rc
diff --git a/media/ffmpeg/sources.awk b/pkg/ffmpeg/sources.awk
index 1688cb5f..1688cb5f 100644
--- a/media/ffmpeg/sources.awk
+++ b/pkg/ffmpeg/sources.awk
diff --git a/media/ffmpeg/sources.txt b/pkg/ffmpeg/sources.txt
index 31cf1b48..31cf1b48 100644
--- a/media/ffmpeg/sources.txt
+++ b/pkg/ffmpeg/sources.txt
diff --git a/media/ffmpeg/src b/pkg/ffmpeg/src
-Subproject c269c43a83166003ab6649263bc60634a6b7866
+Subproject c269c43a83166003ab6649263bc60634a6b7866
diff --git a/core/file/config.h b/pkg/file/config.h
index 9bdf61af..9bdf61af 100644
--- a/core/file/config.h
+++ b/pkg/file/config.h
diff --git a/core/file/gen.rc b/pkg/file/gen.rc
index 5547d101..005f28cc 100644
--- a/core/file/gen.rc
+++ b/pkg/file/gen.rc
@@ -4,7 +4,7 @@ cflags\
 	-D HAVE_CONFIG_H\
 	-D 'MAGIC=''"/share/file/magic"''' \
 	-D _GNU_SOURCE\
-	-isystem '$builddir'/core/zlib/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I include\
 	-I '$dir' \
 	-I '$outdir'/include
@@ -20,7 +20,7 @@ build '$outdir'/file.1 sed '$srcdir'/doc/file.man ; exprs=(\
 	-e s,__MAGIC__,/share/file/magic,g\
 ) with expr $"exprs
 
-phony deps ('$dir' core/zlib)^/headers
+phony deps ('$dir' pkg/zlib)^/headers
 
 lib libmagic.a -d '$dir'/deps src/^(\
 	magic.c\
@@ -43,7 +43,7 @@ lib libmagic.a -d '$dir'/deps src/^(\
 	fmtcheck.c\
 )
 
-exe file -d '$dir'/headers src/file.c libmagic.a '$builddir/core/zlib/libz.a'
+exe file -d '$dir'/headers src/file.c libmagic.a '$builddir/pkg/zlib/libz.a'
 file bin/file '$outdir'/file 755
 file share/man/man1/file.1 '$outdir'/file.1 644
 
diff --git a/core/file/magic.txt b/pkg/file/magic.txt
index 89286288..89286288 100644
--- a/core/file/magic.txt
+++ b/pkg/file/magic.txt
diff --git a/core/ninja/rev b/pkg/file/rev
index 0cfbf088..0cfbf088 100644
--- a/core/ninja/rev
+++ b/pkg/file/rev
diff --git a/core/file/src b/pkg/file/src
-Subproject 015b0cdce1a0abb68ab99510e7fc8d2f77e8ec7
+Subproject 015b0cdce1a0abb68ab99510e7fc8d2f77e8ec7
diff --git a/desktop/fontconfig/config.h b/pkg/fontconfig/config.h
index e650a6ba..e650a6ba 100644
--- a/desktop/fontconfig/config.h
+++ b/pkg/fontconfig/config.h
diff --git a/desktop/fontconfig/gen.rc b/pkg/fontconfig/gen.rc
index 7dbf56b4..772ebab2 100644
--- a/desktop/fontconfig/gen.rc
+++ b/pkg/fontconfig/gen.rc
@@ -1,13 +1,13 @@
 cflags\
 	-D HAVE_CONFIG_H\
-	-isystem '$builddir'/desktop/expat/include\
-	-isystem desktop/freetype/src/include\
+	-isystem '$builddir'/pkg/expat/include\
+	-isystem pkg/freetype/src/include\
 	-I include\
 	-I '$dir' \
 	-I '$outdir' \
 	-I '$srcdir'
 
-deps=(desktop/expat/headers '$builddir'/desktop/freetype/fetch.stamp)
+deps=(pkg/expat/headers '$builddir'/pkg/freetype/fetch.stamp)
 
 rule makealias '$srcdir/src/makealias $srcdir/src $out $in'
 fn makealias {
@@ -50,9 +50,9 @@ lib libfontconfig.a -d '$dir'/deps src/^(\
 	fcweight.c\
 	fcxml.c\
 	ftglue.c\
-) '$builddir'/^(\
-	desktop/expat/libexpat.a\
-	desktop/freetype/libfreetype.a.d\
+) '$builddir'/pkg/^(\
+	expat/libexpat.a\
+	freetype/libfreetype.a.d\
 )
 
 fetch git
diff --git a/desktop/fontconfig/patch/0001-Add-generated-sources-from-fontconfig-2.12.1-distrib.patch b/pkg/fontconfig/patch/0001-Add-generated-sources-from-fontconfig-2.12.1-distrib.patch
index 8641d294..8641d294 100644
--- a/desktop/fontconfig/patch/0001-Add-generated-sources-from-fontconfig-2.12.1-distrib.patch
+++ b/pkg/fontconfig/patch/0001-Add-generated-sources-from-fontconfig-2.12.1-distrib.patch
diff --git a/desktop/dmenu/rev b/pkg/fontconfig/rev
index d00491fd..d00491fd 100644
--- a/desktop/dmenu/rev
+++ b/pkg/fontconfig/rev
diff --git a/desktop/fontconfig/src b/pkg/fontconfig/src
-Subproject 6b222c52cdede497ffed629853f947948052dfc
+Subproject 6b222c52cdede497ffed629853f947948052dfc
diff --git a/desktop/freetype/gen.rc b/pkg/freetype/gen.rc
index e92bc4ad..ce88630a 100644
--- a/desktop/freetype/gen.rc
+++ b/pkg/freetype/gen.rc
@@ -5,12 +5,12 @@ cflags\
 	-D HAVE_FCNTL_H\
 	-D HAVE_STDINT_H\
 	-D HAVE_UNISTD_H\
-	-isystem '$builddir'/core/zlib/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I '$srcdir'/builds/unix\
 	-I '$srcdir'/include/freetype/config\
 	-I '$srcdir'/include
 
-cc src/gzip/ftgzip.c '||' core/zlib/headers
+cc src/gzip/ftgzip.c '||' pkg/zlib/headers
 lib libfreetype.a builds/unix/ftsystem.c src/^(\
 	base/^(\
 		ftdebug.c ftbase.c ftbbox.c ftbdf.c ftbitmap.c ftcid.c\
@@ -38,6 +38,6 @@ lib libfreetype.a builds/unix/ftsystem.c src/^(\
 	type1/type1.c\
 	type42/type42.c\
 	winfonts/winfnt.c\
-) '$builddir'/core/zlib/libz.a
+) '$builddir'/pkg/zlib/libz.a
 
 fetch git
diff --git a/core/iproute2/rev b/pkg/freetype/rev
index 00750edc..00750edc 100644
--- a/core/iproute2/rev
+++ b/pkg/freetype/rev
diff --git a/desktop/freetype/src b/pkg/freetype/src
-Subproject f9b1871ded4df726ed962e5eae535c9918705a3
+Subproject f9b1871ded4df726ed962e5eae535c9918705a3
diff --git a/extra/efivar/.gitignore b/pkg/fribidi/.gitignore
index 012dc66e..012dc66e 100644
--- a/extra/efivar/.gitignore
+++ b/pkg/fribidi/.gitignore
diff --git a/extra/fribidi/config.h b/pkg/fribidi/config.h
index 60024eab..60024eab 100644
--- a/extra/fribidi/config.h
+++ b/pkg/fribidi/config.h
diff --git a/extra/fribidi/fribidi-config.h b/pkg/fribidi/fribidi-config.h
index d7791240..d7791240 100644
--- a/extra/fribidi/fribidi-config.h
+++ b/pkg/fribidi/fribidi-config.h
diff --git a/extra/fribidi/gen.rc b/pkg/fribidi/gen.rc
index 18d55075..18d55075 100644
--- a/extra/fribidi/gen.rc
+++ b/pkg/fribidi/gen.rc
diff --git a/desktop/expat/rev b/pkg/fribidi/rev
index d00491fd..d00491fd 100644
--- a/desktop/expat/rev
+++ b/pkg/fribidi/rev
diff --git a/extra/fribidi/src b/pkg/fribidi/src
-Subproject 1a6935cd8cd7d907fb3c5f3bcae174bee727c83
+Subproject 1a6935cd8cd7d907fb3c5f3bcae174bee727c83
diff --git a/pkg/gen.rc b/pkg/gen.rc
new file mode 100644
index 00000000..1dfedf29
--- /dev/null
+++ b/pkg/gen.rc
@@ -0,0 +1,82 @@
+subgen alsa-lib
+subgen alsa-utils
+subgen awk
+subgen bc
+subgen bzip2
+subgen ccid
+subgen curl
+subgen dmenu
+subgen e2fsprogs
+subgen efibootmgr
+subgen efivar
+subgen expat
+subgen ffmpeg
+subgen file
+subgen fontconfig
+subgen freetype
+subgen fribidi
+subgen git
+subgen hostap
+subgen ii
+subgen iproute2
+subgen kbd
+subgen less
+subgen libass
+subgen libdrm
+subgen libevdev
+subgen libevent
+subgen libffi
+subgen libfuse
+subgen libnl
+subgen libpciaccess
+subgen libressl
+subgen libtermkey
+subgen libusb
+subgen libxkbcommon
+subgen loksh
+subgen lpeg
+subgen lua
+subgen make
+subgen man-pages-posix
+subgen mc
+subgen mdocml
+subgen mpv
+subgen msmtp
+subgen nasm
+subgen ncurses
+subgen ninja
+subgen openbsd
+subgen openssh
+subgen pcre
+subgen pcsc
+subgen perp
+subgen pigz
+subgen pixman
+subgen plan9fonts
+subgen plan9port
+subgen python
+subgen qbe
+subgen sbase
+subgen scc
+subgen sdhcp
+subgen sinit
+subgen skeleton
+subgen sshfs
+subgen st
+subgen swc
+subgen terminus-font
+subgen the_silver_searcher
+subgen transmission
+subgen tz
+subgen ubase
+subgen unzip
+subgen util-linux
+subgen velox
+subgen vis
+subgen wayland
+subgen wayland-protocols
+subgen wld
+subgen xkeyboard-config
+subgen xz
+subgen youtube-dl
+subgen zlib
diff --git a/core/git/commands.txt b/pkg/git/commands.txt
index a5d3f05a..a5d3f05a 100644
--- a/core/git/commands.txt
+++ b/pkg/git/commands.txt
diff --git a/core/git/config.h b/pkg/git/config.h
index 47cb9d5b..47cb9d5b 100644
--- a/core/git/config.h
+++ b/pkg/git/config.h
diff --git a/core/git/gen.rc b/pkg/git/gen.rc
index 3fdcabef..12a5e772 100644
--- a/core/git/gen.rc
+++ b/pkg/git/gen.rc
@@ -1,8 +1,8 @@
 cflags\
 	-include '$dir'/config.h\
-	-isystem '$builddir'/core/zlib/include\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/curl/include\
+	-isystem '$builddir'/pkg/curl/include\
+	-isystem '$builddir'/pkg/libressl/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I '$srcdir' \
 	-I '$srcdir'/compat/regex\
 	-I '$outdir'
@@ -10,7 +10,7 @@ cflags\
 rule cmdlist 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out'
 build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/Documentation/`{grep -v '^#' commands.txt}
 
-phony deps '$outdir'/common-cmds.h core/^(curl libressl zlib)^/headers
+phony deps '$outdir'/common-cmds.h pkg/^(curl libressl zlib)^/headers
 
 cc exec_cmd.c '||' '$dir'/deps ; with cflags '$cflags ''-DPREFIX=""'''
 cc common-main.c '||' '$dir'/deps
@@ -185,7 +185,7 @@ lib libgit.a -d '$dir'/deps\
 	\
 	thread-utils.c\
 	libxdiff.a\
-	'$builddir'/^(core/libressl/libcrypto.a.d core/zlib/libz.a)
+	'$builddir'/pkg/^(libressl/libcrypto.a.d zlib/libz.a)
 
 # src/Makefile:/^XDIFF_OBJS.\+=
 lib libxdiff.a xdiff/^(\
@@ -320,14 +320,14 @@ x credential-store
 x daemon
 x fast-import
 x http-backend
-x imap-send imap-send.c '$builddir'/core/libressl/libssl.a.d
+x imap-send imap-send.c '$builddir'/pkg/libressl/libssl.a.d
 x sh-i18n--envsubst
 x shell
 x show-index
 x upload-pack
 # git-remote-testsvn is intentionally omitted.
 
-x remote-http remote-curl.c http.c http-walker.c '$builddir'/core/curl/libcurl.a.d
+x remote-http remote-curl.c http.c http-walker.c '$builddir'/pkg/curl/libcurl.a.d
 for(remote in https ftp ftps) sym libexec/git-core/git-remote-$remote git-remote-http
 
 rule sh_gen 'sed -f $dir/sh_gen.sed $in >$out.tmp && mv $out.tmp $out'
diff --git a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
index 717f8b13..717f8b13 100644
--- a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
+++ b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
diff --git a/core/git/rev b/pkg/git/rev
index 45a4fb75..45a4fb75 100644
--- a/core/git/rev
+++ b/pkg/git/rev
diff --git a/core/git/sh_gen.sed b/pkg/git/sh_gen.sed
index ea0f0f21..ea0f0f21 100644
--- a/core/git/sh_gen.sed
+++ b/pkg/git/sh_gen.sed
diff --git a/core/git/src b/pkg/git/src
-Subproject 454cb6bd52a4de614a3633e4f547af03d5c3b64
+Subproject 454cb6bd52a4de614a3633e4f547af03d5c3b64
diff --git a/extra/hostap/config.h b/pkg/hostap/config.h
index 75c66698..75c66698 100644
--- a/extra/hostap/config.h
+++ b/pkg/hostap/config.h
diff --git a/extra/hostap/gen.rc b/pkg/hostap/gen.rc
index 9f5d3e62..5c53f336 100644
--- a/extra/hostap/gen.rc
+++ b/pkg/hostap/gen.rc
@@ -1,11 +1,11 @@
 cflags\
 	-include '$dir'/config.h\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/extra/libnl/include\
+	-isystem '$builddir'/pkg/libressl/include\
+	-isystem '$builddir'/pkg/libnl/include\
 	-I '$srcdir'/src/utils\
 	-I '$srcdir'/src
 
-phony deps (core/libressl extra/libnl)^/headers
+phony deps pkg/^(libressl libnl)^/headers
 
 lib libcommon.a -d '$dir'/deps src/utils/^(common.c eloop.c os_unix.c wpa_debug.c)
 
@@ -71,10 +71,10 @@ exe bin/wpa_supplicant -d '$dir'/deps\
 		wpas_glue.c\
 	)\
 	libcommon.a\
-	'$builddir'/^(\
-		core/libressl/libcrypto.a\
-		core/openbsd/libbsd.a\
-		extra/libnl/^(libnl-3.a libnl-genl-3.a)\
+	'$builddir'/pkg/^(\
+		libressl/libcrypto.a\
+		openbsd/libbsd.a\
+		libnl/^(libnl-3.a libnl-genl-3.a)\
 	)
 file bin/wpa_supplicant '$outdir'/bin/wpa_supplicant 755
 
diff --git a/extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch b/pkg/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch
index 4477adb3..4477adb3 100644
--- a/extra/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch
+++ b/pkg/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch
diff --git a/core/openssh/rev b/pkg/hostap/rev
index 0cfbf088..0cfbf088 100644
--- a/core/openssh/rev
+++ b/pkg/hostap/rev
diff --git a/extra/hostap/src b/pkg/hostap/src
-Subproject 2462f347bca0a7cce7e06ff88adbe3aa47c52d5
+Subproject 2462f347bca0a7cce7e06ff88adbe3aa47c52d5
diff --git a/extra/ii/gen.rc b/pkg/ii/gen.rc
index 9b8f8e56..9b8f8e56 100644
--- a/extra/ii/gen.rc
+++ b/pkg/ii/gen.rc
diff --git a/desktop/fontconfig/rev b/pkg/ii/rev
index d00491fd..d00491fd 100644
--- a/desktop/fontconfig/rev
+++ b/pkg/ii/rev
diff --git a/extra/ii/src b/pkg/ii/src
-Subproject 714bd0cb6ae1eae57ca69b4dbe9fb5243c7a945
+Subproject 714bd0cb6ae1eae57ca69b4dbe9fb5243c7a945
diff --git a/core/iproute2/gen.rc b/pkg/iproute2/gen.rc
index 2b27d2f5..2b27d2f5 100644
--- a/core/iproute2/gen.rc
+++ b/pkg/iproute2/gen.rc
diff --git a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
index 5c970a38..5c970a38 100644
--- a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
+++ b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
diff --git a/core/libressl/rev b/pkg/iproute2/rev
index 00750edc..00750edc 100644
--- a/core/libressl/rev
+++ b/pkg/iproute2/rev
diff --git a/core/iproute2/src b/pkg/iproute2/src
-Subproject 63ec17a3da8138e6e363e7d89cab4a797d90fa3
+Subproject 63ec17a3da8138e6e363e7d89cab4a797d90fa3
diff --git a/core/kbd/config.h b/pkg/kbd/config.h
index 0931f0c3..0931f0c3 100644
--- a/core/kbd/config.h
+++ b/pkg/kbd/config.h
diff --git a/core/kbd/gen.rc b/pkg/kbd/gen.rc
index fd2c3578..fd2c3578 100644
--- a/core/kbd/gen.rc
+++ b/pkg/kbd/gen.rc
diff --git a/core/kbd/keymaps.txt b/pkg/kbd/keymaps.txt
index b419eb0c..b419eb0c 100644
--- a/core/kbd/keymaps.txt
+++ b/pkg/kbd/keymaps.txt
diff --git a/core/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch b/pkg/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch
index a17c040b..a17c040b 100644
--- a/core/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch
+++ b/pkg/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch
diff --git a/desktop/libffi/rev b/pkg/kbd/rev
index d00491fd..d00491fd 100644
--- a/desktop/libffi/rev
+++ b/pkg/kbd/rev
diff --git a/core/kbd/src b/pkg/kbd/src
-Subproject f1cbca04b4b9ae782ed8b4391b682615cb77d99
+Subproject f1cbca04b4b9ae782ed8b4391b682615cb77d99
diff --git a/extra/less/.gitignore b/pkg/less/.gitignore
index 937c7e72..937c7e72 100644
--- a/extra/less/.gitignore
+++ b/pkg/less/.gitignore
diff --git a/extra/less/defines.h b/pkg/less/defines.h
index 5dc06828..5dc06828 100644
--- a/extra/less/defines.h
+++ b/pkg/less/defines.h
diff --git a/extra/less/gen.rc b/pkg/less/gen.rc
index ff5fbd97..ee0d16b4 100644
--- a/extra/less/gen.rc
+++ b/pkg/less/gen.rc
@@ -1,16 +1,16 @@
 cflags\
-	-isystem '$builddir'/extra/ncurses/include\
+	-isystem '$builddir'/pkg/ncurses/include\
 	-I include\
 	-I '$dir'
 
-exe less -d extra/ncurses/headers\
+exe less -d pkg/ncurses/headers\
 	main.c screen.c brac.c ch.c charset.c cmdbuf.c\
 	command.c cvt.c decode.c edit.c filename.c forwback.c\
 	help.c ifile.c input.c jump.c line.c linenum.c\
 	lsystem.c mark.c optfunc.c option.c opttbl.c os.c\
 	output.c pattern.c position.c prompt.c search.c signal.c\
 	tags.c ttyin.c version.c\
-	'$builddir'/extra/ncurses/libncurses.a
+	'$builddir'/pkg/ncurses/libncurses.a
 file bin/less '$outdir'/less 755
 file share/man/man1/less.1 '$srcdir'/less.nro 644
 
diff --git a/desktop/libpciaccess/rev b/pkg/less/rev
index d00491fd..d00491fd 100644
--- a/desktop/libpciaccess/rev
+++ b/pkg/less/rev
diff --git a/extra/less/sha256 b/pkg/less/sha256
index f404456f..f404456f 100644
--- a/extra/less/sha256
+++ b/pkg/less/sha256
diff --git a/extra/less/url b/pkg/less/url
index 1d361f40..1d361f40 100644
--- a/extra/less/url
+++ b/pkg/less/url
diff --git a/media/libass/config.h b/pkg/libass/config.h
index 71715af2..71715af2 100644
--- a/media/libass/config.h
+++ b/pkg/libass/config.h
diff --git a/media/libass/gen.rc b/pkg/libass/gen.rc
index 286c6f26..bc116e15 100644
--- a/media/libass/gen.rc
+++ b/pkg/libass/gen.rc
@@ -1,6 +1,6 @@
 cflags\
-	-isystem '$builddir'/extra/fribidi/include\
-	-isystem desktop/freetype/src/include\
+	-isystem '$builddir'/pkg/fribidi/include\
+	-isystem pkg/freetype/src/include\
 	-I include\
 	-I '$dir'
 
@@ -9,7 +9,7 @@ for(hdr in $hdrs)
 	build '$outdir'/include/ass/$hdr copy '$srcdir'/libass/$hdr
 phony headers '$outdir'/include/ass/$hdrs
 
-phony deps '$builddir'/desktop/freetype/fetch.stamp extra/fribidi/headers
+phony deps '$builddir'/pkg/freetype/fetch.stamp pkg/fribidi/headers
 
 lib libass.a -d '$dir'/deps libass/^(\
 	ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c\
@@ -19,9 +19,9 @@ lib libass.a -d '$dir'/deps libass/^(\
 	ass_strtod.c ass_fontconfig.c\
 	ass_string.c\
 	ass_rasterizer.c ass_rasterizer_c.c\
-) '$builddir'/^(\
-	desktop/freetype/libfreetype.a.d\
-	extra/fribidi/libfribidi.a\
+) '$builddir'/pkg/^(\
+	freetype/libfreetype.a.d\
+	fribidi/libfribidi.a\
 )
 
 fetch git
diff --git a/core/pigz/rev b/pkg/libass/rev
index 00750edc..00750edc 100644
--- a/core/pigz/rev
+++ b/pkg/libass/rev
diff --git a/media/libass/src b/pkg/libass/src
-Subproject 8551555c86f50f978f9ddd55a8d20bceb80d92f
+Subproject 8551555c86f50f978f9ddd55a8d20bceb80d92f
diff --git a/desktop/libdrm/config.h b/pkg/libdrm/config.h
index e6cf51e8..e6cf51e8 100644
--- a/desktop/libdrm/config.h
+++ b/pkg/libdrm/config.h
diff --git a/desktop/libdrm/gen.rc b/pkg/libdrm/gen.rc
index 90f8af65..26806e70 100644
--- a/desktop/libdrm/gen.rc
+++ b/pkg/libdrm/gen.rc
@@ -13,14 +13,14 @@ lib libdrm.a\
 	xf86drmMode.c
 
 if(~ intel $config_video_drivers) {
-	cflags -D 'HAVE_INTEL=1' -isystem desktop/libpciaccess/src/include
-	lib libdrm_intel.a -d '$builddir'/desktop/libpciaccess/fetch.stamp intel/^(\
+	cflags -D 'HAVE_INTEL=1' -isystem pkg/libpciaccess/src/include
+	lib libdrm_intel.a -d '$builddir'/pkg/libpciaccess/fetch.stamp intel/^(\
 		intel_bufmgr.c\
 		intel_bufmgr_fake.c\
 		intel_bufmgr_gem.c\
 		intel_decode.c\
 		mm.c\
-	) '$builddir'/desktop/libpciaccess/libpciaccess.a
+	) '$builddir'/pkg/libpciaccess/libpciaccess.a
 }
 
 if(~ nouveau $config_video_drivers) {
diff --git a/desktop/libdrm/rev b/pkg/libdrm/rev
index 7ed6ff82..7ed6ff82 100644
--- a/desktop/libdrm/rev
+++ b/pkg/libdrm/rev
diff --git a/desktop/libdrm/src b/pkg/libdrm/src
-Subproject dae413e43866d36500538c2801cc66a5a89e426
+Subproject dae413e43866d36500538c2801cc66a5a89e426
diff --git a/desktop/libevdev/config.h b/pkg/libevdev/config.h
index 54528629..54528629 100644
--- a/desktop/libevdev/config.h
+++ b/pkg/libevdev/config.h
diff --git a/desktop/libevdev/gen.rc b/pkg/libevdev/gen.rc
index c65456b9..c65456b9 100644
--- a/desktop/libevdev/gen.rc
+++ b/pkg/libevdev/gen.rc
diff --git a/desktop/libevdev/patch/0001-Add-generated-event-names.h.patch b/pkg/libevdev/patch/0001-Add-generated-event-names.h.patch
index 109ea0bb..109ea0bb 100644
--- a/desktop/libevdev/patch/0001-Add-generated-event-names.h.patch
+++ b/pkg/libevdev/patch/0001-Add-generated-event-names.h.patch
diff --git a/core/plan9port/rev b/pkg/libevdev/rev
index 00750edc..00750edc 100644
--- a/core/plan9port/rev
+++ b/pkg/libevdev/rev
diff --git a/desktop/libevdev/src b/pkg/libevdev/src
-Subproject 452847a31471e5b4e13aa544cd74d3933b63793
+Subproject 452847a31471e5b4e13aa544cd74d3933b63793
diff --git a/extra/libevent/config.h b/pkg/libevent/config.h
index 8b729bcf..8b729bcf 100644
--- a/extra/libevent/config.h
+++ b/pkg/libevent/config.h
diff --git a/extra/libevent/gen.rc b/pkg/libevent/gen.rc
index 1656be3e..1a9fb3c3 100644
--- a/extra/libevent/gen.rc
+++ b/pkg/libevent/gen.rc
@@ -2,7 +2,7 @@ cflags\
 	-I '$outdir'/include\
 	-I '$srcdir'/include\
 	-I include\
-	-idirafter core/openbsd/src/sys
+	-idirafter pkg/openbsd/src/sys
 
 build '$outdir'/include/event2/event-config.h\
 	sed '$dir'/config.h '|' '$srcdir'/make-event-config.sed
diff --git a/desktop/pixman/rev b/pkg/libevent/rev
index d00491fd..d00491fd 100644
--- a/desktop/pixman/rev
+++ b/pkg/libevent/rev
diff --git a/extra/libevent/src b/pkg/libevent/src
-Subproject c51b159cff9f5e86696f5b9a4c6f51727605625
+Subproject c51b159cff9f5e86696f5b9a4c6f51727605625
diff --git a/desktop/libffi/fficonfig.h b/pkg/libffi/fficonfig.h
index e49b5af1..e49b5af1 100644
--- a/desktop/libffi/fficonfig.h
+++ b/pkg/libffi/fficonfig.h
diff --git a/desktop/libffi/gen.rc b/pkg/libffi/gen.rc
index 3c182720..3c182720 100644
--- a/desktop/libffi/gen.rc
+++ b/pkg/libffi/gen.rc
diff --git a/desktop/plan9fonts/rev b/pkg/libffi/rev
index d00491fd..d00491fd 100644
--- a/desktop/plan9fonts/rev
+++ b/pkg/libffi/rev
diff --git a/desktop/libffi/src b/pkg/libffi/src
-Subproject 20562ac0427c3578250d04c6e34fb0127d4551c
+Subproject 20562ac0427c3578250d04c6e34fb0127d4551c
diff --git a/extra/libfuse/config.h b/pkg/libfuse/config.h
index a4dfbf5a..a4dfbf5a 100644
--- a/extra/libfuse/config.h
+++ b/pkg/libfuse/config.h
diff --git a/extra/libfuse/gen.rc b/pkg/libfuse/gen.rc
index 096ac3e0..096ac3e0 100644
--- a/extra/libfuse/gen.rc
+++ b/pkg/libfuse/gen.rc
diff --git a/extra/libfuse/patch/0001-Fix-poll.h-include.patch b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
index 193a7b12..193a7b12 100644
--- a/extra/libfuse/patch/0001-Fix-poll.h-include.patch
+++ b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
diff --git a/core/sdhcp/rev b/pkg/libfuse/rev
index 0cfbf088..0cfbf088 100644
--- a/core/sdhcp/rev
+++ b/pkg/libfuse/rev
diff --git a/extra/libfuse/src b/pkg/libfuse/src
-Subproject df499bf1ce634f6e67d4d366c4475d32143f00f
+Subproject df499bf1ce634f6e67d4d366c4475d32143f00f
diff --git a/extra/libnl/defs.h b/pkg/libnl/defs.h
index 6c422830..6c422830 100644
--- a/extra/libnl/defs.h
+++ b/pkg/libnl/defs.h
diff --git a/extra/libnl/gen.rc b/pkg/libnl/gen.rc
index 35e846b8..35e846b8 100644
--- a/extra/libnl/gen.rc
+++ b/pkg/libnl/gen.rc
diff --git a/core/sinit/rev b/pkg/libnl/rev
index 0cfbf088..0cfbf088 100644
--- a/core/sinit/rev
+++ b/pkg/libnl/rev
diff --git a/extra/libnl/src b/pkg/libnl/src
-Subproject 656f381ccf58785319bb0236595c896125d33ed
+Subproject 656f381ccf58785319bb0236595c896125d33ed
diff --git a/desktop/libpciaccess/config.h b/pkg/libpciaccess/config.h
index d325750e..d325750e 100644
--- a/desktop/libpciaccess/config.h
+++ b/pkg/libpciaccess/config.h
diff --git a/desktop/libpciaccess/gen.rc b/pkg/libpciaccess/gen.rc
index ab0fb6ff..ab0fb6ff 100644
--- a/desktop/libpciaccess/gen.rc
+++ b/pkg/libpciaccess/gen.rc
diff --git a/desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/pkg/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
index c9a955b2..c9a955b2 100644
--- a/desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
+++ b/pkg/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
diff --git a/desktop/swc/rev b/pkg/libpciaccess/rev
index d00491fd..d00491fd 100644
--- a/desktop/swc/rev
+++ b/pkg/libpciaccess/rev
diff --git a/desktop/libpciaccess/src b/pkg/libpciaccess/src
-Subproject bbd1acdd1d25b9a68f4b7913a4094af20d7cf78
+Subproject bbd1acdd1d25b9a68f4b7913a4094af20d7cf78
diff --git a/core/libressl/gen.rc b/pkg/libressl/gen.rc
index c80e9ede..f2ba83f3 100644
--- a/core/libressl/gen.rc
+++ b/pkg/libressl/gen.rc
@@ -4,7 +4,7 @@ cflags\
 	-D OPENSSL_NO_HW_PADLOCK\
 	-D OPENSSL_NO_ASM\
 	-D '''__warn_references(sym,msg)=''' \
-	-isystem core/openbsd/include\
+	-isystem pkg/openbsd/include\
 	-I '$outdir'/include\
 	-I '$outdir'/internal\
 	-I '$srcdir'/src/lib/libcrypto\
@@ -268,7 +268,7 @@ lib libcrypto.a -d '$dir'/headers src/lib/libcrypto/^(\
 	des/^(des_enc.c fcrypt_b.c)\
 	rc4/^(rc4_enc.c rc4_skey.c)\
 	whrlpool/^(wp_block.c)\
-) '$builddir'/core/openbsd/libbsd.a
+) '$builddir'/pkg/openbsd/libbsd.a
 file lib/libcrypto.a '$outdir'/libcrypto.a 644
 
 # src/lib/libssl/ssl/Makefile
diff --git a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch b/pkg/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
index e1ecf6ad..e1ecf6ad 100644
--- a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
+++ b/pkg/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
diff --git a/desktop/freetype/rev b/pkg/libressl/rev
index 00750edc..00750edc 100644
--- a/desktop/freetype/rev
+++ b/pkg/libressl/rev
diff --git a/core/libressl/src b/pkg/libressl/src
-Subproject 57212869395854dda193040c4f46c8f0d3bb5a0
+Subproject 57212869395854dda193040c4f46c8f0d3bb5a0
diff --git a/extra/libtermkey/.gitignore b/pkg/libtermkey/.gitignore
index f6c9b14b..f6c9b14b 100644
--- a/extra/libtermkey/.gitignore
+++ b/pkg/libtermkey/.gitignore
diff --git a/pkg/libtermkey/gen.rc b/pkg/libtermkey/gen.rc
new file mode 100644
index 00000000..d2f2fdc8
--- /dev/null
+++ b/pkg/libtermkey/gen.rc
@@ -0,0 +1,9 @@
+cflags\
+	'-std=c99' -Wall\
+	-isystem '$builddir'/pkg/ncurses/include
+
+lib libtermkey.a -d pkg/ncurses/headers\
+	termkey.c driver-csi.c driver-ti.c\
+	'$builddir'/pkg/ncurses/libncurses.a
+
+fetch curl
diff --git a/desktop/terminus-font/rev b/pkg/libtermkey/rev
index d00491fd..d00491fd 100644
--- a/desktop/terminus-font/rev
+++ b/pkg/libtermkey/rev
diff --git a/extra/libtermkey/sha256 b/pkg/libtermkey/sha256
index 67ca7f70..67ca7f70 100644
--- a/extra/libtermkey/sha256
+++ b/pkg/libtermkey/sha256
diff --git a/extra/libtermkey/url b/pkg/libtermkey/url
index ce0c5c85..ce0c5c85 100644
--- a/extra/libtermkey/url
+++ b/pkg/libtermkey/url
diff --git a/extra/libusb/config.h b/pkg/libusb/config.h
index 64bd7839..64bd7839 100644
--- a/extra/libusb/config.h
+++ b/pkg/libusb/config.h
diff --git a/extra/libusb/gen.rc b/pkg/libusb/gen.rc
index e57cdd13..e57cdd13 100644
--- a/extra/libusb/gen.rc
+++ b/pkg/libusb/gen.rc
diff --git a/core/ubase/rev b/pkg/libusb/rev
index 0cfbf088..0cfbf088 100644
--- a/core/ubase/rev
+++ b/pkg/libusb/rev
diff --git a/extra/libusb/src b/pkg/libusb/src
-Subproject 09e75e98b4d9ea7909e8837b7a3f00dda4589dc
+Subproject 09e75e98b4d9ea7909e8837b7a3f00dda4589dc
diff --git a/desktop/libxkbcommon/config.h b/pkg/libxkbcommon/config.h
index 807fb6b9..807fb6b9 100644
--- a/desktop/libxkbcommon/config.h
+++ b/pkg/libxkbcommon/config.h
diff --git a/desktop/libxkbcommon/gen.rc b/pkg/libxkbcommon/gen.rc
index f97d57e5..f97d57e5 100644
--- a/desktop/libxkbcommon/gen.rc
+++ b/pkg/libxkbcommon/gen.rc
diff --git a/desktop/libxkbcommon/patch/0001-Import-parser.-c-h-from-libxkbcommon-0.7.0-distribut.patch b/pkg/libxkbcommon/patch/0001-Import-parser.-c-h-from-libxkbcommon-0.7.0-distribut.patch
index 6c15f0f2..6c15f0f2 100644
--- a/desktop/libxkbcommon/patch/0001-Import-parser.-c-h-from-libxkbcommon-0.7.0-distribut.patch
+++ b/pkg/libxkbcommon/patch/0001-Import-parser.-c-h-from-libxkbcommon-0.7.0-distribut.patch
diff --git a/desktop/libxkbcommon/rev b/pkg/libxkbcommon/rev
index 0cfbf088..0cfbf088 100644
--- a/desktop/libxkbcommon/rev
+++ b/pkg/libxkbcommon/rev
diff --git a/desktop/libxkbcommon/src b/pkg/libxkbcommon/src
-Subproject d596f6e3ff2d1fde0491907fa9354e5cdf154ed
+Subproject d596f6e3ff2d1fde0491907fa9354e5cdf154ed
diff --git a/core/loksh/gen.rc b/pkg/loksh/gen.rc
index 9f8ab699..3f6f28fc 100644
--- a/core/loksh/gen.rc
+++ b/pkg/loksh/gen.rc
@@ -1,9 +1,9 @@
 cflags\
 	-D _GNU_SOURCE\
 	-I include\
-	-idirafter core/openbsd/src/sys
+	-idirafter pkg/openbsd/src/sys
 
-cc emacs.c '||' '$builddir'/core/openbsd/fetch.stamp
+cc emacs.c '||' '$builddir'/pkg/openbsd/fetch.stamp
 exe ksh\
 	alloc.c\
 	c_ksh.c\
diff --git a/core/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch b/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch
index 44f96f35..44f96f35 100644
--- a/core/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch
+++ b/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch
diff --git a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch b/pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
index 9225f6fd..9225f6fd 100644
--- a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
+++ b/pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
diff --git a/core/loksh/rev b/pkg/loksh/rev
index b8626c4c..b8626c4c 100644
--- a/core/loksh/rev
+++ b/pkg/loksh/rev
diff --git a/core/loksh/src b/pkg/loksh/src
-Subproject 41570f1f0481eff704bd9ec6989a62053738489
+Subproject 41570f1f0481eff704bd9ec6989a62053738489
diff --git a/extra/lpeg/.gitignore b/pkg/lpeg/.gitignore
index a90c6951..a90c6951 100644
--- a/extra/lpeg/.gitignore
+++ b/pkg/lpeg/.gitignore
diff --git a/extra/lpeg/gen.rc b/pkg/lpeg/gen.rc
index a3de6bd8..f193e30c 100644
--- a/extra/lpeg/gen.rc
+++ b/pkg/lpeg/gen.rc
@@ -1,8 +1,8 @@
 cflags\
 	'-std=c99' \
-	-isystem lang/lua/src/src
+	-isystem pkg/lua/src/src
 
-lib liblpeg.a -d '$builddir'/lang/lua/fetch.stamp\
+lib liblpeg.a -d '$builddir'/pkg/lua/fetch.stamp\
 	lpvm.c lpcap.c lptree.c lpcode.c lpprint.c
 
 fetch curl
diff --git a/desktop/wayland-protocols/rev b/pkg/lpeg/rev
index d00491fd..d00491fd 100644
--- a/desktop/wayland-protocols/rev
+++ b/pkg/lpeg/rev
diff --git a/extra/lpeg/sha256 b/pkg/lpeg/sha256
index 6ecfc507..6ecfc507 100644
--- a/extra/lpeg/sha256
+++ b/pkg/lpeg/sha256
diff --git a/extra/lpeg/url b/pkg/lpeg/url
index 62d450bf..62d450bf 100644
--- a/extra/lpeg/url
+++ b/pkg/lpeg/url
diff --git a/lang/lua/.gitignore b/pkg/lua/.gitignore
index ccf896f9..ccf896f9 100644
--- a/lang/lua/.gitignore
+++ b/pkg/lua/.gitignore
diff --git a/lang/lua/gen.rc b/pkg/lua/gen.rc
index e596c832..e596c832 100644
--- a/lang/lua/gen.rc
+++ b/pkg/lua/gen.rc
diff --git a/desktop/wld/rev b/pkg/lua/rev
index d00491fd..d00491fd 100644
--- a/desktop/wld/rev
+++ b/pkg/lua/rev
diff --git a/lang/lua/sha256 b/pkg/lua/sha256
index 31f8228e..31f8228e 100644
--- a/lang/lua/sha256
+++ b/pkg/lua/sha256
diff --git a/lang/lua/url b/pkg/lua/url
index 9dbed4d5..9dbed4d5 100644
--- a/lang/lua/url
+++ b/pkg/lua/url
diff --git a/devel/make/config.h b/pkg/make/config.h
index 0938c4b2..0938c4b2 100644
--- a/devel/make/config.h
+++ b/pkg/make/config.h
diff --git a/devel/make/gen.rc b/pkg/make/gen.rc
index 1c46aa90..1c46aa90 100644
--- a/devel/make/gen.rc
+++ b/pkg/make/gen.rc
diff --git a/desktop/xkeyboard-config/rev b/pkg/make/rev
index d00491fd..d00491fd 100644
--- a/desktop/xkeyboard-config/rev
+++ b/pkg/make/rev
diff --git a/devel/make/src b/pkg/make/src
-Subproject 9ab8af7cd8aaac587787d9df7e34758951d7c47
+Subproject 9ab8af7cd8aaac587787d9df7e34758951d7c47
diff --git a/extra/man-pages-posix/.gitignore b/pkg/man-pages-posix/.gitignore
index 069144be..069144be 100644
--- a/extra/man-pages-posix/.gitignore
+++ b/pkg/man-pages-posix/.gitignore
diff --git a/extra/man-pages-posix/gen.rc b/pkg/man-pages-posix/gen.rc
index 55892923..55892923 100644
--- a/extra/man-pages-posix/gen.rc
+++ b/pkg/man-pages-posix/gen.rc
diff --git a/extra/man-pages-posix/manpages.rc b/pkg/man-pages-posix/manpages.rc
index dbdf782f..dbdf782f 100644
--- a/extra/man-pages-posix/manpages.rc
+++ b/pkg/man-pages-posix/manpages.rc
diff --git a/extra/man-pages-posix/rev b/pkg/man-pages-posix/rev
index e69de29b..e69de29b 100644
--- a/extra/man-pages-posix/rev
+++ b/pkg/man-pages-posix/rev
diff --git a/extra/man-pages-posix/sha256 b/pkg/man-pages-posix/sha256
index 31d8683e..31d8683e 100644
--- a/extra/man-pages-posix/sha256
+++ b/pkg/man-pages-posix/sha256
diff --git a/extra/man-pages-posix/url b/pkg/man-pages-posix/url
index a04876db..a04876db 100644
--- a/extra/man-pages-posix/url
+++ b/pkg/man-pages-posix/url
diff --git a/lang/mc/config.h b/pkg/mc/config.h
index b00373f7..b00373f7 100644
--- a/lang/mc/config.h
+++ b/pkg/mc/config.h
diff --git a/lang/mc/gen.rc b/pkg/mc/gen.rc
index a5276dec..a5276dec 100644
--- a/lang/mc/gen.rc
+++ b/pkg/mc/gen.rc
diff --git a/devel/make/rev b/pkg/mc/rev
index d00491fd..d00491fd 100644
--- a/devel/make/rev
+++ b/pkg/mc/rev
diff --git a/lang/mc/src b/pkg/mc/src
-Subproject faf16f0242436077c86358ccbe1a8d93966fdff
+Subproject faf16f0242436077c86358ccbe1a8d93966fdff
diff --git a/core/mdocml/.gitignore b/pkg/mdocml/.gitignore
index 0da61be7..0da61be7 100644
--- a/core/mdocml/.gitignore
+++ b/pkg/mdocml/.gitignore
diff --git a/core/mdocml/config.h b/pkg/mdocml/config.h
index 86d08114..86d08114 100644
--- a/core/mdocml/config.h
+++ b/pkg/mdocml/config.h
diff --git a/core/mdocml/gen.rc b/pkg/mdocml/gen.rc
index 887b7319..4629a870 100644
--- a/core/mdocml/gen.rc
+++ b/pkg/mdocml/gen.rc
@@ -1,10 +1,10 @@
 cflags\
-	-isystem core/openbsd/include\
-	-isystem '$builddir'/core/zlib/include\
+	-isystem pkg/openbsd/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I include\
 	-I '$dir'
 
-lib libmandoc.a -d core/zlib/headers\
+lib libmandoc.a -d pkg/zlib/headers\
 	man.c\
 	man_hash.c\
 	man_macro.c\
@@ -60,8 +60,8 @@ exe mandoc\
 	term_ps.c\
 	tbl_term.c\
 	libmandoc.a\
-	'$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
-exe demandoc demandoc.c libmandoc.a '$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
+	'$builddir'/pkg/^(openbsd/libbsd.a zlib/libz.a)
+exe demandoc demandoc.c libmandoc.a '$builddir'/pkg/^(openbsd/libbsd.a zlib/libz.a)
 
 for(exe in mandoc demandoc) file bin/$exe '$outdir'/$exe 755
 sym bin/man mandoc
diff --git a/desktop/st/rev b/pkg/mdocml/rev
index 0cfbf088..0cfbf088 100644
--- a/desktop/st/rev
+++ b/pkg/mdocml/rev
diff --git a/core/mdocml/sha256 b/pkg/mdocml/sha256
index 13446bd9..13446bd9 100644
--- a/core/mdocml/sha256
+++ b/pkg/mdocml/sha256
diff --git a/core/mdocml/url b/pkg/mdocml/url
index 46ea2f7b..46ea2f7b 100644
--- a/core/mdocml/url
+++ b/pkg/mdocml/url
diff --git a/extra/fribidi/.gitignore b/pkg/mpv/.gitignore
index 012dc66e..012dc66e 100644
--- a/extra/fribidi/.gitignore
+++ b/pkg/mpv/.gitignore
diff --git a/media/mpv/config.h b/pkg/mpv/config.h
index c8289a41..c8289a41 100644
--- a/media/mpv/config.h
+++ b/pkg/mpv/config.h
diff --git a/media/mpv/file2string.c b/pkg/mpv/file2string.c
index 84f31ce1..84f31ce1 100644
--- a/media/mpv/file2string.c
+++ b/pkg/mpv/file2string.c
diff --git a/media/mpv/gen.rc b/pkg/mpv/gen.rc
index 43289ffd..a95e9da9 100644
--- a/media/mpv/gen.rc
+++ b/pkg/mpv/gen.rc
@@ -1,7 +1,7 @@
 cflags=(\
-	-isystem '$builddir'/core/zlib/include\
-	-isystem '$builddir'/media/ffmpeg/include\
-	-isystem media/ffmpeg/src\
+	-isystem '$builddir'/pkg/ffmpeg/include\
+	-isystem '$builddir'/pkg/zlib/include\
+	-isystem pkg/ffmpeg/src\
 	-I '$dir' \
 	-I '$outdir' \
 	-I '$srcdir' \
@@ -15,7 +15,7 @@ srcs=(\
 checkstatus
 
 libs=(\
-	media/ffmpeg/^(\
+	ffmpeg/^(\
 		libavcodec.a.d\
 		libavdevice.a.d\
 		libavfilter.a.d\
@@ -24,10 +24,10 @@ libs=(\
 		libswresample.a.d\
 		libswscale.a.d\
 	)\
-	core/zlib/libz.a\
+	zlib/libz.a\
 )
 
-deps=('$outdir'/version.h (core/zlib media/ffmpeg)^/headers)
+deps=('$outdir'/version.h pkg/^(zlib ffmpeg)^/headers)
 
 rule versionhdr 'sh $srcdir/version.sh --cwd=$srcdir --versionh=$out'
 build '$outdir'/version.h versionhdr '|' '$srcdir'/version.sh
@@ -52,28 +52,28 @@ for(f in assdraw defaults options osc ytdl_hook)
 	file2string player/lua/$f.inc player/lua/$f.lua
 
 if(grep -qF 'HAVE_ALSA 1' config.h) {
-	cflags=($cflags -isystem '$builddir'/media/alsa-lib/include)
-	libs=($libs media/alsa-lib/libasound.a)
-	deps=($deps media/alsa-lib/headers)
+	cflags=($cflags -isystem '$builddir'/pkg/alsa-lib/include)
+	libs=($libs alsa-lib/libasound.a)
+	deps=($deps pkg/alsa-lib/headers)
 }
 if(grep -qF 'HAVE_DRM 1' config.h) {
-	cflags=($cflags '-isystem desktop/libdrm/'^(src src/include/drm))
-	libs=($libs desktop/libdrm/libdrm.a)
+	cflags=($cflags '-isystem pkg/libdrm/'^(src src/include/drm))
+	libs=($libs libdrm/libdrm.a)
 }
 if(grep -qF 'HAVE_LIBASS 1' config.h) {
-	cflags=($cflags -isystem '$builddir'/media/libass/include)
-	libs=($libs media/libass/libass.a.d)
-	deps=($deps media/libass/headers)
+	cflags=($cflags -isystem '$builddir'/pkg/libass/include)
+	libs=($libs libass/libass.a.d)
+	deps=($deps pkg/libass/headers)
 }
 if(grep -qF 'HAVE_LUA 1' config.h) {
-	cflags=($cflags -isystem lang/lua/src/src)
-	libs=($libs lang/lua/liblua.a)
+	cflags=($cflags -isystem pkg/lua/src/src)
+	libs=($libs lua/liblua.a)
 }
 
 cflags $cflags
 phony deps $deps
 
-exe mpv -d '$dir'/deps $srcs '$builddir'/$libs
+exe mpv -d '$dir'/deps $srcs '$builddir'/pkg/$libs
 file bin/mpv '$outdir'/mpv 755
 file share/man/man1/mpv.1 '$srcdir'/DOCS/man/mpv.1 644
 
diff --git a/media/mpv/gensources.awk b/pkg/mpv/gensources.awk
index f33c00df..f33c00df 100644
--- a/media/mpv/gensources.awk
+++ b/pkg/mpv/gensources.awk
diff --git a/media/mpv/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/pkg/mpv/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
index d466d1dc..d466d1dc 100644
--- a/media/mpv/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
+++ b/pkg/mpv/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
diff --git a/media/mpv/patch/0002-Add-generated-ebml-sources.patch b/pkg/mpv/patch/0002-Add-generated-ebml-sources.patch
index bb3be12e..bb3be12e 100644
--- a/media/mpv/patch/0002-Add-generated-ebml-sources.patch
+++ b/pkg/mpv/patch/0002-Add-generated-ebml-sources.patch
diff --git a/media/mpv/patch/0003-Add-generated-man-page.patch b/pkg/mpv/patch/0003-Add-generated-man-page.patch
index 5c95cc05..5c95cc05 100644
--- a/media/mpv/patch/0003-Add-generated-man-page.patch
+++ b/pkg/mpv/patch/0003-Add-generated-man-page.patch
diff --git a/media/mpv/patch/0004-ad_spdif-Fix-crash-when-spdif-muxer-is-not-available.patch b/pkg/mpv/patch/0004-ad_spdif-Fix-crash-when-spdif-muxer-is-not-available.patch
index ede82582..ede82582 100644
--- a/media/mpv/patch/0004-ad_spdif-Fix-crash-when-spdif-muxer-is-not-available.patch
+++ b/pkg/mpv/patch/0004-ad_spdif-Fix-crash-when-spdif-muxer-is-not-available.patch
diff --git a/core/tz/rev b/pkg/mpv/rev
index 1e8b3149..1e8b3149 100644
--- a/core/tz/rev
+++ b/pkg/mpv/rev
diff --git a/media/mpv/sources.awk b/pkg/mpv/sources.awk
index 622d74b3..622d74b3 100644
--- a/media/mpv/sources.awk
+++ b/pkg/mpv/sources.awk
diff --git a/media/mpv/sources.txt b/pkg/mpv/sources.txt
index f5f6a108..f5f6a108 100644
--- a/media/mpv/sources.txt
+++ b/pkg/mpv/sources.txt
diff --git a/media/mpv/src b/pkg/mpv/src
-Subproject 1d4273cfb52043c8165b85e9d7ac7bc14cb59cb
+Subproject 1d4273cfb52043c8165b85e9d7ac7bc14cb59cb
diff --git a/extra/msmtp/config.h b/pkg/msmtp/config.h
index 09c3d9c3..09c3d9c3 100644
--- a/extra/msmtp/config.h
+++ b/pkg/msmtp/config.h
diff --git a/extra/msmtp/gen.rc b/pkg/msmtp/gen.rc
index c5f0aac3..03fd38dc 100644
--- a/extra/msmtp/gen.rc
+++ b/pkg/msmtp/gen.rc
@@ -1,11 +1,11 @@
 cflags\
 	-D HAVE_CONFIG_H\
 	-D 'SYSCONFDIR=\"/etc\"' \
-	-isystem '$builddir'/core/libressl/include\
+	-isystem '$builddir'/pkg/libressl/include\
 	-I include\
 	-I '$dir' \
 
-exe msmtp -d core/libressl/headers src/^(\
+exe msmtp -d pkg/libressl/headers src/^(\
 	conf.c\
 	list.c\
 	msmtp.c\
@@ -21,7 +21,7 @@ exe msmtp -d core/libressl/headers src/^(\
 	tls.c\
 	\
 	base64.c md5.c md5-apps.c\
-) '$builddir'/core/libressl/^(libssl.a.d libcrypto.a.d)
+) '$builddir'/pkg/libressl/^(libssl.a.d libcrypto.a.d)
 
 file bin/msmtp '$outdir'/msmtp 755
 file share/man/man1/msmtp.1 '$srcdir'/doc/msmtp.1 644
diff --git a/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
index f2488fc9..f2488fc9 100644
--- a/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
+++ b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
diff --git a/desktop/velox/rev b/pkg/msmtp/rev
index 0cfbf088..0cfbf088 100644
--- a/desktop/velox/rev
+++ b/pkg/msmtp/rev
diff --git a/extra/msmtp/src b/pkg/msmtp/src
-Subproject 2fa66d2b7fd417b024f48addb2dae0432475187
+Subproject 2fa66d2b7fd417b024f48addb2dae0432475187
diff --git a/devel/nasm/.gitignore b/pkg/nasm/.gitignore
index 983a28a0..983a28a0 100644
--- a/devel/nasm/.gitignore
+++ b/pkg/nasm/.gitignore
diff --git a/devel/nasm/config.h b/pkg/nasm/config.h
index 4881121c..4881121c 100644
--- a/devel/nasm/config.h
+++ b/pkg/nasm/config.h
diff --git a/devel/nasm/gen.rc b/pkg/nasm/gen.rc
index c5f94191..c5f94191 100644
--- a/devel/nasm/gen.rc
+++ b/pkg/nasm/gen.rc
diff --git a/desktop/wayland/rev b/pkg/nasm/rev
index 0cfbf088..0cfbf088 100644
--- a/desktop/wayland/rev
+++ b/pkg/nasm/rev
diff --git a/devel/nasm/sha256 b/pkg/nasm/sha256
index c8051b73..c8051b73 100644
--- a/devel/nasm/sha256
+++ b/pkg/nasm/sha256
diff --git a/devel/nasm/url b/pkg/nasm/url
index ae040531..ae040531 100644
--- a/devel/nasm/url
+++ b/pkg/nasm/url
diff --git a/extra/ncurses/.gitignore b/pkg/ncurses/.gitignore
index fbcf6c54..fbcf6c54 100644
--- a/extra/ncurses/.gitignore
+++ b/pkg/ncurses/.gitignore
diff --git a/extra/ncurses/gen.rc b/pkg/ncurses/gen.rc
index f8e7dea6..f8e7dea6 100644
--- a/extra/ncurses/gen.rc
+++ b/pkg/ncurses/gen.rc
diff --git a/extra/ncurses/gensources.awk b/pkg/ncurses/gensources.awk
index b4b45838..b4b45838 100644
--- a/extra/ncurses/gensources.awk
+++ b/pkg/ncurses/gensources.awk
diff --git a/extra/ncurses/ncurses_cfg.h b/pkg/ncurses/ncurses_cfg.h
index fb432d09..fb432d09 100644
--- a/extra/ncurses/ncurses_cfg.h
+++ b/pkg/ncurses/ncurses_cfg.h
diff --git a/extra/ccid/rev b/pkg/ncurses/rev
index d00491fd..d00491fd 100644
--- a/extra/ccid/rev
+++ b/pkg/ncurses/rev
diff --git a/extra/ncurses/sha256 b/pkg/ncurses/sha256
index 1434e95c..1434e95c 100644
--- a/extra/ncurses/sha256
+++ b/pkg/ncurses/sha256
diff --git a/extra/ncurses/sources.txt b/pkg/ncurses/sources.txt
index 3a213917..3a213917 100644
--- a/extra/ncurses/sources.txt
+++ b/pkg/ncurses/sources.txt
diff --git a/extra/ncurses/subst.sed b/pkg/ncurses/subst.sed
index 4f3701fe..4f3701fe 100644
--- a/extra/ncurses/subst.sed
+++ b/pkg/ncurses/subst.sed
diff --git a/extra/ncurses/transform.h b/pkg/ncurses/transform.h
index df994d1d..df994d1d 100644
--- a/extra/ncurses/transform.h
+++ b/pkg/ncurses/transform.h
diff --git a/extra/ncurses/url b/pkg/ncurses/url
index 40dd7fac..40dd7fac 100644
--- a/extra/ncurses/url
+++ b/pkg/ncurses/url
diff --git a/core/ninja/gen.rc b/pkg/ninja/gen.rc
index c4f2d321..c4f2d321 100644
--- a/core/ninja/gen.rc
+++ b/pkg/ninja/gen.rc
diff --git a/devel/nasm/rev b/pkg/ninja/rev
index 0cfbf088..0cfbf088 100644
--- a/devel/nasm/rev
+++ b/pkg/ninja/rev
diff --git a/core/ninja/src b/pkg/ninja/src
-Subproject 717b7b4a31db6027207588c0fb89c3ead384747
+Subproject 717b7b4a31db6027207588c0fb89c3ead384747
diff --git a/core/openbsd/.gitignore b/pkg/openbsd/.gitignore
index 3abe5d25..3abe5d25 100644
--- a/core/openbsd/.gitignore
+++ b/pkg/openbsd/.gitignore
diff --git a/core/openbsd/gen.rc b/pkg/openbsd/gen.rc
index 56b446f1..9c740e99 100644
--- a/core/openbsd/gen.rc
+++ b/pkg/openbsd/gen.rc
@@ -1,6 +1,6 @@
 cflags\
 	-D '''DEF_WEAK(n)=''' \
-	-isystem '$builddir'/core/libressl/include\
+	-isystem '$builddir'/pkg/libressl/include\
 	-I '$dir'/include\
 	-idirafter '$srcdir'/include\
 	-idirafter '$srcdir'/sys
@@ -12,7 +12,7 @@ build '$outdir'/lib/libc/crypt/arc4random.h copy '$srcdir'/lib/libcrypto/crypto/
 build '$outdir'/lib/libc/crypt/chacha_private.h copy '$srcdir'/lib/libc/crypt/chacha_private.h
 cc '$outdir'/lib/libc/crypt/arc4random.c '||' '$outdir'/lib/libc/crypt/^(arc4random.h chacha_private.h)
 
-lib libbsd.a -d core/libressl/headers\
+lib libbsd.a -d pkg/libressl/headers\
 	lib/libc/^(\
 		crypt/^(arc4random.c.o arc4random_uniform.c)\
 		gen/^(fts.c getprogname.c setprogname.c vis.c warnc.c vwarnc.c)\
diff --git a/core/openbsd/include/err.h b/pkg/openbsd/include/err.h
index c537811b..c537811b 100644
--- a/core/openbsd/include/err.h
+++ b/pkg/openbsd/include/err.h
diff --git a/core/openbsd/include/grp.h b/pkg/openbsd/include/grp.h
index 49f4dfd4..49f4dfd4 100644
--- a/core/openbsd/include/grp.h
+++ b/pkg/openbsd/include/grp.h
diff --git a/core/openbsd/include/machine/endian.h b/pkg/openbsd/include/machine/endian.h
index 2dc4d830..2dc4d830 100644
--- a/core/openbsd/include/machine/endian.h
+++ b/pkg/openbsd/include/machine/endian.h
diff --git a/core/openbsd/include/pwd.h b/pkg/openbsd/include/pwd.h
index e859a8d1..e859a8d1 100644
--- a/core/openbsd/include/pwd.h
+++ b/pkg/openbsd/include/pwd.h
diff --git a/core/openbsd/include/stdlib.h b/pkg/openbsd/include/stdlib.h
index 0e1aa252..0e1aa252 100644
--- a/core/openbsd/include/stdlib.h
+++ b/pkg/openbsd/include/stdlib.h
diff --git a/core/openbsd/include/string.h b/pkg/openbsd/include/string.h
index 17c8ad81..17c8ad81 100644
--- a/core/openbsd/include/string.h
+++ b/pkg/openbsd/include/string.h
diff --git a/core/openbsd/include/sys/cdefs.h b/pkg/openbsd/include/sys/cdefs.h
index 70258b8c..70258b8c 100644
--- a/core/openbsd/include/sys/cdefs.h
+++ b/pkg/openbsd/include/sys/cdefs.h
diff --git a/core/openbsd/include/sys/param.h b/pkg/openbsd/include/sys/param.h
index 3167713c..3167713c 100644
--- a/core/openbsd/include/sys/param.h
+++ b/pkg/openbsd/include/sys/param.h
diff --git a/core/openbsd/include/sys/time.h b/pkg/openbsd/include/sys/time.h
index 98d5d3a7..98d5d3a7 100644
--- a/core/openbsd/include/sys/time.h
+++ b/pkg/openbsd/include/sys/time.h
diff --git a/core/openbsd/include/unistd.h b/pkg/openbsd/include/unistd.h
index 17e14240..17e14240 100644
--- a/core/openbsd/include/unistd.h
+++ b/pkg/openbsd/include/unistd.h
diff --git a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch
index fb3e7cbd..fb3e7cbd 100644
--- a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
+++ b/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch
diff --git a/core/openbsd/patch/0002-fts-Add-some-includes.patch b/pkg/openbsd/patch/0002-fts-Add-some-includes.patch
index a6a16303..a6a16303 100644
--- a/core/openbsd/patch/0002-fts-Add-some-includes.patch
+++ b/pkg/openbsd/patch/0002-fts-Add-some-includes.patch
diff --git a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch b/pkg/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
index 0ca88edf..0ca88edf 100644
--- a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
+++ b/pkg/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
diff --git a/core/openbsd/patch/0004-pax-Add-some-includes.patch b/pkg/openbsd/patch/0004-pax-Add-some-includes.patch
index 4061d470..4061d470 100644
--- a/core/openbsd/patch/0004-pax-Add-some-includes.patch
+++ b/pkg/openbsd/patch/0004-pax-Add-some-includes.patch
diff --git a/core/openbsd/patch/0005-tar-Default-to-stdin.patch b/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch
index f4c2e08c..f4c2e08c 100644
--- a/core/openbsd/patch/0005-tar-Default-to-stdin.patch
+++ b/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch
diff --git a/core/openbsd/patch/0006-yacc-Add-some-includes.patch b/pkg/openbsd/patch/0006-yacc-Add-some-includes.patch
index a4b0ed78..a4b0ed78 100644
--- a/core/openbsd/patch/0006-yacc-Add-some-includes.patch
+++ b/pkg/openbsd/patch/0006-yacc-Add-some-includes.patch
diff --git a/core/openbsd/patch/0007-diff-Add-missing-includes.patch b/pkg/openbsd/patch/0007-diff-Add-missing-includes.patch
index 2560b726..2560b726 100644
--- a/core/openbsd/patch/0007-diff-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0007-diff-Add-missing-includes.patch
diff --git a/core/openbsd/patch/0008-patch-Add-missing-includes.patch b/pkg/openbsd/patch/0008-patch-Add-missing-includes.patch
index 782880c4..782880c4 100644
--- a/core/openbsd/patch/0008-patch-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0008-patch-Add-missing-includes.patch
diff --git a/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch b/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
index 0eb9f9d2..0eb9f9d2 100644
--- a/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch
+++ b/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
diff --git a/core/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch b/pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
index 3956747e..3956747e 100644
--- a/core/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
+++ b/pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
diff --git a/core/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch b/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
index 6fa04409..6fa04409 100644
--- a/core/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
+++ b/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
diff --git a/core/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch b/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
index 61a4332e..61a4332e 100644
--- a/core/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
+++ b/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
diff --git a/core/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch b/pkg/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
index 121e10e8..121e10e8 100644
--- a/core/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
+++ b/pkg/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
diff --git a/media/ffmpeg/rev b/pkg/openbsd/rev
index 7f8f011e..7f8f011e 100644
--- a/media/ffmpeg/rev
+++ b/pkg/openbsd/rev
diff --git a/core/openbsd/sha256 b/pkg/openbsd/sha256
index 4a497a70..4a497a70 100644
--- a/core/openbsd/sha256
+++ b/pkg/openbsd/sha256
diff --git a/core/openbsd/url b/pkg/openbsd/url
index 2fac84b9..2fac84b9 100644
--- a/core/openbsd/url
+++ b/pkg/openbsd/url
diff --git a/core/openssh/config.h b/pkg/openssh/config.h
index ef00fb14..ef00fb14 100644
--- a/core/openssh/config.h
+++ b/pkg/openssh/config.h
diff --git a/core/openssh/gen.rc b/pkg/openssh/gen.rc
index 6a9ea869..3ba9d002 100644
--- a/core/openssh/gen.rc
+++ b/pkg/openssh/gen.rc
@@ -1,7 +1,7 @@
 cflags\
-	-isystem core/openbsd/include\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/zlib/include\
+	-isystem pkg/openbsd/include\
+	-isystem '$builddir'/pkg/libressl/include\
+	-isystem '$builddir'/pkg/zlib/include\
 	-I include\
 	-I '$dir' \
 	-I '$srcdir' \
@@ -34,7 +34,7 @@ lib libopenbsd-compat.a openbsd-compat/^(\
 	port-aix.c port-irix.c port-linux.c port-solaris.c port-uw.c\
 )
 
-phony deps core/^(libressl zlib)^/headers
+phony deps pkg/^(libressl zlib)^/headers
 
 # port-tun.c from openbsd-compat depends on sshbuf-getput-basic.c and ssherr.c
 # from libssh.a, so just include it in libssh.a.
@@ -67,7 +67,7 @@ lib libssh.a -d '$dir'/deps\
 	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c\
 	platform-pledge.c platform-tracing.c\
 	openbsd-compat/port-tun.c libopenbsd-compat.a\
-	'$builddir'/^(core/libressl/libcrypto.a.d core/zlib/libz.a)\
+	'$builddir'/pkg/^(libressl/libcrypto.a.d zlib/libz.a)\
 
 exe ssh\
 	ssh.c readconf.c clientloop.c sshtty.c\
diff --git a/devel/qbe/rev b/pkg/openssh/rev
index 0cfbf088..0cfbf088 100644
--- a/devel/qbe/rev
+++ b/pkg/openssh/rev
diff --git a/core/openssh/src b/pkg/openssh/src
-Subproject 99522ba7ec6963a05c04a156bf20e3ba3605987
+Subproject 99522ba7ec6963a05c04a156bf20e3ba3605987
diff --git a/extra/pcre/.gitignore b/pkg/pcre/.gitignore
index 39576135..39576135 100644
--- a/extra/pcre/.gitignore
+++ b/pkg/pcre/.gitignore
diff --git a/extra/pcre/config.h b/pkg/pcre/config.h
index b6cb1a55..b6cb1a55 100644
--- a/extra/pcre/config.h
+++ b/pkg/pcre/config.h
diff --git a/extra/pcre/gen.rc b/pkg/pcre/gen.rc
index 6064222d..6064222d 100644
--- a/extra/pcre/gen.rc
+++ b/pkg/pcre/gen.rc
diff --git a/extra/efibootmgr/rev b/pkg/pcre/rev
index d00491fd..d00491fd 100644
--- a/extra/efibootmgr/rev
+++ b/pkg/pcre/rev
diff --git a/extra/pcre/sha256 b/pkg/pcre/sha256
index a8ae49d8..a8ae49d8 100644
--- a/extra/pcre/sha256
+++ b/pkg/pcre/sha256
diff --git a/extra/pcre/url b/pkg/pcre/url
index 8333bf31..8333bf31 100644
--- a/extra/pcre/url
+++ b/pkg/pcre/url
diff --git a/extra/pcsc/config.h b/pkg/pcsc/config.h
index 2b1bd274..2b1bd274 100644
--- a/extra/pcsc/config.h
+++ b/pkg/pcsc/config.h
diff --git a/extra/pcsc/gen.rc b/pkg/pcsc/gen.rc
index 90d33c87..90d33c87 100644
--- a/extra/pcsc/gen.rc
+++ b/pkg/pcsc/gen.rc
diff --git a/extra/pcsc/patch/0001-Add-tokenparser.c-from-pcsc-1.8.17-distribution.patch b/pkg/pcsc/patch/0001-Add-tokenparser.c-from-pcsc-1.8.17-distribution.patch
index 9c99d360..9c99d360 100644
--- a/extra/pcsc/patch/0001-Add-tokenparser.c-from-pcsc-1.8.17-distribution.patch
+++ b/pkg/pcsc/patch/0001-Add-tokenparser.c-from-pcsc-1.8.17-distribution.patch
diff --git a/extra/efivar/rev b/pkg/pcsc/rev
index d00491fd..d00491fd 100644
--- a/extra/efivar/rev
+++ b/pkg/pcsc/rev
diff --git a/extra/pcsc/src b/pkg/pcsc/src
-Subproject f74dc1feea4c7a2345abb3e1861b350d46946c8
+Subproject f74dc1feea4c7a2345abb3e1861b350d46946c8
diff --git a/core/perp/.gitignore b/pkg/perp/.gitignore
index d550babc..d550babc 100644
--- a/core/perp/.gitignore
+++ b/pkg/perp/.gitignore
diff --git a/core/perp/gen.rc b/pkg/perp/gen.rc
index 870d8432..870d8432 100644
--- a/core/perp/gen.rc
+++ b/pkg/perp/gen.rc
diff --git a/extra/fribidi/rev b/pkg/perp/rev
index d00491fd..d00491fd 100644
--- a/extra/fribidi/rev
+++ b/pkg/perp/rev
diff --git a/core/perp/sha256 b/pkg/perp/sha256
index 943750d5..943750d5 100644
--- a/core/perp/sha256
+++ b/pkg/perp/sha256
diff --git a/core/perp/url b/pkg/perp/url
index 0eff1363..0eff1363 100644
--- a/core/perp/url
+++ b/pkg/perp/url
diff --git a/core/pigz/gen.rc b/pkg/pigz/gen.rc
index 015cd2cf..5eb80637 100644
--- a/core/pigz/gen.rc
+++ b/pkg/pigz/gen.rc
@@ -1,11 +1,11 @@
 cflags\
 	-Wall -Wextra\
-	-isystem '$builddir'/core/zlib/include
+	-isystem '$builddir'/pkg/zlib/include
 
-exe pigz -d core/zlib/headers\
+exe pigz -d pkg/zlib/headers\
 	pigz.c yarn.c try.c\
 	zopfli/src/zopfli/^(deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c squeeze.c katajainen.c)\
-	'$builddir'/core/zlib/libz.a
+	'$builddir'/pkg/zlib/libz.a
 file bin/pigz '$outdir'/pigz 755
 for(alias in gzip gunzip zcat) sym bin/$alias pigz
 
diff --git a/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch b/pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch
index 50ced245..50ced245 100644
--- a/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch
+++ b/pkg/pigz/patch/0001-Handle-n-option-like-gzip-does.patch
diff --git a/desktop/libevdev/rev b/pkg/pigz/rev
index 00750edc..00750edc 100644
--- a/desktop/libevdev/rev
+++ b/pkg/pigz/rev
diff --git a/core/pigz/src b/pkg/pigz/src
-Subproject a6f3dab846fec23c3f0db8ba6aafcb6772afefd
+Subproject a6f3dab846fec23c3f0db8ba6aafcb6772afefd
diff --git a/desktop/pixman/config.h b/pkg/pixman/config.h
index 1ff23a85..1ff23a85 100644
--- a/desktop/pixman/config.h
+++ b/pkg/pixman/config.h
diff --git a/desktop/pixman/gen.rc b/pkg/pixman/gen.rc
index 408007a7..408007a7 100644
--- a/desktop/pixman/gen.rc
+++ b/pkg/pixman/gen.rc
diff --git a/extra/ii/rev b/pkg/pixman/rev
index d00491fd..d00491fd 100644
--- a/extra/ii/rev
+++ b/pkg/pixman/rev
diff --git a/desktop/pixman/src b/pkg/pixman/src
-Subproject 1727aa4ab60a594cbb1cc1bdaa270b7dfad21f0
+Subproject 1727aa4ab60a594cbb1cc1bdaa270b7dfad21f0
diff --git a/desktop/plan9fonts/fonts.txt b/pkg/plan9fonts/fonts.txt
index 5d6f4eaa..5d6f4eaa 100644
--- a/desktop/plan9fonts/fonts.txt
+++ b/pkg/plan9fonts/fonts.txt
diff --git a/desktop/plan9fonts/gen.rc b/pkg/plan9fonts/gen.rc
index 3ac74fed..3ac74fed 100644
--- a/desktop/plan9fonts/gen.rc
+++ b/pkg/plan9fonts/gen.rc
diff --git a/extra/less/rev b/pkg/plan9fonts/rev
index d00491fd..d00491fd 100644
--- a/extra/less/rev
+++ b/pkg/plan9fonts/rev
diff --git a/desktop/plan9fonts/src b/pkg/plan9fonts/src
-Subproject dabdac9923f0bbf56a538a5cf2a65d566ec9bf3
+Subproject dabdac9923f0bbf56a538a5cf2a65d566ec9bf3
diff --git a/core/plan9port/gen.rc b/pkg/plan9port/gen.rc
index 92415e0e..92415e0e 100644
--- a/core/plan9port/gen.rc
+++ b/pkg/plan9port/gen.rc
diff --git a/core/plan9port/patch/0001-Fix-build-with-musl.patch b/pkg/plan9port/patch/0001-Fix-build-with-musl.patch
index 65507008..65507008 100644
--- a/core/plan9port/patch/0001-Fix-build-with-musl.patch
+++ b/pkg/plan9port/patch/0001-Fix-build-with-musl.patch
diff --git a/core/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch b/pkg/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch
index dbe342ee..dbe342ee 100644
--- a/core/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch
+++ b/pkg/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch
diff --git a/core/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch b/pkg/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch
index 04c884b0..04c884b0 100644
--- a/core/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch
+++ b/pkg/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch
diff --git a/core/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch b/pkg/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch
index 0de91323..0de91323 100644
--- a/core/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch
+++ b/pkg/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch
diff --git a/core/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch b/pkg/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
index 0b022c64..0b022c64 100644
--- a/core/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
+++ b/pkg/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
diff --git a/extra/vis/rev b/pkg/plan9port/rev
index 00750edc..00750edc 100644
--- a/extra/vis/rev
+++ b/pkg/plan9port/rev
diff --git a/core/plan9port/src b/pkg/plan9port/src
-Subproject 35d43924484b88b9816e40d2f6bff4547f3eec4
+Subproject 35d43924484b88b9816e40d2f6bff4547f3eec4
diff --git a/lang/python/.gitignore b/pkg/python/.gitignore
index 90e82b82..90e82b82 100644
--- a/lang/python/.gitignore
+++ b/pkg/python/.gitignore
diff --git a/lang/python/Setup b/pkg/python/Setup
index 3aac233d..3aac233d 100644
--- a/lang/python/Setup
+++ b/pkg/python/Setup
diff --git a/lang/python/gen.rc b/pkg/python/gen.rc
index 294ffb65..93dcc7ab 100644
--- a/lang/python/gen.rc
+++ b/pkg/python/gen.rc
@@ -128,24 +128,24 @@ libs=()
 deps=()
 
 if(grep -q '^_ctypes' Setup) {
-	cflags=($cflags -isystem '$builddir'/desktop/libffi/include)
-	deps=($deps desktop/libffi/headers)
-	libs=($libs desktop/libffi/libffi.a)
+	cflags=($cflags -isystem '$builddir'/pkg/libffi/include)
+	deps=($deps pkg/libffi/headers)
+	libs=($libs libffi/libffi.a)
 }
 if(grep -qE '^(_hashlib|_ssl)' Setup) {
-	cflags=($cflags -isystem '$builddir'/core/libressl/include)
-	deps=($deps core/libressl/headers)
-	libs=($libs core/libressl/^(libssl.a libcrypto.a) core/openbsd/libbsd.a)
+	cflags=($cflags -isystem '$builddir'/pkg/libressl/include)
+	deps=($deps pkg/libressl/headers)
+	libs=($libs (libressl/^(libssl.a libcrypto.a) openbsd/libbsd.a))
 }
 if(grep -q '^pyexpat' Setup) {
-	cflags=($cflags -isystem '$builddir'/desktop/expat/include)
-	deps=($deps desktop/expat/headers)
-	libs=($libs desktop/expat/libexpat.a)
+	cflags=($cflags -isystem '$builddir'/pkg/expat/include)
+	deps=($deps pkg/expat/headers)
+	libs=($libs expat/libexpat.a)
 }
 if(grep -q '^zlib' Setup) {
-	cflags=($cflags -isystem '$builddir'/core/zlib/include)
-	deps=($deps core/zlib/headers)
-	libs=($libs core/zlib/libz.a)
+	cflags=($cflags -isystem '$builddir'/pkg/zlib/include)
+	deps=($deps pkg/zlib/headers)
+	libs=($libs zlib/libz.a)
 }
 
 rule makesetup 'wd=$$PWD && cd $outdir && $$wd/$srcdir/Modules/makesetup -s $$wd/$srcdir -m - $$wd/$in'
@@ -164,7 +164,7 @@ cc Modules/getpath.c ; defs='-D '''^(\
 phony deps $deps
 lib libpython.a -d '$dir'/deps $srcs
 
-exe python Programs/python.c libpython.a '$builddir'/$libs
+exe python Programs/python.c libpython.a '$builddir'/pkg/$libs
 file bin/python3 '$outdir'/python 755
 sym bin/python python3
 
diff --git a/lang/python/lib/Makefile b/pkg/python/lib/Makefile
index 636bc1a8..636bc1a8 100644
--- a/lang/python/lib/Makefile
+++ b/pkg/python/lib/Makefile
diff --git a/lang/python/lib/_sysconfigdata.py b/pkg/python/lib/_sysconfigdata.py
index 1daf2bde..1daf2bde 100644
--- a/lang/python/lib/_sysconfigdata.py
+++ b/pkg/python/lib/_sysconfigdata.py
diff --git a/lang/python/modules.awk b/pkg/python/modules.awk
index 5e01a9d1..5e01a9d1 100644
--- a/lang/python/modules.awk
+++ b/pkg/python/modules.awk
diff --git a/lang/python/pyconfig.h b/pkg/python/pyconfig.h
index e88d464f..e88d464f 100644
--- a/lang/python/pyconfig.h
+++ b/pkg/python/pyconfig.h
diff --git a/lang/python/pylibs.txt b/pkg/python/pylibs.txt
index fb5da439..fb5da439 100644
--- a/lang/python/pylibs.txt
+++ b/pkg/python/pylibs.txt
diff --git a/extra/libevent/rev b/pkg/python/rev
index d00491fd..d00491fd 100644
--- a/extra/libevent/rev
+++ b/pkg/python/rev
diff --git a/lang/python/sha256 b/pkg/python/sha256
index a4273e31..a4273e31 100644
--- a/lang/python/sha256
+++ b/pkg/python/sha256
diff --git a/lang/python/url b/pkg/python/url
index a8e7bbb3..a8e7bbb3 100644
--- a/lang/python/url
+++ b/pkg/python/url
diff --git a/devel/qbe/config.h b/pkg/qbe/config.h
index 52d4b123..52d4b123 100644
--- a/devel/qbe/config.h
+++ b/pkg/qbe/config.h
diff --git a/devel/qbe/gen.rc b/pkg/qbe/gen.rc
index 1da79beb..1da79beb 100644
--- a/devel/qbe/gen.rc
+++ b/pkg/qbe/gen.rc
diff --git a/extra/hostap/rev b/pkg/qbe/rev
index 0cfbf088..0cfbf088 100644
--- a/extra/hostap/rev
+++ b/pkg/qbe/rev
diff --git a/devel/qbe/src b/pkg/qbe/src
-Subproject fd9c2e045f7cc953bebab2e2e65da9cd73b04f1
+Subproject fd9c2e045f7cc953bebab2e2e65da9cd73b04f1
diff --git a/core/sbase/egrep b/pkg/sbase/egrep
index 23ba6e4e..23ba6e4e 100755
--- a/core/sbase/egrep
+++ b/pkg/sbase/egrep
diff --git a/core/sbase/gen.rc b/pkg/sbase/gen.rc
index fb77593b..fb77593b 100644
--- a/core/sbase/gen.rc
+++ b/pkg/sbase/gen.rc
diff --git a/core/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch b/pkg/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch
index c2d87263..c2d87263 100644
--- a/core/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch
+++ b/pkg/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch
diff --git a/core/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch b/pkg/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch
index 0cbb6a81..0cbb6a81 100644
--- a/core/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch
+++ b/pkg/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch
diff --git a/core/sbase/patch/0003-libutil-Add-writeall-utility-function.patch b/pkg/sbase/patch/0003-libutil-Add-writeall-utility-function.patch
index bb1d9f9d..bb1d9f9d 100644
--- a/core/sbase/patch/0003-libutil-Add-writeall-utility-function.patch
+++ b/pkg/sbase/patch/0003-libutil-Add-writeall-utility-function.patch
diff --git a/core/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch b/pkg/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch
index 4719939b..4719939b 100644
--- a/core/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch
+++ b/pkg/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch
diff --git a/core/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch b/pkg/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch
index be4d8b9a..be4d8b9a 100644
--- a/core/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch
+++ b/pkg/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch
diff --git a/core/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch b/pkg/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch
index 5ef2e9cb..5ef2e9cb 100644
--- a/core/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch
+++ b/pkg/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch
diff --git a/core/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch b/pkg/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch
index 0fb99426..0fb99426 100644
--- a/core/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch
+++ b/pkg/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch
diff --git a/core/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch b/pkg/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch
index 4bae2d6f..4bae2d6f 100644
--- a/core/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch
+++ b/pkg/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch
diff --git a/core/sbase/patch/0009-cp-Check-result-of-utimensat.patch b/pkg/sbase/patch/0009-cp-Check-result-of-utimensat.patch
index 2b910aa8..2b910aa8 100644
--- a/core/sbase/patch/0009-cp-Check-result-of-utimensat.patch
+++ b/pkg/sbase/patch/0009-cp-Check-result-of-utimensat.patch
diff --git a/core/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch b/pkg/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch
index 847f3fd1..847f3fd1 100644
--- a/core/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch
+++ b/pkg/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch
diff --git a/core/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch b/pkg/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch
index d3d37993..d3d37993 100644
--- a/core/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch
+++ b/pkg/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch
diff --git a/core/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch b/pkg/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch
index b31ecb23..b31ecb23 100644
--- a/core/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch
+++ b/pkg/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch
diff --git a/core/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch b/pkg/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch
index 0465f8bf..0465f8bf 100644
--- a/core/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch
+++ b/pkg/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch
diff --git a/core/sbase/rev b/pkg/sbase/rev
index 45a4fb75..45a4fb75 100644
--- a/core/sbase/rev
+++ b/pkg/sbase/rev
diff --git a/core/sbase/src b/pkg/sbase/src
-Subproject fb11173926bc783bc70b8e848368eaa97915e54
+Subproject fb11173926bc783bc70b8e848368eaa97915e54
diff --git a/lang/scc/gen.rc b/pkg/scc/gen.rc
index 02d6d32a..02d6d32a 100644
--- a/lang/scc/gen.rc
+++ b/pkg/scc/gen.rc
diff --git a/extra/libtermkey/rev b/pkg/scc/rev
index d00491fd..d00491fd 100644
--- a/extra/libtermkey/rev
+++ b/pkg/scc/rev
diff --git a/lang/scc/src b/pkg/scc/src
-Subproject 8881c4347b881996dc3070faf7259d460fb22f3
+Subproject 8881c4347b881996dc3070faf7259d460fb22f3
diff --git a/core/sdhcp/gen.rc b/pkg/sdhcp/gen.rc
index ca1a180f..ca1a180f 100644
--- a/core/sdhcp/gen.rc
+++ b/pkg/sdhcp/gen.rc
diff --git a/core/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch b/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
index a26237db..a26237db 100644
--- a/core/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
+++ b/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
diff --git a/extra/libfuse/rev b/pkg/sdhcp/rev
index 0cfbf088..0cfbf088 100644
--- a/extra/libfuse/rev
+++ b/pkg/sdhcp/rev
diff --git a/core/sdhcp/src b/pkg/sdhcp/src
-Subproject 450beea4e88ab7f80206741f18f0d5539ae60b4
+Subproject 450beea4e88ab7f80206741f18f0d5539ae60b4
diff --git a/core/sinit/config.h b/pkg/sinit/config.h
index 3d2da6fc..3d2da6fc 100644
--- a/core/sinit/config.h
+++ b/pkg/sinit/config.h
diff --git a/core/sinit/gen.rc b/pkg/sinit/gen.rc
index d45f6720..d45f6720 100644
--- a/core/sinit/gen.rc
+++ b/pkg/sinit/gen.rc
diff --git a/extra/libnl/rev b/pkg/sinit/rev
index 0cfbf088..0cfbf088 100644
--- a/extra/libnl/rev
+++ b/pkg/sinit/rev
diff --git a/core/sinit/src b/pkg/sinit/src
-Subproject 731f65fc82afcd474f4c682f9f0069e5c80c86d
+Subproject 731f65fc82afcd474f4c682f9f0069e5c80c86d
diff --git a/core/skeleton/gen.rc b/pkg/skeleton/gen.rc
index 522d3228..522d3228 100644
--- a/core/skeleton/gen.rc
+++ b/pkg/skeleton/gen.rc
diff --git a/core/skeleton/gitignore b/pkg/skeleton/gitignore
index 90c5afa2..90c5afa2 100644
--- a/core/skeleton/gitignore
+++ b/pkg/skeleton/gitignore
diff --git a/extra/sshfs/config.h b/pkg/sshfs/config.h
index 9c23d485..9c23d485 100644
--- a/extra/sshfs/config.h
+++ b/pkg/sshfs/config.h
diff --git a/extra/sshfs/gen.rc b/pkg/sshfs/gen.rc
index 07cc8249..5ed57782 100644
--- a/extra/sshfs/gen.rc
+++ b/pkg/sshfs/gen.rc
@@ -1,14 +1,14 @@
 cflags\
 	-D '_FILE_OFFSET_BITS=64' \
 	-D 'FUSE_USE_VERSION=26' \
-	-isystem extra/libfuse/src/include\
+	-isystem pkg/libfuse/src/include\
 	-I '$dir'
 
 build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; with\
 	expr 's,__UNMOUNT_COMMAND__,''fusermount -u'','
 
-exe sshfs -d '$builddir'/extra/libfuse/fetch.stamp\
-	sshfs.c nocache.c '$builddir'/extra/libfuse/libfuse.a
+exe sshfs -d '$builddir'/pkg/libfuse/fetch.stamp\
+	sshfs.c nocache.c '$builddir'/pkg/libfuse/libfuse.a
 file bin/sshfs '$outdir'/sshfs 755
 file share/man/man1/sshfs.1 '$outdir'/sshfs.1 644
 
diff --git a/extra/sshfs/patch/0001-Add-nocache.c-stub.patch b/pkg/sshfs/patch/0001-Add-nocache.c-stub.patch
index 3f6669d6..3f6669d6 100644
--- a/extra/sshfs/patch/0001-Add-nocache.c-stub.patch
+++ b/pkg/sshfs/patch/0001-Add-nocache.c-stub.patch
diff --git a/extra/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch b/pkg/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch
index 43128eb2..43128eb2 100644
--- a/extra/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch
+++ b/pkg/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch
diff --git a/extra/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch b/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch
index 39d1e544..39d1e544 100644
--- a/extra/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch
+++ b/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch
diff --git a/extra/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch b/pkg/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch
index d028a336..d028a336 100644
--- a/extra/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch
+++ b/pkg/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch
diff --git a/extra/sshfs/patch/0005-Use-standard-C-functions.patch b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
index e58cc29a..e58cc29a 100644
--- a/extra/sshfs/patch/0005-Use-standard-C-functions.patch
+++ b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
diff --git a/extra/sshfs/patch/0006-Add-missing-includes.patch b/pkg/sshfs/patch/0006-Add-missing-includes.patch
index 968d8186..968d8186 100644
--- a/extra/sshfs/patch/0006-Add-missing-includes.patch
+++ b/pkg/sshfs/patch/0006-Add-missing-includes.patch
diff --git a/extra/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch b/pkg/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch
index 1a232a7d..1a232a7d 100644
--- a/extra/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch
+++ b/pkg/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch
diff --git a/extra/sshfs/patch/0008-Remove-remaining-uses-of-glib.patch b/pkg/sshfs/patch/0008-Remove-remaining-uses-of-glib.patch
index b21b5d34..b21b5d34 100644
--- a/extra/sshfs/patch/0008-Remove-remaining-uses-of-glib.patch
+++ b/pkg/sshfs/patch/0008-Remove-remaining-uses-of-glib.patch
diff --git a/extra/lpeg/rev b/pkg/sshfs/rev
index d00491fd..d00491fd 100644
--- a/extra/lpeg/rev
+++ b/pkg/sshfs/rev
diff --git a/extra/sshfs/src b/pkg/sshfs/src
-Subproject b2fa7593586b141298e6159f40f521d2b0f4f89
+Subproject b2fa7593586b141298e6159f40f521d2b0f4f89
diff --git a/desktop/st/config.h b/pkg/st/config.h
index 741a0278..741a0278 100644
--- a/desktop/st/config.h
+++ b/pkg/st/config.h
diff --git a/pkg/st/gen.rc b/pkg/st/gen.rc
new file mode 100644
index 00000000..d8119df4
--- /dev/null
+++ b/pkg/st/gen.rc
@@ -0,0 +1,32 @@
+cflags\
+	-D 'VERSION=''"0.7"''' \
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/libxkbcommon/src\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/wayland/include\
+	-isystem '$builddir'/pkg/wayland-protocols/include\
+	-isystem '$builddir'/pkg/wld/include\
+	-I '$dir'
+
+phony deps\
+	'$builddir'/pkg/^(fontconfig libxkbcommon)^/fetch.stamp\
+	pkg/^(pixman wayland wayland-protocols wld)^/headers
+
+exe st -d '$dir'/deps st.c '$builddir'/^(\
+	pkg/libxkbcommon/libxkbcommon.a\
+	pkg/wayland/libwayland-client.a.d\
+	pkg/wayland/libwayland-cursor.a.d\
+	pkg/wayland-protocols/xdg-shell-unstable-v5-protocol.c.o\
+	pkg/wld/libwld.a.d\
+)
+file bin/st '$outdir'/st 755
+file share/man/man1/st.1 '$srcdir'/st.1 644
+
+terminfo=s/^(st st-256color)
+terminfo_outs='$outdir'/$terminfo
+build $"terminfo_outs tic '$srcdir'/st.info ; with\
+	ticflags '-x -o $outdir'
+for(t in $terminfo)
+	file share/terminfo/$t '$outdir'/$t 644
+
+fetch git
diff --git a/desktop/st/patch/0001-Port-to-wayland-using-wld.patch b/pkg/st/patch/0001-Port-to-wayland-using-wld.patch
index ca7cf414..ca7cf414 100644
--- a/desktop/st/patch/0001-Port-to-wayland-using-wld.patch
+++ b/pkg/st/patch/0001-Port-to-wayland-using-wld.patch
diff --git a/extra/libusb/rev b/pkg/st/rev
index 0cfbf088..0cfbf088 100644
--- a/extra/libusb/rev
+++ b/pkg/st/rev
diff --git a/desktop/st/src b/pkg/st/src
-Subproject 740ada1447a0bf9eb7db327d9433fa0b96e0a4d
+Subproject 740ada1447a0bf9eb7db327d9433fa0b96e0a4d
diff --git a/media/mpv/.gitignore b/pkg/swc/.gitignore
index 012dc66e..012dc66e 100644
--- a/media/mpv/.gitignore
+++ b/pkg/swc/.gitignore
diff --git a/desktop/swc/gen.rc b/pkg/swc/gen.rc
index fe3823b4..8ec3f494 100644
--- a/desktop/swc/gen.rc
+++ b/pkg/swc/gen.rc
@@ -2,15 +2,15 @@ cflags\
 	-D _GNU_SOURCE\
 	-D 'screen_new=swc__screen_new' \
 	-D 'remove_resource=swc__remove_resource' \
-	-isystem desktop/fontconfig/src\
-	-isystem desktop/libdrm/src/include/drm\
-	-isystem desktop/libdrm/src\
-	-isystem desktop/libevdev/src\
-	-isystem desktop/libxkbcommon/src\
-	-isystem '$builddir'/desktop/pixman/include\
-	-isystem '$builddir'/desktop/wayland-protocols/include\
-	-isystem '$builddir'/desktop/wayland/include\
-	-isystem '$builddir'/desktop/wld/include\
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/libdrm/src/include/drm\
+	-isystem pkg/libdrm/src\
+	-isystem pkg/libevdev/src\
+	-isystem pkg/libxkbcommon/src\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/wayland-protocols/include\
+	-isystem '$builddir'/pkg/wayland/include\
+	-isystem '$builddir'/pkg/wld/include\
 	-I '$outdir' \
 	-I '$outdir'/include\
 	-I '$srcdir'
@@ -23,7 +23,7 @@ waylandproto protocol/swc.xml\
 build '$outdir'/include/swc.h copy '$srcdir'/libswc/swc.h
 phony headers '$outdir'/include/^(swc.h swc-^(client server)^-protocol.h)
 
-build '$outdir'/wayland-drm-server-protocol.h copy '$builddir'/desktop/wld/protocol/wayland-drm-server-protocol.h
+build '$outdir'/wayland-drm-server-protocol.h copy '$builddir'/pkg/wld/protocol/wayland-drm-server-protocol.h
 
 {
 	include 'toolchain/$host_toolchain.ninja'
@@ -40,8 +40,8 @@ phony deps\
 		include/swc-server-protocol.h\
 		cursor/cursor_data.h\
 	)\
-	'$builddir'/desktop/^(fontconfig libdrm libevdev libxkbcommon)^/fetch.stamp\
-	desktop/^(pixman wayland wayland-protocols wld)^/headers
+	'$builddir'/pkg/^(fontconfig libdrm libevdev libxkbcommon)^/fetch.stamp\
+	pkg/^(pixman wayland wayland-protocols wld)^/headers
 
 lib libswc.a -d '$dir'/deps\
 	libswc/^(\
@@ -83,14 +83,14 @@ lib libswc.a -d '$dir'/deps\
 	launch/protocol.c.o\
 	swc-protocol.c.o\
 	'$builddir'/^(\
-		desktop/libevdev/libevdev.a\
-		desktop/libxkbcommon/libxkbcommon.a\
-		desktop/wayland-protocols/xdg-shell-unstable-v5-protocol.c.o\
-		desktop/wayland/libwayland-server.a.d\
-		desktop/wld/libwld.a.d\
+		pkg/libevdev/libevdev.a\
+		pkg/libxkbcommon/libxkbcommon.a\
+		pkg/wayland-protocols/xdg-shell-unstable-v5-protocol.c.o\
+		pkg/wayland/libwayland-server.a.d\
+		pkg/wld/libwld.a.d\
 	)
 
-exe swc-launch launch/^(launch.c protocol.c.o) '$builddir'/desktop/libdrm/libdrm.a
+exe swc-launch launch/^(launch.c protocol.c.o) '$builddir'/pkg/libdrm/libdrm.a
 file bin/swc-launch '$outdir'/swc-launch 4755
 
 fetch git
diff --git a/extra/ncurses/rev b/pkg/swc/rev
index d00491fd..d00491fd 100644
--- a/extra/ncurses/rev
+++ b/pkg/swc/rev
diff --git a/desktop/swc/src b/pkg/swc/src
-Subproject ee0825dd7b49a5ac65d5e94bdad159ca77481bc
+Subproject ee0825dd7b49a5ac65d5e94bdad159ca77481bc
diff --git a/desktop/terminus-font/.gitignore b/pkg/terminus-font/.gitignore
index 272eca1a..272eca1a 100644
--- a/desktop/terminus-font/.gitignore
+++ b/pkg/terminus-font/.gitignore
diff --git a/desktop/terminus-font/gen.rc b/pkg/terminus-font/gen.rc
index c8ee5d4c..c8ee5d4c 100644
--- a/desktop/terminus-font/gen.rc
+++ b/pkg/terminus-font/gen.rc
diff --git a/extra/pcre/rev b/pkg/terminus-font/rev
index d00491fd..d00491fd 100644
--- a/extra/pcre/rev
+++ b/pkg/terminus-font/rev
diff --git a/desktop/terminus-font/sha256 b/pkg/terminus-font/sha256
index d624c615..d624c615 100644
--- a/desktop/terminus-font/sha256
+++ b/pkg/terminus-font/sha256
diff --git a/desktop/terminus-font/ucstoany.awk b/pkg/terminus-font/ucstoany.awk
index 24145a2e..24145a2e 100644
--- a/desktop/terminus-font/ucstoany.awk
+++ b/pkg/terminus-font/ucstoany.awk
diff --git a/desktop/terminus-font/url b/pkg/terminus-font/url
index 9f934a3f..9f934a3f 100644
--- a/desktop/terminus-font/url
+++ b/pkg/terminus-font/url
diff --git a/extra/the_silver_searcher/config.h b/pkg/the_silver_searcher/config.h
index 41a9cbf9..41a9cbf9 100644
--- a/extra/the_silver_searcher/config.h
+++ b/pkg/the_silver_searcher/config.h
diff --git a/extra/the_silver_searcher/gen.rc b/pkg/the_silver_searcher/gen.rc
index 66e447fc..6ec53b9c 100644
--- a/extra/the_silver_searcher/gen.rc
+++ b/pkg/the_silver_searcher/gen.rc
@@ -1,13 +1,13 @@
 cflags\
 	-D _GNU_SOURCE\
-	-isystem '$builddir'/extra/pcre/include\
+	-isystem '$builddir'/pkg/pcre/include\
 	-I include\
 	-I '$dir'
 
-exe ag -d extra/pcre/headers src/^(\
+exe ag -d pkg/pcre/headers src/^(\
         ignore.c log.c options.c print.c print_w32.c scandir.c search.c lang.c\
         util.c decompress.c main.c\
-) '$builddir'/extra/pcre/libpcre.a
+) '$builddir'/pkg/pcre/libpcre.a
 file bin/ag '$outdir'/ag 755
 file share/man/man1/ag.1 '$srcdir'/doc/ag.1 644
 
diff --git a/extra/the_silver_searcher/rev b/pkg/the_silver_searcher/rev
index b8626c4c..b8626c4c 100644
--- a/extra/the_silver_searcher/rev
+++ b/pkg/the_silver_searcher/rev
diff --git a/extra/the_silver_searcher/src b/pkg/the_silver_searcher/src
-Subproject 682ab865e174ce289b7dda5514abfdf21037a2d
+Subproject 682ab865e174ce289b7dda5514abfdf21037a2d
diff --git a/extra/transmission/.gitignore b/pkg/transmission/.gitignore
index c914ea0a..c914ea0a 100644
--- a/extra/transmission/.gitignore
+++ b/pkg/transmission/.gitignore
diff --git a/extra/transmission/config.h b/pkg/transmission/config.h
index a0009f4e..a0009f4e 100644
--- a/extra/transmission/config.h
+++ b/pkg/transmission/config.h
diff --git a/extra/transmission/gen.rc b/pkg/transmission/gen.rc
index b5280b5f..b9d2134c 100644
--- a/extra/transmission/gen.rc
+++ b/pkg/transmission/gen.rc
@@ -1,22 +1,22 @@
 set orig_cflags '$cflags'
 cflags\
 	-D __TRANSMISSION__\
-	-I '$builddir'/core/curl/include\
-	-I '$builddir'/core/libressl/include\
-	-I '$builddir'/core/zlib/include\
-	-I '$builddir'/extra/libevent/include\
+	-I '$builddir'/pkg/curl/include\
+	-I '$builddir'/pkg/libevent/include\
+	-I '$builddir'/pkg/libressl/include\
+	-I '$builddir'/pkg/zlib/include\
 	-I '$dir' \
 	-I '$srcdir' \
 	-I '$srcdir'/third-party\
 	-I '$srcdir'/third-party/libb64\
 	-I '$srcdir'/third-party/libnatpmp\
 	-I '$srcdir'/third-party/libutp\
-	-I extra/libevent/src/include\
+	-I pkg/libevent/src/include\
 	-I include\
-	-idirafter core/openbsd/src/sys\
+	-idirafter pkg/openbsd/src/sys\
 	-include config.h
 
-phony deps (core/^(curl libressl zlib) extra/libevent)^/headers
+phony deps pkg/^(curl libevent libressl zlib)^/headers
 
 lib libtransmission.a -d '$dir'/deps libtransmission/^(\
 	announcer.c\
@@ -82,11 +82,11 @@ lib libtransmission.a -d '$dir'/deps libtransmission/^(\
 	watchdir-inotify.c\
 	file-posix.c\
 	crypto-utils-openssl.c\
-) libb64.a libdht.a libminiupnp.a libnatpmp.a libutp.a '$builddir'/^(\
-	core/curl/libcurl.a.d\
-	core/libressl/libcrypto.a.d\
-	core/zlib/libz.a\
-	extra/libevent/libevent.a\
+) libb64.a libdht.a libminiupnp.a libnatpmp.a libutp.a '$builddir'/pkg/^(\
+	curl/libcurl.a.d\
+	libevent/libevent.a\
+	libressl/libcrypto.a.d\
+	zlib/libz.a\
 )
 
 lib libb64.a third-party/libb64/^(cdecode.c cencode.c)
@@ -102,7 +102,7 @@ lib libdht.a third-party/dht/dht.c
 	set cflags '$orig_cflags' \
 		-D _GNU_SOURCE\
 		-I '$outdir'/miniupnp\
-		-idirafter core/openbsd/src/sys
+		-idirafter pkg/openbsd/src/sys
 
 	hdr='$outdir'/miniupnp/miniupnpcstrings.h
 	build $hdr sed '$srcdir'/third-party/miniupnp/miniupnpcstrings.h.in ; with\
diff --git a/extra/pcsc/rev b/pkg/transmission/rev
index d00491fd..d00491fd 100644
--- a/extra/pcsc/rev
+++ b/pkg/transmission/rev
diff --git a/extra/transmission/sha256 b/pkg/transmission/sha256
index 16625e70..16625e70 100644
--- a/extra/transmission/sha256
+++ b/pkg/transmission/sha256
diff --git a/extra/transmission/url b/pkg/transmission/url
index 8ba77c57..8ba77c57 100644
--- a/extra/transmission/url
+++ b/pkg/transmission/url
diff --git a/core/tz/gen.rc b/pkg/tz/gen.rc
index b2a9377e..b2a9377e 100644
--- a/core/tz/gen.rc
+++ b/pkg/tz/gen.rc
diff --git a/media/mpv/rev b/pkg/tz/rev
index 1e8b3149..1e8b3149 100644
--- a/media/mpv/rev
+++ b/pkg/tz/rev
diff --git a/core/tz/src b/pkg/tz/src
-Subproject eeff212d0f2b94a8c08d7ce2e1ff2278c027936
+Subproject eeff212d0f2b94a8c08d7ce2e1ff2278c027936
diff --git a/core/tz/tzdata.awk b/pkg/tz/tzdata.awk
index 6e24a588..e7b48085 100644
--- a/core/tz/tzdata.awk
+++ b/pkg/tz/tzdata.awk
@@ -1,4 +1,4 @@
-# usage: awk -f tzdata.awk repo=out/root.git out=out/core/tz/zoneinfo [file...]
+# usage: awk -f tzdata.awk repo=out/root.git out=out/pkg/tz/zoneinfo [file...]
 
 function run(cmd) {
 	status = system(cmd)
diff --git a/core/tz/version.h b/pkg/tz/version.h
index 76f806c4..76f806c4 100644
--- a/core/tz/version.h
+++ b/pkg/tz/version.h
diff --git a/core/ubase/config.h b/pkg/ubase/config.h
index c5d38cde..c5d38cde 100644
--- a/core/ubase/config.h
+++ b/pkg/ubase/config.h
diff --git a/core/ubase/gen.rc b/pkg/ubase/gen.rc
index 94c2b2e9..94c2b2e9 100644
--- a/core/ubase/gen.rc
+++ b/pkg/ubase/gen.rc
diff --git a/core/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch b/pkg/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch
index 4c349432..4c349432 100644
--- a/core/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch
+++ b/pkg/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch
diff --git a/core/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch b/pkg/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch
index bddcb0fb..bddcb0fb 100644
--- a/core/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch
+++ b/pkg/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch
diff --git a/core/ubase/patch/0003-Add-stty-1.patch b/pkg/ubase/patch/0003-Add-stty-1.patch
index 7f9876a6..7f9876a6 100644
--- a/core/ubase/patch/0003-Add-stty-1.patch
+++ b/pkg/ubase/patch/0003-Add-stty-1.patch
diff --git a/core/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch b/pkg/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch
index ebe8e0a3..ebe8e0a3 100644
--- a/core/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch
+++ b/pkg/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch
diff --git a/core/ubase/patch/0005-stty-fix-casting-bug.patch b/pkg/ubase/patch/0005-stty-fix-casting-bug.patch
index 26faab07..26faab07 100644
--- a/core/ubase/patch/0005-stty-fix-casting-bug.patch
+++ b/pkg/ubase/patch/0005-stty-fix-casting-bug.patch
diff --git a/core/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch b/pkg/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch
index 822ddf1d..822ddf1d 100644
--- a/core/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch
+++ b/pkg/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch
diff --git a/core/ubase/patch/0007-stty-simplify.patch b/pkg/ubase/patch/0007-stty-simplify.patch
index e4039231..e4039231 100644
--- a/core/ubase/patch/0007-stty-simplify.patch
+++ b/pkg/ubase/patch/0007-stty-simplify.patch
diff --git a/core/ubase/patch/0008-stty-Fix-indentation.patch b/pkg/ubase/patch/0008-stty-Fix-indentation.patch
index f2e5847f..f2e5847f 100644
--- a/core/ubase/patch/0008-stty-Fix-indentation.patch
+++ b/pkg/ubase/patch/0008-stty-Fix-indentation.patch
diff --git a/core/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch b/pkg/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch
index ae1373f5..ae1373f5 100644
--- a/core/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch
+++ b/pkg/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch
diff --git a/extra/msmtp/rev b/pkg/ubase/rev
index 0cfbf088..0cfbf088 100644
--- a/extra/msmtp/rev
+++ b/pkg/ubase/rev
diff --git a/core/ubase/src b/pkg/ubase/src
-Subproject e3dacbb542daeda7797855b01b3afbf7c433ad5
+Subproject e3dacbb542daeda7797855b01b3afbf7c433ad5
diff --git a/extra/unzip/.gitignore b/pkg/unzip/.gitignore
index dcae2209..dcae2209 100644
--- a/extra/unzip/.gitignore
+++ b/pkg/unzip/.gitignore
diff --git a/extra/unzip/config.h b/pkg/unzip/config.h
index 5d254d27..5d254d27 100644
--- a/extra/unzip/config.h
+++ b/pkg/unzip/config.h
diff --git a/extra/unzip/gen.rc b/pkg/unzip/gen.rc
index 5b5a537a..36e9a53e 100644
--- a/extra/unzip/gen.rc
+++ b/pkg/unzip/gen.rc
@@ -1,14 +1,14 @@
 cflags\
 	-include '$dir'/config.h\
-	-isystem core/bzip2/src\
+	-isystem pkg/bzip2/src\
 	-I '$srcdir'
 
-exe unzip -d '$builddir'/core/bzip2/fetch.stamp\
+exe unzip -d '$builddir'/pkg/bzip2/fetch.stamp\
         unzip.c crc32.c crypt.c envargs.c explode.c\
 	extract.c fileio.c globals.c inflate.c list.c match.c\
 	process.c ttyio.c ubz2err.c unreduce.c unshrink.c zipinfo.c\
 	unix/unix.c\
-	'$builddir'/core/bzip2/libbz2.a
+	'$builddir'/pkg/bzip2/libbz2.a
 file bin/unzip '$outdir'/unzip 755
 file share/man/man1/unzip.1 '$srcdir'/man/unzip.1 644
 
diff --git a/extra/unzip/patch/0001-Drop-L-suffix-from-man-page-sections.patch b/pkg/unzip/patch/0001-Drop-L-suffix-from-man-page-sections.patch
index 27d1f048..27d1f048 100644
--- a/extra/unzip/patch/0001-Drop-L-suffix-from-man-page-sections.patch
+++ b/pkg/unzip/patch/0001-Drop-L-suffix-from-man-page-sections.patch
diff --git a/extra/unzip/patch/0002-Handle-the-PKWare-verification-bit-of-internal-attri.patch b/pkg/unzip/patch/0002-Handle-the-PKWare-verification-bit-of-internal-attri.patch
index f7d9caab..f7d9caab 100644
--- a/extra/unzip/patch/0002-Handle-the-PKWare-verification-bit-of-internal-attri.patch
+++ b/pkg/unzip/patch/0002-Handle-the-PKWare-verification-bit-of-internal-attri.patch
diff --git a/extra/unzip/patch/0003-Restore-uid-and-gid-information-when-requested.patch b/pkg/unzip/patch/0003-Restore-uid-and-gid-information-when-requested.patch
index ce3b3f0b..ce3b3f0b 100644
--- a/extra/unzip/patch/0003-Restore-uid-and-gid-information-when-requested.patch
+++ b/pkg/unzip/patch/0003-Restore-uid-and-gid-information-when-requested.patch
diff --git a/extra/unzip/patch/0004-Initialize-the-symlink-flag.patch b/pkg/unzip/patch/0004-Initialize-the-symlink-flag.patch
index d8f4d38d..d8f4d38d 100644
--- a/extra/unzip/patch/0004-Initialize-the-symlink-flag.patch
+++ b/pkg/unzip/patch/0004-Initialize-the-symlink-flag.patch
diff --git a/extra/unzip/patch/0005-Increase-size-of-cfactorstr-array-to-avoid-buffer-ov.patch b/pkg/unzip/patch/0005-Increase-size-of-cfactorstr-array-to-avoid-buffer-ov.patch
index e58bbdd5..e58bbdd5 100644
--- a/extra/unzip/patch/0005-Increase-size-of-cfactorstr-array-to-avoid-buffer-ov.patch
+++ b/pkg/unzip/patch/0005-Increase-size-of-cfactorstr-array-to-avoid-buffer-ov.patch
diff --git a/extra/unzip/patch/0006-zipinfo.c-Do-not-crash-when-hostver-byte-is-100.patch b/pkg/unzip/patch/0006-zipinfo.c-Do-not-crash-when-hostver-byte-is-100.patch
index f7ea35fa..f7ea35fa 100644
--- a/extra/unzip/patch/0006-zipinfo.c-Do-not-crash-when-hostver-byte-is-100.patch
+++ b/pkg/unzip/patch/0006-zipinfo.c-Do-not-crash-when-hostver-byte-is-100.patch
diff --git a/extra/unzip/patch/0007-Fix-CVE-2014-8139-CRC32-verification-heap-based-over.patch b/pkg/unzip/patch/0007-Fix-CVE-2014-8139-CRC32-verification-heap-based-over.patch
index cbf42c2e..cbf42c2e 100644
--- a/extra/unzip/patch/0007-Fix-CVE-2014-8139-CRC32-verification-heap-based-over.patch
+++ b/pkg/unzip/patch/0007-Fix-CVE-2014-8139-CRC32-verification-heap-based-over.patch
diff --git a/extra/unzip/patch/0008-Fix-CVE-2014-8140-out-of-bounds-write-issue-in-test_.patch b/pkg/unzip/patch/0008-Fix-CVE-2014-8140-out-of-bounds-write-issue-in-test_.patch
index b60fc149..b60fc149 100644
--- a/extra/unzip/patch/0008-Fix-CVE-2014-8140-out-of-bounds-write-issue-in-test_.patch
+++ b/pkg/unzip/patch/0008-Fix-CVE-2014-8140-out-of-bounds-write-issue-in-test_.patch
diff --git a/extra/unzip/patch/0009-Fix-CVE-2014-8141-out-of-bounds-read-issues-in-getZi.patch b/pkg/unzip/patch/0009-Fix-CVE-2014-8141-out-of-bounds-read-issues-in-getZi.patch
index b34ae1a8..b34ae1a8 100644
--- a/extra/unzip/patch/0009-Fix-CVE-2014-8141-out-of-bounds-read-issues-in-getZi.patch
+++ b/pkg/unzip/patch/0009-Fix-CVE-2014-8141-out-of-bounds-read-issues-in-getZi.patch
diff --git a/extra/unzip/patch/0010-Info-ZIP-UnZip-buffer-overflow.patch b/pkg/unzip/patch/0010-Info-ZIP-UnZip-buffer-overflow.patch
index edd9706f..edd9706f 100644
--- a/extra/unzip/patch/0010-Info-ZIP-UnZip-buffer-overflow.patch
+++ b/pkg/unzip/patch/0010-Info-ZIP-UnZip-buffer-overflow.patch
diff --git a/extra/unzip/patch/0011-Upstream-fix-for-heap-overflow.patch b/pkg/unzip/patch/0011-Upstream-fix-for-heap-overflow.patch
index 52681e0b..52681e0b 100644
--- a/extra/unzip/patch/0011-Upstream-fix-for-heap-overflow.patch
+++ b/pkg/unzip/patch/0011-Upstream-fix-for-heap-overflow.patch
diff --git a/extra/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch b/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
index 7e15d681..7e15d681 100644
--- a/extra/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
+++ b/pkg/unzip/patch/0012-fix-infinite-loop-when-extracting-empty-bzip2-data.patch
diff --git a/extra/unzip/patch/0013-extract-prevent-unsigned-overflow-on-invalid-input.patch b/pkg/unzip/patch/0013-extract-prevent-unsigned-overflow-on-invalid-input.patch
index 9f816a7a..9f816a7a 100644
--- a/extra/unzip/patch/0013-extract-prevent-unsigned-overflow-on-invalid-input.patch
+++ b/pkg/unzip/patch/0013-extract-prevent-unsigned-overflow-on-invalid-input.patch
diff --git a/extra/sshfs/rev b/pkg/unzip/rev
index d00491fd..d00491fd 100644
--- a/extra/sshfs/rev
+++ b/pkg/unzip/rev
diff --git a/extra/unzip/sha256 b/pkg/unzip/sha256
index 0b45b49d..0b45b49d 100644
--- a/extra/unzip/sha256
+++ b/pkg/unzip/sha256
diff --git a/extra/unzip/url b/pkg/unzip/url
index c021ee6d..c021ee6d 100644
--- a/extra/unzip/url
+++ b/pkg/unzip/url
diff --git a/core/util-linux/config.h b/pkg/util-linux/config.h
index 9f5c2ab6..9f5c2ab6 100644
--- a/core/util-linux/config.h
+++ b/pkg/util-linux/config.h
diff --git a/core/util-linux/gen.rc b/pkg/util-linux/gen.rc
index 98f29302..98f29302 100644
--- a/core/util-linux/gen.rc
+++ b/pkg/util-linux/gen.rc
diff --git a/extra/transmission/rev b/pkg/util-linux/rev
index d00491fd..d00491fd 100644
--- a/extra/transmission/rev
+++ b/pkg/util-linux/rev
diff --git a/core/util-linux/src b/pkg/util-linux/src
-Subproject 5bd2b14de42bd81abfee1a3f3265b2ecb92f79b
+Subproject 5bd2b14de42bd81abfee1a3f3265b2ecb92f79b
diff --git a/pkg/velox/gen.rc b/pkg/velox/gen.rc
new file mode 100644
index 00000000..4c3c77b5
--- /dev/null
+++ b/pkg/velox/gen.rc
@@ -0,0 +1,42 @@
+cflags\
+	-D 'VELOX_LIBEXEC=''"/libexec/velox"''' \
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/libxkbcommon/src\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/swc/include\
+	-isystem '$builddir'/pkg/wayland/include\
+	-isystem '$builddir'/pkg/wld/include\
+	-I '$outdir'
+
+waylandproto protocol/velox.xml\
+	protocol/velox-^(client server)^-protocol.h velox-protocol.c
+build '$outdir'/protocol/swc-client-protocol.h copy '$builddir'/pkg/swc/include/swc-client-protocol.h
+
+phony deps\
+	'$outdir'/protocol/^(swc-client velox-^(client server))^-protocol.h\
+	'$builddir'/pkg/^(fontconfig libxkbcommon swc)^/fetch.stamp\
+	pkg/^(pixman swc wayland wld)^/headers
+
+exe velox -d '$dir'/deps \
+	config.c\
+	layout.c\
+	screen.c\
+	tag.c\
+	util.c\
+	velox.c\
+	velox-protocol.c.o\
+	window.c\
+	'$builddir'/pkg/^(\
+		swc/libswc.a.d\
+		wayland/libwayland-server.a.d\
+	)
+file bin/velox '$outdir'/velox 755
+
+exe status_bar -d '$dir'/deps clients/status_bar.c velox-protocol.c.o '$builddir'/pkg/^(\
+	swc/swc-protocol.c.o\
+	wld/libwld.a.d\
+	wayland/libwayland-client.a.d\
+)
+file libexec/velox/status_bar '$outdir'/status_bar 755
+
+fetch git
diff --git a/media/alsa-lib/rev b/pkg/velox/rev
index 0cfbf088..0cfbf088 100644
--- a/media/alsa-lib/rev
+++ b/pkg/velox/rev
diff --git a/desktop/velox/src b/pkg/velox/src
-Subproject a95412ddddfe6640bf14e8524e591c41cf769fc
+Subproject a95412ddddfe6640bf14e8524e591c41cf769fc
diff --git a/extra/vis/gen.rc b/pkg/vis/gen.rc
index 429d2b04..228c92a1 100644
--- a/extra/vis/gen.rc
+++ b/pkg/vis/gen.rc
@@ -8,28 +8,28 @@ cflags\
 	-D 'VERSION=''"'$version'"''' \
 	-D 'VIS_PATH=''"/share/vis"''' \
 	-D NDEBUG\
-	-isystem extra/libtermkey/src\
-	-isystem lang/lua/src/src\
-	-isystem '$builddir'/extra/ncurses/include\
+	-isystem pkg/libtermkey/src\
+	-isystem pkg/lua/src/src\
+	-isystem '$builddir'/pkg/ncurses/include\
 	-I '$outdir'
 
 build '$outdir'/config.h copy '$srcdir'/config.def.h
 
-phony deps '$outdir'/config.h '$builddir'/^(\
-	extra/libtermkey/fetch.stamp\
-	lang/lua/fetch.stamp\
-) extra/ncurses/headers
+phony deps '$outdir'/config.h '$builddir'/pkg/^(\
+	libtermkey/fetch.stamp\
+	lua/fetch.stamp\
+) pkg/ncurses/headers
 
 exe vis -d '$dir'/deps \
 	array.c buffer.c libutf.c main.c map.c register.c ring-buffer.c\
 	sam.c text.c text-motions.c text-objects.c text-regex.c text-util.c\
 	ui-curses.c view.c vis.c vis-lua.c vis-modes.c vis-motions.c\
 	vis-operators.c vis-prompt.c vis-text-objects.c\
-	'$builddir'/^(\
-		extra/libtermkey/libtermkey.a.d\
-		extra/lpeg/liblpeg.a\
-		extra/ncurses/libncurses.a\
-		lang/lua/liblua.a\
+	'$builddir'/pkg/^(\
+		libtermkey/libtermkey.a.d\
+		lpeg/liblpeg.a\
+		lua/liblua.a\
+		ncurses/libncurses.a\
 	)
 file bin/vis '$outdir'/vis 755
 
diff --git a/extra/vis/patch/0001-Allow-building-lpeg-statically.patch b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch
index 025bfb41..025bfb41 100644
--- a/extra/vis/patch/0001-Allow-building-lpeg-statically.patch
+++ b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch
diff --git a/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch b/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch
index 254b5c5c..254b5c5c 100644
--- a/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch
+++ b/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch
diff --git a/media/libass/rev b/pkg/vis/rev
index 00750edc..00750edc 100644
--- a/media/libass/rev
+++ b/pkg/vis/rev
diff --git a/extra/vis/src b/pkg/vis/src
-Subproject 37d98f3119d5d3a63492bf9683ec6a4d68cc1e2
+Subproject 37d98f3119d5d3a63492bf9683ec6a4d68cc1e2
diff --git a/desktop/wayland-protocols/gen.rc b/pkg/wayland-protocols/gen.rc
index f47de2ab..aa5053c0 100644
--- a/desktop/wayland-protocols/gen.rc
+++ b/pkg/wayland-protocols/gen.rc
@@ -1,5 +1,5 @@
 cflags\
-	-I '$builddir'/desktop/wayland/include
+	-I '$builddir'/pkg/wayland/include
 
 waylandproto unstable/xdg-shell/xdg-shell-unstable-v5.xml\
 	include/xdg-shell-unstable-v5-^(client server)^-protocol.h\
diff --git a/extra/unzip/rev b/pkg/wayland-protocols/rev
index d00491fd..d00491fd 100644
--- a/extra/unzip/rev
+++ b/pkg/wayland-protocols/rev
diff --git a/desktop/wayland-protocols/src b/pkg/wayland-protocols/src
-Subproject 2e541a36deff5f2e16e25e27f7f93d26822eecc
+Subproject 2e541a36deff5f2e16e25e27f7f93d26822eecc
diff --git a/desktop/wayland/config.h b/pkg/wayland/config.h
index c59dbe65..c59dbe65 100644
--- a/desktop/wayland/config.h
+++ b/pkg/wayland/config.h
diff --git a/desktop/wayland/gen.rc b/pkg/wayland/gen.rc
index c96a2e3f..df908274 100644
--- a/desktop/wayland/gen.rc
+++ b/pkg/wayland/gen.rc
@@ -1,6 +1,6 @@
 cflags\
-	-isystem '$builddir'/desktop/expat/include\
-	-isystem '$builddir'/desktop/libffi/include\
+	-isystem '$builddir'/pkg/expat/include\
+	-isystem '$builddir'/pkg/libffi/include\
 	-I include\
 	-I '$dir' \
 	-I '$outdir'/include\
@@ -16,11 +16,11 @@ build '$outdir'/include/wayland-version.h sed '$srcdir'/src/wayland-version.h.in
 
 cc src/wayland-util.c
 cc src/wayland-os.c
-cc src/connection.c '||' desktop/libffi/headers
+cc src/connection.c '||' pkg/libffi/headers
 
-exe wayland-scanner -d 'desktop/expat/headers $outdir/include/wayland-version.h' \
+exe wayland-scanner -d 'pkg/expat/headers $outdir/include/wayland-version.h' \
 	src/^(scanner.c wayland-util.c.o)\
-	'$builddir'/desktop/expat/libexpat.a
+	'$builddir'/pkg/expat/libexpat.a
 
 waylandproto protocol/wayland.xml\
 	include/wayland-^(client server)^-protocol.h\
@@ -40,7 +40,7 @@ lib libwayland-server.a -d '$dir'/headers src/^(\
 	wayland-shm.c\
 	wayland-util.c.o\
 	event-loop.c\
-) '$builddir'/desktop/libffi/libffi.a
+) '$builddir'/pkg/libffi/libffi.a
 
 lib libwayland-client.a -d '$dir'/headers src/^(\
 	connection.c.o\
@@ -48,7 +48,7 @@ lib libwayland-client.a -d '$dir'/headers src/^(\
 	wayland-protocol.c.o\
 	wayland-client.c\
 	wayland-util.c.o\
-) '$builddir'/desktop/libffi/libffi.a
+) '$builddir'/pkg/libffi/libffi.a
 
 lib libwayland-cursor.a -d '$dir'/headers cursor/^(\
 	os-compatibility.c\
diff --git a/media/alsa-utils/rev b/pkg/wayland/rev
index 0cfbf088..0cfbf088 100644
--- a/media/alsa-utils/rev
+++ b/pkg/wayland/rev
diff --git a/desktop/wayland/src b/pkg/wayland/src
-Subproject a0d76ffda5c3483e5e67fed19b7d8afe8966782
+Subproject a0d76ffda5c3483e5e67fed19b7d8afe8966782
diff --git a/desktop/wld/gen.rc b/pkg/wld/gen.rc
index 85f6a180..957d5444 100644
--- a/desktop/wld/gen.rc
+++ b/pkg/wld/gen.rc
@@ -1,12 +1,12 @@
 cflags=(\
 	-D WITH_WAYLAND_SHM\
 	-D WITH_WAYLAND_DRM\
-	-isystem desktop/fontconfig/src\
-	-isystem desktop/freetype/src/include\
-	-isystem desktop/libdrm/src\
-	-isystem desktop/libdrm/src/include/drm\
-	-isystem '$builddir'/desktop/pixman/include\
-	-isystem '$builddir'/desktop/wayland/include\
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/freetype/src/include\
+	-isystem pkg/libdrm/src\
+	-isystem pkg/libdrm/src/include/drm\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/wayland/include\
 	-I '$outdir' \
 )
 
@@ -34,22 +34,22 @@ srcs=(\
 	wayland-drm-protocol.c.o\
 )
 libs=(\
-	desktop/fontconfig/libfontconfig.a.d\
-	desktop/freetype/libfreetype.a.d\
-	desktop/libdrm/libdrm.a\
-	desktop/pixman/libpixman.a\
-	desktop/wayland/libwayland-client.a.d\
+	fontconfig/libfontconfig.a.d\
+	freetype/libfreetype.a.d\
+	libdrm/libdrm.a\
+	pixman/libpixman.a\
+	wayland/libwayland-client.a.d\
 )
 
 if(~ intel $config_video_drivers) {
-	cflags=($cflags -D WITH_DRM_INTEL -I desktop/libdrm/src/intel)
+	cflags=($cflags -D WITH_DRM_INTEL -I pkg/libdrm/src/intel)
 	srcs=($srcs intel.c intel/batch.c)
-	libs=($libs desktop/libdrm/libdrm_intel.a.d)
+	libs=($libs libdrm/libdrm_intel.a.d)
 }
 if(~ nouveau $config_video_drivers) {
-	cflags=($cflags -D WITH_DRM_NOUVEAU -I desktop/libdrm/src/nouveau)
+	cflags=($cflags -D WITH_DRM_NOUVEAU -I pkg/libdrm/src/nouveau)
 	srcs=($srcs nouveau.c)
-	libs=($libs desktop/libdrm/libdrm_nouveau.a)
+	libs=($libs libdrm/libdrm_nouveau.a)
 }
 
 cflags $cflags
@@ -60,9 +60,9 @@ waylandproto protocol/wayland-drm.xml\
 
 phony deps\
 	'$outdir'/protocol/wayland-drm-client-protocol.h\
-	'$builddir'/desktop/^(fontconfig freetype libdrm)^/fetch.stamp\
-	desktop/^(pixman wayland)^/headers 
+	'$builddir'/pkg/^(fontconfig freetype libdrm)^/fetch.stamp\
+	pkg/^(pixman wayland)^/headers
 
-lib libwld.a -d '$dir'/deps $srcs '$builddir'/$libs
+lib libwld.a -d '$dir'/deps $srcs '$builddir'/pkg/$libs
 
 fetch git
diff --git a/lang/lua/rev b/pkg/wld/rev
index d00491fd..d00491fd 100644
--- a/lang/lua/rev
+++ b/pkg/wld/rev
diff --git a/desktop/wld/src b/pkg/wld/src
-Subproject efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f
+Subproject efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f
diff --git a/desktop/xkeyboard-config/gen.rc b/pkg/xkeyboard-config/gen.rc
index bfba7a51..bfba7a51 100644
--- a/desktop/xkeyboard-config/gen.rc
+++ b/pkg/xkeyboard-config/gen.rc
diff --git a/lang/mc/rev b/pkg/xkeyboard-config/rev
index d00491fd..d00491fd 100644
--- a/lang/mc/rev
+++ b/pkg/xkeyboard-config/rev
diff --git a/desktop/xkeyboard-config/src b/pkg/xkeyboard-config/src
-Subproject b68a9ab082ddb33647f225abe8cab4f963d1cb3
+Subproject b68a9ab082ddb33647f225abe8cab4f963d1cb3
diff --git a/core/xz/config.h b/pkg/xz/config.h
index fcd66734..fcd66734 100644
--- a/core/xz/config.h
+++ b/pkg/xz/config.h
diff --git a/core/xz/gen.rc b/pkg/xz/gen.rc
index 1bf8f5c5..1bf8f5c5 100644
--- a/core/xz/gen.rc
+++ b/pkg/xz/gen.rc
diff --git a/lang/python/rev b/pkg/xz/rev
index d00491fd..d00491fd 100644
--- a/lang/python/rev
+++ b/pkg/xz/rev
diff --git a/core/xz/src b/pkg/xz/src
-Subproject 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0
+Subproject 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0
diff --git a/media/youtube-dl/gen.rc b/pkg/youtube-dl/gen.rc
index 510edf6e..510edf6e 100644
--- a/media/youtube-dl/gen.rc
+++ b/pkg/youtube-dl/gen.rc
diff --git a/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch b/pkg/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
index 8384f8a9..8384f8a9 100644
--- a/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
+++ b/pkg/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
diff --git a/media/youtube-dl/pylibs.txt b/pkg/youtube-dl/pylibs.txt
index 2fbae912..2fbae912 100644
--- a/media/youtube-dl/pylibs.txt
+++ b/pkg/youtube-dl/pylibs.txt
diff --git a/media/youtube-dl/rev b/pkg/youtube-dl/rev
index 48082f72..48082f72 100644
--- a/media/youtube-dl/rev
+++ b/pkg/youtube-dl/rev
diff --git a/media/youtube-dl/src b/pkg/youtube-dl/src
-Subproject b25459b88ae8faf072046eb9c23af0dcda7c140
+Subproject b25459b88ae8faf072046eb9c23af0dcda7c140
diff --git a/core/zlib/gen.rc b/pkg/zlib/gen.rc
index 56ac0a0a..56ac0a0a 100644
--- a/core/zlib/gen.rc
+++ b/pkg/zlib/gen.rc
diff --git a/lang/scc/rev b/pkg/zlib/rev
index d00491fd..d00491fd 100644
--- a/lang/scc/rev
+++ b/pkg/zlib/rev
diff --git a/core/zlib/src b/pkg/zlib/src
-Subproject 50893291621658f355bc5b4d450a8d06a563053
+Subproject 50893291621658f355bc5b4d450a8d06a563053
diff --git a/sets.rc b/sets.rc
new file mode 100644
index 00000000..a9f8afb4
--- /dev/null
+++ b/sets.rc
@@ -0,0 +1,66 @@
+core=(\
+	awk\
+	bc\
+	bzip2\
+	curl\
+	e2fsprogs\
+	file\
+	git\
+	iproute2\
+	kbd\
+	libressl\
+	loksh\
+	mdocml\
+	musl\
+	ninja\
+	openbsd\
+	openssh\
+	perp\
+	pigz\
+	plan9port\
+	sbase\
+	sdhcp\
+	sinit\
+	skeleton\
+	tz\
+	ubase\
+	util-linux\
+	xz\
+)
+extra=(\
+	less\
+	libfuse\
+	ncurses\
+	the_silver_searcher\
+	unzip\
+	vis\
+)
+devel=(\
+	make\
+	qbe\
+	nasm\
+	scc\
+	mc\
+	man-pages-posix\
+)
+media=(\
+	alsa-utils\
+	ffmpeg\
+	mpv\
+	youtube-dl\
+)
+net=(\
+	hostap\
+	ii\
+	msmtp\
+	sshfs\
+	transmission\
+)
+desktop=(\
+	dmenu\
+	st\
+	swc\
+	terminus-font\
+	velox\
+	xkeyboard-config\
+)
diff --git a/setup.rc b/setup.rc
index 9f1986cf..2c28e049 100755
--- a/setup.rc
+++ b/setup.rc
@@ -1,9 +1,5 @@
 #!/bin/rc
 
-. ./config.rc
-
-flag e +
-
 fn usage {
 	echo 'usage: '$0' [dir]' >[1=2]
 	exit 2
@@ -11,6 +7,12 @@ fn usage {
 
 if(! ~ $#* 0 1) usage
 
+if(! [ -f config.rc ])
+	cp config.def.rc config.rc
+. ./config.rc
+
+flag e +
+
 # call this after a command capture to ensure it succeeded
 fn checkstatus {}
 
@@ -29,6 +31,8 @@ fn subgen {
 }
 
 fn gen {
+	pkg=`{basename $1}
+	checkstatus
 	if(~ $dir '' .) dir=$1
 	if not dir=$dir/$1