diff --git a/hacking/all.sh b/hacking/v2-initramfs-from-os/all.sh
similarity index 100%
rename from hacking/all.sh
rename to hacking/v2-initramfs-from-os/all.sh
diff --git a/hacking/v3-busybox/generate.sh b/hacking/v3-busybox/create_initramfs.sh
similarity index 72%
rename from hacking/v3-busybox/generate.sh
rename to hacking/v3-busybox/create_initramfs.sh
index 00227a57..6d57b05c 100755
--- a/hacking/v3-busybox/generate.sh
+++ b/hacking/v3-busybox/create_initramfs.sh
@@ -5,14 +5,17 @@ set -ex
 initramfs_dir=$(mktemp -d /tmp/cdist-preos.XXXXXXX)
 # initramfs_dir=$1
 
-for dir in bin sbin etc proc sys newroot; do
+for dir in bin sbin etc proc sys newroot usr/bin usr/sbin; do
     mkdir -p ${initramfs_dir}/$dir
 done
 touch ${initramfs_dir}/etc/mdev.conf
 
 cp init "${initramfs_dir}/init"
 cp $(which busybox) "${initramfs_dir}/bin"
-ln -fs busybox "${initramfs_dir}/bin/sh"
+
+for link in sh mount; do
+    ln -fs busybox "${initramfs_dir}/bin/$link"
+done
 
 cd "${initramfs_dir}"
 find . | cpio -H newc -o | gzip
diff --git a/hacking/create_iso.sh b/hacking/v3-busybox/create_iso.sh
similarity index 100%
rename from hacking/create_iso.sh
rename to hacking/v3-busybox/create_iso.sh
diff --git a/hacking/qemu-test.sh b/hacking/v3-busybox/qemu-test.sh
similarity index 100%
rename from hacking/qemu-test.sh
rename to hacking/v3-busybox/qemu-test.sh