diff --git a/pkg/Makefile b/pkg/Makefile
new file mode 100644
index 000000000..20c61fb08
--- /dev/null
+++ b/pkg/Makefile
@@ -0,0 +1,10 @@
+DIRS = $(shell find . -type d -depth 1)
+.PHONY: clean dirs $(DIRS)
+
+push: $(DIRS)
+
+$(DIRS):
+	$(MAKE) -C $@
+
+clean:
+	rm -f hash
diff --git a/base/binfmt/.gitignore b/pkg/binfmt/.gitignore
similarity index 100%
rename from base/binfmt/.gitignore
rename to pkg/binfmt/.gitignore
diff --git a/base/binfmt/Dockerfile b/pkg/binfmt/Dockerfile
similarity index 100%
rename from base/binfmt/Dockerfile
rename to pkg/binfmt/Dockerfile
diff --git a/base/binfmt/Makefile b/pkg/binfmt/Makefile
similarity index 100%
rename from base/binfmt/Makefile
rename to pkg/binfmt/Makefile
diff --git a/base/binfmt/etc/binfmt.d/00_moby.conf b/pkg/binfmt/etc/binfmt.d/00_moby.conf
similarity index 100%
rename from base/binfmt/etc/binfmt.d/00_moby.conf
rename to pkg/binfmt/etc/binfmt.d/00_moby.conf
diff --git a/base/binfmt/main.go b/pkg/binfmt/main.go
similarity index 100%
rename from base/binfmt/main.go
rename to pkg/binfmt/main.go
diff --git a/base/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile
similarity index 100%
rename from base/docker-ce/Dockerfile
rename to pkg/docker-ce/Dockerfile
diff --git a/base/docker-ce/Makefile b/pkg/docker-ce/Makefile
similarity index 100%
rename from base/docker-ce/Makefile
rename to pkg/docker-ce/Makefile
diff --git a/base/init/.gitignore b/pkg/init/.gitignore
similarity index 100%
rename from base/init/.gitignore
rename to pkg/init/.gitignore
diff --git a/base/init/Dockerfile b/pkg/init/Dockerfile
similarity index 100%
rename from base/init/Dockerfile
rename to pkg/init/Dockerfile
diff --git a/base/init/Makefile b/pkg/init/Makefile
similarity index 100%
rename from base/init/Makefile
rename to pkg/init/Makefile
diff --git a/base/init/etc/dhcpcd.conf b/pkg/init/etc/dhcpcd.conf
similarity index 100%
rename from base/init/etc/dhcpcd.conf
rename to pkg/init/etc/dhcpcd.conf
diff --git a/base/init/etc/init.d/containerd b/pkg/init/etc/init.d/containerd
similarity index 100%
rename from base/init/etc/init.d/containerd
rename to pkg/init/etc/init.d/containerd
diff --git a/base/init/etc/init.d/containers b/pkg/init/etc/init.d/containers
similarity index 100%
rename from base/init/etc/init.d/containers
rename to pkg/init/etc/init.d/containers
diff --git a/base/init/etc/init.d/rcS b/pkg/init/etc/init.d/rcS
similarity index 100%
rename from base/init/etc/init.d/rcS
rename to pkg/init/etc/init.d/rcS
diff --git a/base/init/etc/inittab b/pkg/init/etc/inittab
similarity index 100%
rename from base/init/etc/inittab
rename to pkg/init/etc/inittab
diff --git a/base/init/etc/issue b/pkg/init/etc/issue
similarity index 100%
rename from base/init/etc/issue
rename to pkg/init/etc/issue
diff --git a/base/init/init b/pkg/init/init
similarity index 100%
rename from base/init/init
rename to pkg/init/init
diff --git a/base/init/start-stop-daemon.c b/pkg/init/start-stop-daemon.c
similarity index 100%
rename from base/init/start-stop-daemon.c
rename to pkg/init/start-stop-daemon.c
diff --git a/base/metadata-gcp/.gitignore b/pkg/metadata-gcp/.gitignore
similarity index 100%
rename from base/metadata-gcp/.gitignore
rename to pkg/metadata-gcp/.gitignore
diff --git a/base/metadata-gcp/Dockerfile b/pkg/metadata-gcp/Dockerfile
similarity index 100%
rename from base/metadata-gcp/Dockerfile
rename to pkg/metadata-gcp/Dockerfile
diff --git a/base/metadata-gcp/Makefile b/pkg/metadata-gcp/Makefile
similarity index 100%
rename from base/metadata-gcp/Makefile
rename to pkg/metadata-gcp/Makefile
diff --git a/base/metadata-gcp/gcp.go b/pkg/metadata-gcp/gcp.go
similarity index 100%
rename from base/metadata-gcp/gcp.go
rename to pkg/metadata-gcp/gcp.go
diff --git a/base/rngd/.gitignore b/pkg/rngd/.gitignore
similarity index 100%
rename from base/rngd/.gitignore
rename to pkg/rngd/.gitignore
diff --git a/base/rngd/Dockerfile b/pkg/rngd/Dockerfile
similarity index 100%
rename from base/rngd/Dockerfile
rename to pkg/rngd/Dockerfile
diff --git a/base/rngd/Makefile b/pkg/rngd/Makefile
similarity index 100%
rename from base/rngd/Makefile
rename to pkg/rngd/Makefile
diff --git a/base/sshd/Dockerfile b/pkg/sshd/Dockerfile
similarity index 100%
rename from base/sshd/Dockerfile
rename to pkg/sshd/Dockerfile
diff --git a/base/sshd/Makefile b/pkg/sshd/Makefile
similarity index 100%
rename from base/sshd/Makefile
rename to pkg/sshd/Makefile
diff --git a/base/sshd/etc/motd b/pkg/sshd/etc/motd
similarity index 100%
rename from base/sshd/etc/motd
rename to pkg/sshd/etc/motd
diff --git a/base/sshd/etc/ssh/sshd_config b/pkg/sshd/etc/ssh/sshd_config
similarity index 100%
rename from base/sshd/etc/ssh/sshd_config
rename to pkg/sshd/etc/ssh/sshd_config
diff --git a/base/sshd/usr/bin/ssh.sh b/pkg/sshd/usr/bin/ssh.sh
similarity index 100%
rename from base/sshd/usr/bin/ssh.sh
rename to pkg/sshd/usr/bin/ssh.sh
diff --git a/base/sysctl/.gitignore b/pkg/sysctl/.gitignore
similarity index 100%
rename from base/sysctl/.gitignore
rename to pkg/sysctl/.gitignore
diff --git a/base/sysctl/Dockerfile b/pkg/sysctl/Dockerfile
similarity index 100%
rename from base/sysctl/Dockerfile
rename to pkg/sysctl/Dockerfile
diff --git a/base/sysctl/Makefile b/pkg/sysctl/Makefile
similarity index 100%
rename from base/sysctl/Makefile
rename to pkg/sysctl/Makefile
diff --git a/base/sysctl/etc/sysctl.d/00-moby.conf b/pkg/sysctl/etc/sysctl.d/00-moby.conf
similarity index 100%
rename from base/sysctl/etc/sysctl.d/00-moby.conf
rename to pkg/sysctl/etc/sysctl.d/00-moby.conf
diff --git a/base/sysctl/main.go b/pkg/sysctl/main.go
similarity index 100%
rename from base/sysctl/main.go
rename to pkg/sysctl/main.go