diff --git a/post-2nd-stage-files/etc/fstab b/2nd-stage-files/post-2nd-stage-files/etc/fstab
similarity index 100%
rename from post-2nd-stage-files/etc/fstab
rename to 2nd-stage-files/post-2nd-stage-files/etc/fstab
diff --git a/post-2nd-stage-files/etc/hostname b/2nd-stage-files/post-2nd-stage-files/etc/hostname
similarity index 100%
rename from post-2nd-stage-files/etc/hostname
rename to 2nd-stage-files/post-2nd-stage-files/etc/hostname
diff --git a/post-2nd-stage-files/etc/network/interfaces.d/eth0 b/2nd-stage-files/post-2nd-stage-files/etc/network/interfaces.d/eth0
similarity index 100%
rename from post-2nd-stage-files/etc/network/interfaces.d/eth0
rename to 2nd-stage-files/post-2nd-stage-files/etc/network/interfaces.d/eth0
diff --git a/post-2nd-stage-files/etc/network/interfaces.d/lo b/2nd-stage-files/post-2nd-stage-files/etc/network/interfaces.d/lo
similarity index 100%
rename from post-2nd-stage-files/etc/network/interfaces.d/lo
rename to 2nd-stage-files/post-2nd-stage-files/etc/network/interfaces.d/lo
diff --git a/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg b/2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
similarity index 100%
rename from pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
rename to 2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
diff --git a/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg b/2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
similarity index 100%
rename from pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
rename to 2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
diff --git a/pre-2nd-stage-files/etc/kernel/postrm.d/zz-remove-uimg b/2nd-stage-files/pre-2nd-stage-files/etc/kernel/postrm.d/zz-remove-uimg
similarity index 100%
rename from pre-2nd-stage-files/etc/kernel/postrm.d/zz-remove-uimg
rename to 2nd-stage-files/pre-2nd-stage-files/etc/kernel/postrm.d/zz-remove-uimg
diff --git a/Dockerfile b/Dockerfile
index 872683e..203e7c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg
diff --git a/dockerfiles/Dockerfile.arm32v7 b/dockerfiles/Dockerfile.arm32v7
index be5ff88..2915074 100644
--- a/dockerfiles/Dockerfile.arm32v7
+++ b/dockerfiles/Dockerfile.arm32v7
@@ -25,6 +25,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg
diff --git a/dockerfiles/Dockerfile.arm32v7-on-amd64 b/dockerfiles/Dockerfile.arm32v7-on-amd64
index 319f12f..d52146e 100644
--- a/dockerfiles/Dockerfile.arm32v7-on-amd64
+++ b/dockerfiles/Dockerfile.arm32v7-on-amd64
@@ -36,6 +36,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
 RUN rm /usr/bin/qemu-arm-static
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg
diff --git a/dockerfiles/Dockerfile.arm64v8 b/dockerfiles/Dockerfile.arm64v8
index 776e90a..c73a2ff 100644
--- a/dockerfiles/Dockerfile.arm64v8
+++ b/dockerfiles/Dockerfile.arm64v8
@@ -25,6 +25,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg
diff --git a/dockerfiles/Dockerfile.arm64v8-on-amd64 b/dockerfiles/Dockerfile.arm64v8-on-amd64
index 80413e2..5a225a7 100644
--- a/dockerfiles/Dockerfile.arm64v8-on-amd64
+++ b/dockerfiles/Dockerfile.arm64v8-on-amd64
@@ -36,6 +36,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
 RUN rm /usr/bin/qemu-aarch64-static
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg
diff --git a/rebuild-boots b/metascripts/rebuild-boots
similarity index 100%
rename from rebuild-boots
rename to metascripts/rebuild-boots
diff --git a/rebuild-debians b/metascripts/rebuild-debians
similarity index 100%
rename from rebuild-debians
rename to metascripts/rebuild-debians
diff --git a/rebuild-jekyll-boards b/metascripts/rebuild-jekyll-boards
similarity index 100%
rename from rebuild-jekyll-boards
rename to metascripts/rebuild-jekyll-boards
diff --git a/build-boot-rpi b/scripts/build-boot-rpi
similarity index 100%
rename from build-boot-rpi
rename to scripts/build-boot-rpi
diff --git a/build-boot-sunxi b/scripts/build-boot-sunxi
similarity index 100%
rename from build-boot-sunxi
rename to scripts/build-boot-sunxi
diff --git a/build-debian b/scripts/build-debian
similarity index 91%
rename from build-debian
rename to scripts/build-debian
index 3becdc0..d836ddd 100755
--- a/build-debian
+++ b/scripts/build-debian
@@ -66,8 +66,8 @@ EOF
 	;;
 esac
 
-cp -rv --preserve=mode ../pre-2nd-stage-files/* debian
-cp -rv --preserve=mode ../pre-2nd-stage-files-${ARCH}/* debian
+cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files/* debian
+cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files-${ARCH}/* debian
 
 # Copy ARM emulation stuff
 cp -v /usr/bin/qemu-*-static debian/usr/bin || :
@@ -88,7 +88,7 @@ EOF
 # Remove ARM emulation stuff again
 rm -v debian/usr/bin/qemu-*-static || :
 
-cp -rv --preserve=mode ../post-2nd-stage-files/* debian
+cp -rv --preserve=mode ../2nd-stage-files/post-2nd-stage-files/* debian
 
 # List all files
 find debian ! -type d -printf "/%P\n" | sort > "/artifacts/debian-${DIST}-${ARCH}.files.txt"
diff --git a/build-image b/scripts/build-image
similarity index 100%
rename from build-image
rename to scripts/build-image
diff --git a/build-u_boot b/scripts/build-u_boot
similarity index 100%
rename from build-u_boot
rename to scripts/build-u_boot