diff --git a/raspi_master.yaml b/raspi_master.yaml
index cc9635e..c35be79 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -86,22 +86,22 @@ steps:
       # Allow root logins locally with no password
       sed -i 's,root:[^:]*:,root::,' "${ROOT?}/etc/shadow"
 
-      install -m 644 -o root -g root fstab "${ROOT?}/etc/fstab"
+      install -m 644 -o root -g root rootfs/etc/fstab "${ROOT?}/etc/fstab"
 
-      install -m 644 -o root -g root eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
+      install -m 644 -o root -g root rootfs/etc/network/interfaces.d/eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
 
-      install -m 755 -o root -g root rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
-      install -m 644 -o root -g root rpi-set-sysconf.service "${ROOT?}/etc/systemd/system"
-      install -m 644 -o root -g root sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
+      install -m 755 -o root -g root rootfs/usr/local/sbin/rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/"
+      install -m 644 -o root -g root rootfs/boot/firmware/sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
       mkdir -p "${ROOT?}/etc/systemd/system/basic.target.requires/"
       ln -s /etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/rpi-set-sysconf.service"
 
-      install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
-      install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system"
+      install -m 755 -o root -g root rootfs/usr/sbin/rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/"
       mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/"
       ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service"
 
-      install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system"
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/"
       mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
       ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service"
       rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key*
diff --git a/sysconf.txt b/rootfs/boot/firmware/sysconf.txt
similarity index 100%
rename from sysconf.txt
rename to rootfs/boot/firmware/sysconf.txt
diff --git a/fstab b/rootfs/etc/fstab
similarity index 100%
rename from fstab
rename to rootfs/etc/fstab
diff --git a/eth0 b/rootfs/etc/network/interfaces.d/eth0
similarity index 100%
rename from eth0
rename to rootfs/etc/network/interfaces.d/eth0
diff --git a/rpi-generate-ssh-host-keys.service b/rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service
similarity index 100%
rename from rpi-generate-ssh-host-keys.service
rename to rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service
diff --git a/rpi-resizerootfs.service b/rootfs/etc/systemd/system/rpi-resizerootfs.service
similarity index 100%
rename from rpi-resizerootfs.service
rename to rootfs/etc/systemd/system/rpi-resizerootfs.service
diff --git a/rpi-set-sysconf.service b/rootfs/etc/systemd/system/rpi-set-sysconf.service
similarity index 100%
rename from rpi-set-sysconf.service
rename to rootfs/etc/systemd/system/rpi-set-sysconf.service
diff --git a/rpi-set-sysconf b/rootfs/usr/local/sbin/rpi-set-sysconf
similarity index 100%
rename from rpi-set-sysconf
rename to rootfs/usr/local/sbin/rpi-set-sysconf
diff --git a/rpi-resizerootfs b/rootfs/usr/sbin/rpi-resizerootfs
similarity index 100%
rename from rpi-resizerootfs
rename to rootfs/usr/sbin/rpi-resizerootfs