diff --git a/alpine/base/.gitignore b/base/.gitignore
similarity index 100%
rename from alpine/base/.gitignore
rename to base/.gitignore
diff --git a/alpine/base/Makefile b/base/Makefile
similarity index 100%
rename from alpine/base/Makefile
rename to base/Makefile
diff --git a/alpine/base/alpine-aws/Dockerfile b/base/alpine-aws/Dockerfile
similarity index 100%
rename from alpine/base/alpine-aws/Dockerfile
rename to base/alpine-aws/Dockerfile
diff --git a/alpine/base/alpine-aws/Makefile b/base/alpine-aws/Makefile
similarity index 100%
rename from alpine/base/alpine-aws/Makefile
rename to base/alpine-aws/Makefile
diff --git a/alpine/base/alpine-base/Dockerfile b/base/alpine-base/Dockerfile
similarity index 100%
rename from alpine/base/alpine-base/Dockerfile
rename to base/alpine-base/Dockerfile
diff --git a/alpine/base/alpine-base/Makefile b/base/alpine-base/Makefile
similarity index 100%
rename from alpine/base/alpine-base/Makefile
rename to base/alpine-base/Makefile
diff --git a/alpine/base/alpine-base/packages b/base/alpine-base/packages
similarity index 100%
rename from alpine/base/alpine-base/packages
rename to base/alpine-base/packages
diff --git a/alpine/base/alpine-base/repositories b/base/alpine-base/repositories
similarity index 100%
rename from alpine/base/alpine-base/repositories
rename to base/alpine-base/repositories
diff --git a/alpine/base/alpine-build-c/Dockerfile b/base/alpine-build-c/Dockerfile
similarity index 100%
rename from alpine/base/alpine-build-c/Dockerfile
rename to base/alpine-build-c/Dockerfile
diff --git a/alpine/base/alpine-build-c/Makefile b/base/alpine-build-c/Makefile
similarity index 100%
rename from alpine/base/alpine-build-c/Makefile
rename to base/alpine-build-c/Makefile
diff --git a/alpine/base/alpine-build-ebpf/100-musl-compat.patch b/base/alpine-build-ebpf/100-musl-compat.patch
similarity index 100%
rename from alpine/base/alpine-build-ebpf/100-musl-compat.patch
rename to base/alpine-build-ebpf/100-musl-compat.patch
diff --git a/alpine/base/alpine-build-ebpf/Dockerfile b/base/alpine-build-ebpf/Dockerfile
similarity index 100%
rename from alpine/base/alpine-build-ebpf/Dockerfile
rename to base/alpine-build-ebpf/Dockerfile
diff --git a/alpine/base/alpine-build-ebpf/Makefile b/base/alpine-build-ebpf/Makefile
similarity index 100%
rename from alpine/base/alpine-build-ebpf/Makefile
rename to base/alpine-build-ebpf/Makefile
diff --git a/alpine/base/alpine-build-ebpf/bcc-gnuism.patch b/base/alpine-build-ebpf/bcc-gnuism.patch
similarity index 100%
rename from alpine/base/alpine-build-ebpf/bcc-gnuism.patch
rename to base/alpine-build-ebpf/bcc-gnuism.patch
diff --git a/alpine/base/alpine-build-ebpf/cdefs.h b/base/alpine-build-ebpf/cdefs.h
similarity index 100%
rename from alpine/base/alpine-build-ebpf/cdefs.h
rename to base/alpine-build-ebpf/cdefs.h
diff --git a/alpine/base/alpine-build-ebpf/decl.patch b/base/alpine-build-ebpf/decl.patch
similarity index 100%
rename from alpine/base/alpine-build-ebpf/decl.patch
rename to base/alpine-build-ebpf/decl.patch
diff --git a/alpine/base/alpine-build-ebpf/error.h b/base/alpine-build-ebpf/error.h
similarity index 100%
rename from alpine/base/alpine-build-ebpf/error.h
rename to base/alpine-build-ebpf/error.h
diff --git a/alpine/base/alpine-build-ebpf/intl.patch b/base/alpine-build-ebpf/intl.patch
similarity index 100%
rename from alpine/base/alpine-build-ebpf/intl.patch
rename to base/alpine-build-ebpf/intl.patch
diff --git a/alpine/base/alpine-build-ebpf/temp_failure.patch b/base/alpine-build-ebpf/temp_failure.patch
similarity index 100%
rename from alpine/base/alpine-build-ebpf/temp_failure.patch
rename to base/alpine-build-ebpf/temp_failure.patch
diff --git a/alpine/base/alpine-build-toybox/Dockerfile b/base/alpine-build-toybox/Dockerfile
similarity index 100%
rename from alpine/base/alpine-build-toybox/Dockerfile
rename to base/alpine-build-toybox/Dockerfile
diff --git a/alpine/base/alpine-build-toybox/Makefile b/base/alpine-build-toybox/Makefile
similarity index 100%
rename from alpine/base/alpine-build-toybox/Makefile
rename to base/alpine-build-toybox/Makefile
diff --git a/alpine/base/alpine-build-toybox/build.sh b/base/alpine-build-toybox/build.sh
similarity index 100%
rename from alpine/base/alpine-build-toybox/build.sh
rename to base/alpine-build-toybox/build.sh
diff --git a/alpine/base/alpine-efi/Dockerfile b/base/alpine-efi/Dockerfile
similarity index 100%
rename from alpine/base/alpine-efi/Dockerfile
rename to base/alpine-efi/Dockerfile
diff --git a/alpine/base/alpine-efi/Makefile b/base/alpine-efi/Makefile
similarity index 100%
rename from alpine/base/alpine-efi/Makefile
rename to base/alpine-efi/Makefile
diff --git a/alpine/base/alpine-qemu/Dockerfile b/base/alpine-qemu/Dockerfile
similarity index 100%
rename from alpine/base/alpine-qemu/Dockerfile
rename to base/alpine-qemu/Dockerfile
diff --git a/alpine/base/alpine-qemu/Makefile b/base/alpine-qemu/Makefile
similarity index 100%
rename from alpine/base/alpine-qemu/Makefile
rename to base/alpine-qemu/Makefile
diff --git a/alpine/base/binfmt/.gitignore b/base/binfmt/.gitignore
similarity index 100%
rename from alpine/base/binfmt/.gitignore
rename to base/binfmt/.gitignore
diff --git a/alpine/base/binfmt/Dockerfile b/base/binfmt/Dockerfile
similarity index 100%
rename from alpine/base/binfmt/Dockerfile
rename to base/binfmt/Dockerfile
diff --git a/alpine/base/binfmt/Makefile b/base/binfmt/Makefile
similarity index 100%
rename from alpine/base/binfmt/Makefile
rename to base/binfmt/Makefile
diff --git a/alpine/base/binfmt/etc/binfmt.d/00_moby.conf b/base/binfmt/etc/binfmt.d/00_moby.conf
similarity index 100%
rename from alpine/base/binfmt/etc/binfmt.d/00_moby.conf
rename to base/binfmt/etc/binfmt.d/00_moby.conf
diff --git a/alpine/base/binfmt/main.go b/base/binfmt/main.go
similarity index 100%
rename from alpine/base/binfmt/main.go
rename to base/binfmt/main.go
diff --git a/alpine/base/c-compile/Dockerfile b/base/c-compile/Dockerfile
similarity index 100%
rename from alpine/base/c-compile/Dockerfile
rename to base/c-compile/Dockerfile
diff --git a/alpine/base/c-compile/Makefile b/base/c-compile/Makefile
similarity index 100%
rename from alpine/base/c-compile/Makefile
rename to base/c-compile/Makefile
diff --git a/alpine/base/c-compile/compile.sh b/base/c-compile/compile.sh
similarity index 100%
rename from alpine/base/c-compile/compile.sh
rename to base/c-compile/compile.sh
diff --git a/alpine/base/ca-certificates/Dockerfile b/base/ca-certificates/Dockerfile
similarity index 100%
rename from alpine/base/ca-certificates/Dockerfile
rename to base/ca-certificates/Dockerfile
diff --git a/alpine/base/ca-certificates/Makefile b/base/ca-certificates/Makefile
similarity index 100%
rename from alpine/base/ca-certificates/Makefile
rename to base/ca-certificates/Makefile
diff --git a/alpine/base/check-config/Dockerfile b/base/check-config/Dockerfile
similarity index 100%
rename from alpine/base/check-config/Dockerfile
rename to base/check-config/Dockerfile
diff --git a/alpine/base/check-config/Makefile b/base/check-config/Makefile
similarity index 100%
rename from alpine/base/check-config/Makefile
rename to base/check-config/Makefile
diff --git a/alpine/base/check-kernel-config/Dockerfile b/base/check-kernel-config/Dockerfile
similarity index 100%
rename from alpine/base/check-kernel-config/Dockerfile
rename to base/check-kernel-config/Dockerfile
diff --git a/alpine/base/check-kernel-config/Makefile b/base/check-kernel-config/Makefile
similarity index 100%
rename from alpine/base/check-kernel-config/Makefile
rename to base/check-kernel-config/Makefile
diff --git a/alpine/base/check-kernel-config/check-kernel-config.sh b/base/check-kernel-config/check-kernel-config.sh
similarity index 100%
rename from alpine/base/check-kernel-config/check-kernel-config.sh
rename to base/check-kernel-config/check-kernel-config.sh
diff --git a/alpine/base/containerd/Dockerfile b/base/containerd/Dockerfile
similarity index 100%
rename from alpine/base/containerd/Dockerfile
rename to base/containerd/Dockerfile
diff --git a/alpine/base/containerd/Makefile b/base/containerd/Makefile
similarity index 100%
rename from alpine/base/containerd/Makefile
rename to base/containerd/Makefile
diff --git a/alpine/base/go-compile/Dockerfile b/base/go-compile/Dockerfile
similarity index 100%
rename from alpine/base/go-compile/Dockerfile
rename to base/go-compile/Dockerfile
diff --git a/alpine/base/go-compile/Makefile b/base/go-compile/Makefile
similarity index 100%
rename from alpine/base/go-compile/Makefile
rename to base/go-compile/Makefile
diff --git a/alpine/base/go-compile/compile.sh b/base/go-compile/compile.sh
similarity index 100%
rename from alpine/base/go-compile/compile.sh
rename to base/go-compile/compile.sh
diff --git a/alpine/base/guestfs/Dockerfile b/base/guestfs/Dockerfile
similarity index 100%
rename from alpine/base/guestfs/Dockerfile
rename to base/guestfs/Dockerfile
diff --git a/alpine/base/guestfs/Makefile b/base/guestfs/Makefile
similarity index 100%
rename from alpine/base/guestfs/Makefile
rename to base/guestfs/Makefile
diff --git a/alpine/base/mkimage-gce/Dockerfile b/base/mkimage-gce/Dockerfile
similarity index 100%
rename from alpine/base/mkimage-gce/Dockerfile
rename to base/mkimage-gce/Dockerfile
diff --git a/alpine/base/mkimage-gce/Makefile b/base/mkimage-gce/Makefile
similarity index 100%
rename from alpine/base/mkimage-gce/Makefile
rename to base/mkimage-gce/Makefile
diff --git a/alpine/base/mkimage-gce/make-gce b/base/mkimage-gce/make-gce
similarity index 100%
rename from alpine/base/mkimage-gce/make-gce
rename to base/mkimage-gce/make-gce
diff --git a/alpine/base/mkimage-gce/syslinux.cfg b/base/mkimage-gce/syslinux.cfg
similarity index 100%
rename from alpine/base/mkimage-gce/syslinux.cfg
rename to base/mkimage-gce/syslinux.cfg
diff --git a/alpine/base/mkimage-iso-bios/Dockerfile b/base/mkimage-iso-bios/Dockerfile
similarity index 100%
rename from alpine/base/mkimage-iso-bios/Dockerfile
rename to base/mkimage-iso-bios/Dockerfile
diff --git a/alpine/base/mkimage-iso-bios/Makefile b/base/mkimage-iso-bios/Makefile
similarity index 100%
rename from alpine/base/mkimage-iso-bios/Makefile
rename to base/mkimage-iso-bios/Makefile
diff --git a/alpine/base/mkimage-iso-bios/isolinux.cfg b/base/mkimage-iso-bios/isolinux.cfg
similarity index 100%
rename from alpine/base/mkimage-iso-bios/isolinux.cfg
rename to base/mkimage-iso-bios/isolinux.cfg
diff --git a/alpine/base/mkimage-iso-bios/make-iso b/base/mkimage-iso-bios/make-iso
similarity index 100%
rename from alpine/base/mkimage-iso-bios/make-iso
rename to base/mkimage-iso-bios/make-iso
diff --git a/alpine/base/mksh/Dockerfile b/base/mksh/Dockerfile
similarity index 100%
rename from alpine/base/mksh/Dockerfile
rename to base/mksh/Dockerfile
diff --git a/alpine/base/mksh/Makefile b/base/mksh/Makefile
similarity index 100%
rename from alpine/base/mksh/Makefile
rename to base/mksh/Makefile
diff --git a/alpine/base/pad4/Dockerfile b/base/pad4/Dockerfile
similarity index 100%
rename from alpine/base/pad4/Dockerfile
rename to base/pad4/Dockerfile
diff --git a/alpine/base/pad4/Makefile b/base/pad4/Makefile
similarity index 100%
rename from alpine/base/pad4/Makefile
rename to base/pad4/Makefile
diff --git a/alpine/base/pad4/pad4.sh b/base/pad4/pad4.sh
similarity index 100%
rename from alpine/base/pad4/pad4.sh
rename to base/pad4/pad4.sh
diff --git a/alpine/base/perf/.gitignore b/base/perf/.gitignore
similarity index 100%
rename from alpine/base/perf/.gitignore
rename to base/perf/.gitignore
diff --git a/alpine/base/perf/Dockerfile b/base/perf/Dockerfile
similarity index 100%
rename from alpine/base/perf/Dockerfile
rename to base/perf/Dockerfile
diff --git a/alpine/base/perf/Makefile b/base/perf/Makefile
similarity index 100%
rename from alpine/base/perf/Makefile
rename to base/perf/Makefile
diff --git a/alpine/base/perf/README.md b/base/perf/README.md
similarity index 100%
rename from alpine/base/perf/README.md
rename to base/perf/README.md
diff --git a/alpine/base/pinata-iptables/Dockerfile b/base/pinata-iptables/Dockerfile
similarity index 100%
rename from alpine/base/pinata-iptables/Dockerfile
rename to base/pinata-iptables/Dockerfile
diff --git a/alpine/base/pinata-iptables/Makefile b/base/pinata-iptables/Makefile
similarity index 100%
rename from alpine/base/pinata-iptables/Makefile
rename to base/pinata-iptables/Makefile
diff --git a/alpine/base/pinata-iptables/main.ml b/base/pinata-iptables/main.ml
similarity index 100%
rename from alpine/base/pinata-iptables/main.ml
rename to base/pinata-iptables/main.ml
diff --git a/alpine/base/qemu-user-static/Dockerfile b/base/qemu-user-static/Dockerfile
similarity index 100%
rename from alpine/base/qemu-user-static/Dockerfile
rename to base/qemu-user-static/Dockerfile
diff --git a/alpine/base/qemu-user-static/Makefile b/base/qemu-user-static/Makefile
similarity index 100%
rename from alpine/base/qemu-user-static/Makefile
rename to base/qemu-user-static/Makefile
diff --git a/alpine/base/riddler/Dockerfile b/base/riddler/Dockerfile
similarity index 100%
rename from alpine/base/riddler/Dockerfile
rename to base/riddler/Dockerfile
diff --git a/alpine/base/riddler/Makefile b/base/riddler/Makefile
similarity index 100%
rename from alpine/base/riddler/Makefile
rename to base/riddler/Makefile
diff --git a/alpine/base/riddler/riddler.sh b/base/riddler/riddler.sh
similarity index 100%
rename from alpine/base/riddler/riddler.sh
rename to base/riddler/riddler.sh
diff --git a/alpine/base/rng-tools/Dockerfile b/base/rng-tools/Dockerfile
similarity index 100%
rename from alpine/base/rng-tools/Dockerfile
rename to base/rng-tools/Dockerfile
diff --git a/alpine/base/rng-tools/Makefile b/base/rng-tools/Makefile
similarity index 100%
rename from alpine/base/rng-tools/Makefile
rename to base/rng-tools/Makefile
diff --git a/alpine/base/rng-tools/fix-textrels-on-PIC-x86.patch b/base/rng-tools/fix-textrels-on-PIC-x86.patch
similarity index 100%
rename from alpine/base/rng-tools/fix-textrels-on-PIC-x86.patch
rename to base/rng-tools/fix-textrels-on-PIC-x86.patch
diff --git a/alpine/base/rng-tools/sha256sums b/base/rng-tools/sha256sums
similarity index 100%
rename from alpine/base/rng-tools/sha256sums
rename to base/rng-tools/sha256sums
diff --git a/alpine/base/rngd/.gitignore b/base/rngd/.gitignore
similarity index 100%
rename from alpine/base/rngd/.gitignore
rename to base/rngd/.gitignore
diff --git a/alpine/base/rngd/Dockerfile b/base/rngd/Dockerfile
similarity index 100%
rename from alpine/base/rngd/Dockerfile
rename to base/rngd/Dockerfile
diff --git a/alpine/base/rngd/Makefile b/base/rngd/Makefile
similarity index 100%
rename from alpine/base/rngd/Makefile
rename to base/rngd/Makefile
diff --git a/alpine/base/runc/Dockerfile b/base/runc/Dockerfile
similarity index 100%
rename from alpine/base/runc/Dockerfile
rename to base/runc/Dockerfile
diff --git a/alpine/base/runc/Makefile b/base/runc/Makefile
similarity index 100%
rename from alpine/base/runc/Makefile
rename to base/runc/Makefile
diff --git a/alpine/base/tar2initrd/Dockerfile b/base/tar2initrd/Dockerfile
similarity index 100%
rename from alpine/base/tar2initrd/Dockerfile
rename to base/tar2initrd/Dockerfile
diff --git a/alpine/base/tar2initrd/Makefile b/base/tar2initrd/Makefile
similarity index 100%
rename from alpine/base/tar2initrd/Makefile
rename to base/tar2initrd/Makefile
diff --git a/alpine/base/tar2initrd/tar2initrd.sh b/base/tar2initrd/tar2initrd.sh
similarity index 100%
rename from alpine/base/tar2initrd/tar2initrd.sh
rename to base/tar2initrd/tar2initrd.sh
diff --git a/alpine/base/test/.gitignore b/base/test/.gitignore
similarity index 100%
rename from alpine/base/test/.gitignore
rename to base/test/.gitignore
diff --git a/alpine/base/test/Dockerfile b/base/test/Dockerfile
similarity index 100%
rename from alpine/base/test/Dockerfile
rename to base/test/Dockerfile
diff --git a/alpine/base/test/Makefile b/base/test/Makefile
similarity index 100%
rename from alpine/base/test/Makefile
rename to base/test/Makefile
diff --git a/alpine/base/test/bin/test.sh b/base/test/bin/test.sh
similarity index 100%
rename from alpine/base/test/bin/test.sh
rename to base/test/bin/test.sh
diff --git a/alpine/base/test/etc/moby b/base/test/etc/moby
similarity index 100%
rename from alpine/base/test/etc/moby
rename to base/test/etc/moby
diff --git a/alpine/base/tini/Dockerfile b/base/tini/Dockerfile
similarity index 100%
rename from alpine/base/tini/Dockerfile
rename to base/tini/Dockerfile
diff --git a/alpine/base/tini/Makefile b/base/tini/Makefile
similarity index 100%
rename from alpine/base/tini/Makefile
rename to base/tini/Makefile
diff --git a/alpine/base/toybox-media/Makefile b/base/toybox-media/Makefile
similarity index 100%
rename from alpine/base/toybox-media/Makefile
rename to base/toybox-media/Makefile