diff --git a/configs/install-iso/overlay/boot/diag2.img b/configs/install-iso/boot-files/diag2.img
similarity index 100%
rename from configs/install-iso/overlay/boot/diag2.img
rename to configs/install-iso/boot-files/diag2.img
diff --git a/configs/install-iso/overlay/boot/diag2.img.COPYING b/configs/install-iso/boot-files/diag2.img.COPYING
similarity index 100%
rename from configs/install-iso/overlay/boot/diag2.img.COPYING
rename to configs/install-iso/boot-files/diag2.img.COPYING
diff --git a/configs/install-iso/overlay/boot/grub/colors.lst b/configs/install-iso/boot-files/grub/colors.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/colors.lst
rename to configs/install-iso/boot-files/grub/colors.lst
diff --git a/configs/install-iso/overlay/boot/grub/help.lst b/configs/install-iso/boot-files/grub/help.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/help.lst
rename to configs/install-iso/boot-files/grub/help.lst
diff --git a/configs/install-iso/overlay/boot/grub/keyboards.lst b/configs/install-iso/boot-files/grub/keyboards.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/keyboards.lst
rename to configs/install-iso/boot-files/grub/keyboards.lst
diff --git a/configs/install-iso/overlay/boot/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/menu.lst
rename to configs/install-iso/boot-files/grub/menu.lst
diff --git a/configs/install-iso/overlay/boot/grub/more.lst b/configs/install-iso/boot-files/grub/more.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/more.lst
rename to configs/install-iso/boot-files/grub/more.lst
diff --git a/configs/install-iso/overlay/boot/grub/settings.lst b/configs/install-iso/boot-files/grub/settings.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/settings.lst
rename to configs/install-iso/boot-files/grub/settings.lst
diff --git a/configs/install-iso/overlay/boot/grub/tools.lst b/configs/install-iso/boot-files/grub/tools.lst
similarity index 100%
rename from configs/install-iso/overlay/boot/grub/tools.lst
rename to configs/install-iso/boot-files/grub/tools.lst
diff --git a/configs/install-iso/overlay/boot/help/bootexisting.txt b/configs/install-iso/boot-files/help/bootexisting.txt
similarity index 100%
rename from configs/install-iso/overlay/boot/help/bootexisting.txt
rename to configs/install-iso/boot-files/help/bootexisting.txt
diff --git a/configs/install-iso/overlay/boot/help/contrib.txt b/configs/install-iso/boot-files/help/contrib.txt
similarity index 100%
rename from configs/install-iso/overlay/boot/help/contrib.txt
rename to configs/install-iso/boot-files/help/contrib.txt
diff --git a/configs/install-iso/overlay/boot/invaders.img b/configs/install-iso/boot-files/invaders.img
similarity index 100%
rename from configs/install-iso/overlay/boot/invaders.img
rename to configs/install-iso/boot-files/invaders.img
diff --git a/configs/install-iso/overlay/boot/memdisk.bin b/configs/install-iso/boot-files/memdisk.bin
similarity index 100%
rename from configs/install-iso/overlay/boot/memdisk.bin
rename to configs/install-iso/boot-files/memdisk.bin
diff --git a/configs/install-iso/overlay/boot/memdisk.bin.COPYING b/configs/install-iso/boot-files/memdisk.bin.COPYING
similarity index 100%
rename from configs/install-iso/overlay/boot/memdisk.bin.COPYING
rename to configs/install-iso/boot-files/memdisk.bin.COPYING
diff --git a/configs/install-iso/overlay/boot/memtest86+-1.70.bin b/configs/install-iso/boot-files/memtest86+-1.70.bin
similarity index 100%
rename from configs/install-iso/overlay/boot/memtest86+-1.70.bin
rename to configs/install-iso/boot-files/memtest86+-1.70.bin
diff --git a/configs/install-iso/overlay/boot/memtest86+-1.70.bin.COPYING b/configs/install-iso/boot-files/memtest86+-1.70.bin.COPYING
similarity index 100%
rename from configs/install-iso/overlay/boot/memtest86+-1.70.bin.COPYING
rename to configs/install-iso/boot-files/memtest86+-1.70.bin.COPYING
diff --git a/configs/install-iso/overlay/boot/splash.xpm.gz b/configs/install-iso/boot-files/splash.xpm.gz
similarity index 100%
rename from configs/install-iso/overlay/boot/splash.xpm.gz
rename to configs/install-iso/boot-files/splash.xpm.gz
diff --git a/configs/install-iso/overlay/boot/x86test_zImage.bin b/configs/install-iso/boot-files/x86test_zImage.bin
similarity index 100%
rename from configs/install-iso/overlay/boot/x86test_zImage.bin
rename to configs/install-iso/boot-files/x86test_zImage.bin
diff --git a/configs/install-iso/overlay/boot/x86test_zImage.bin.COPYING b/configs/install-iso/boot-files/x86test_zImage.bin.COPYING
similarity index 100%
rename from configs/install-iso/overlay/boot/x86test_zImage.bin.COPYING
rename to configs/install-iso/boot-files/x86test_zImage.bin.COPYING
diff --git a/configs/install-iso/addons/config b/configs/install-iso/mounts
similarity index 100%
rename from configs/install-iso/addons/config
rename to configs/install-iso/mounts