diff --git a/airootfs/etc/group b/iso/airootfs/etc/group
similarity index 100%
rename from airootfs/etc/group
rename to iso/airootfs/etc/group
diff --git a/airootfs/etc/gshadow b/iso/airootfs/etc/gshadow
similarity index 100%
rename from airootfs/etc/gshadow
rename to iso/airootfs/etc/gshadow
diff --git a/airootfs/etc/hostname b/iso/airootfs/etc/hostname
similarity index 100%
rename from airootfs/etc/hostname
rename to iso/airootfs/etc/hostname
diff --git a/airootfs/etc/locale.conf b/iso/airootfs/etc/locale.conf
similarity index 100%
rename from airootfs/etc/locale.conf
rename to iso/airootfs/etc/locale.conf
diff --git a/airootfs/etc/localtime b/iso/airootfs/etc/localtime
similarity index 100%
rename from airootfs/etc/localtime
rename to iso/airootfs/etc/localtime
diff --git a/airootfs/etc/mkinitcpio.conf b/iso/airootfs/etc/mkinitcpio.conf
similarity index 100%
rename from airootfs/etc/mkinitcpio.conf
rename to iso/airootfs/etc/mkinitcpio.conf
diff --git a/airootfs/etc/mkinitcpio.d/linux.preset b/iso/airootfs/etc/mkinitcpio.d/linux.preset
similarity index 100%
rename from airootfs/etc/mkinitcpio.d/linux.preset
rename to iso/airootfs/etc/mkinitcpio.d/linux.preset
diff --git a/airootfs/etc/modprobe.d/broadcom-wl.conf b/iso/airootfs/etc/modprobe.d/broadcom-wl.conf
similarity index 100%
rename from airootfs/etc/modprobe.d/broadcom-wl.conf
rename to iso/airootfs/etc/modprobe.d/broadcom-wl.conf
diff --git a/airootfs/etc/motd b/iso/airootfs/etc/motd
similarity index 100%
rename from airootfs/etc/motd
rename to iso/airootfs/etc/motd
diff --git a/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
similarity index 100%
rename from airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
rename to iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
diff --git a/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook b/iso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
similarity index 100%
rename from airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
rename to iso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
diff --git a/airootfs/etc/passwd b/iso/airootfs/etc/passwd
similarity index 100%
rename from airootfs/etc/passwd
rename to iso/airootfs/etc/passwd
diff --git a/airootfs/etc/resolv.conf b/iso/airootfs/etc/resolv.conf
similarity index 100%
rename from airootfs/etc/resolv.conf
rename to iso/airootfs/etc/resolv.conf
diff --git a/airootfs/etc/shadow b/iso/airootfs/etc/shadow
similarity index 100%
rename from airootfs/etc/shadow
rename to iso/airootfs/etc/shadow
diff --git a/airootfs/etc/ssh/sshd_config b/iso/airootfs/etc/ssh/sshd_config
similarity index 100%
rename from airootfs/etc/ssh/sshd_config
rename to iso/airootfs/etc/ssh/sshd_config
diff --git a/airootfs/etc/sudoers.d/02_g_wheel b/iso/airootfs/etc/sudoers.d/02_g_wheel
similarity index 100%
rename from airootfs/etc/sudoers.d/02_g_wheel
rename to iso/airootfs/etc/sudoers.d/02_g_wheel
diff --git a/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/iso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf
similarity index 100%
rename from airootfs/etc/systemd/journald.conf.d/volatile-storage.conf
rename to iso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf
diff --git a/airootfs/etc/systemd/logind.conf.d/suspend.conf b/iso/airootfs/etc/systemd/logind.conf.d/suspend.conf
similarity index 100%
rename from airootfs/etc/systemd/logind.conf.d/suspend.conf
rename to iso/airootfs/etc/systemd/logind.conf.d/suspend.conf
diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/iso/airootfs/etc/systemd/network/20-ethernet.network
similarity index 100%
rename from airootfs/etc/systemd/network/20-ethernet.network
rename to iso/airootfs/etc/systemd/network/20-ethernet.network
diff --git a/airootfs/etc/systemd/network/20-wlan.network b/iso/airootfs/etc/systemd/network/20-wlan.network
similarity index 100%
rename from airootfs/etc/systemd/network/20-wlan.network
rename to iso/airootfs/etc/systemd/network/20-wlan.network
diff --git a/airootfs/etc/systemd/network/20-wwan.network b/iso/airootfs/etc/systemd/network/20-wwan.network
similarity index 100%
rename from airootfs/etc/systemd/network/20-wwan.network
rename to iso/airootfs/etc/systemd/network/20-wwan.network
diff --git a/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/iso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
similarity index 100%
rename from airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
rename to iso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
diff --git a/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service b/iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service
similarity index 100%
rename from airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service
rename to iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service
diff --git a/airootfs/etc/systemd/system/choose-mirror.service b/iso/airootfs/etc/systemd/system/choose-mirror.service
similarity index 100%
rename from airootfs/etc/systemd/system/choose-mirror.service
rename to iso/airootfs/etc/systemd/system/choose-mirror.service
diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
similarity index 100%
rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
rename to iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
similarity index 100%
rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
rename to iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
similarity index 100%
rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
rename to iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
similarity index 100%
rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
rename to iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
diff --git a/airootfs/etc/systemd/system/dbus-org.bluez.service b/iso/airootfs/etc/systemd/system/dbus-org.bluez.service
similarity index 100%
rename from airootfs/etc/systemd/system/dbus-org.bluez.service
rename to iso/airootfs/etc/systemd/system/dbus-org.bluez.service
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
similarity index 100%
rename from airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
rename to iso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
similarity index 100%
rename from airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
rename to iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
similarity index 100%
rename from airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
rename to iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service
similarity index 100%
rename from airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service
rename to iso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service
diff --git a/airootfs/etc/systemd/system/default.target b/iso/airootfs/etc/systemd/system/default.target
similarity index 100%
rename from airootfs/etc/systemd/system/default.target
rename to iso/airootfs/etc/systemd/system/default.target
diff --git a/airootfs/etc/systemd/system/display-manager.service b/iso/airootfs/etc/systemd/system/display-manager.service
similarity index 100%
rename from airootfs/etc/systemd/system/display-manager.service
rename to iso/airootfs/etc/systemd/system/display-manager.service
diff --git a/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
similarity index 100%
rename from airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
rename to iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/reflector.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
similarity index 100%
rename from airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
rename to iso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
diff --git a/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service b/iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
similarity index 100%
rename from airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
rename to iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
diff --git a/airootfs/etc/systemd/system/pacman-init.service b/iso/airootfs/etc/systemd/system/pacman-init.service
similarity index 100%
rename from airootfs/etc/systemd/system/pacman-init.service
rename to iso/airootfs/etc/systemd/system/pacman-init.service
diff --git a/airootfs/etc/systemd/system/reflector.service.d/archiso.conf b/iso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf
similarity index 100%
rename from airootfs/etc/systemd/system/reflector.service.d/archiso.conf
rename to iso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf
diff --git a/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service b/iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service
similarity index 100%
rename from airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service
rename to iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service
diff --git a/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
similarity index 100%
rename from airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
rename to iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
diff --git a/airootfs/etc/xdg/reflector/reflector.conf b/iso/airootfs/etc/xdg/reflector/reflector.conf
similarity index 100%
rename from airootfs/etc/xdg/reflector/reflector.conf
rename to iso/airootfs/etc/xdg/reflector/reflector.conf
diff --git a/airootfs/root/.automated_script.sh b/iso/airootfs/root/.automated_script.sh
similarity index 100%
rename from airootfs/root/.automated_script.sh
rename to iso/airootfs/root/.automated_script.sh
diff --git a/airootfs/root/.zlogin b/iso/airootfs/root/.zlogin
similarity index 100%
rename from airootfs/root/.zlogin
rename to iso/airootfs/root/.zlogin
diff --git a/airootfs/usr/local/bin/Installation_guide b/iso/airootfs/usr/local/bin/Installation_guide
similarity index 100%
rename from airootfs/usr/local/bin/Installation_guide
rename to iso/airootfs/usr/local/bin/Installation_guide
diff --git a/airootfs/usr/local/bin/choose-mirror b/iso/airootfs/usr/local/bin/choose-mirror
similarity index 100%
rename from airootfs/usr/local/bin/choose-mirror
rename to iso/airootfs/usr/local/bin/choose-mirror
diff --git a/airootfs/usr/local/bin/livecd-sound b/iso/airootfs/usr/local/bin/livecd-sound
similarity index 100%
rename from airootfs/usr/local/bin/livecd-sound
rename to iso/airootfs/usr/local/bin/livecd-sound
diff --git a/airootfs/usr/local/share/livecd-sound/asound.conf.in b/iso/airootfs/usr/local/share/livecd-sound/asound.conf.in
similarity index 100%
rename from airootfs/usr/local/share/livecd-sound/asound.conf.in
rename to iso/airootfs/usr/local/share/livecd-sound/asound.conf.in
diff --git a/bootstrap_packages.x86_64 b/iso/bootstrap_packages.x86_64
similarity index 100%
rename from bootstrap_packages.x86_64
rename to iso/bootstrap_packages.x86_64
diff --git a/efiboot/loader/entries/01-tuxOS-iso-x86_64-linux.conf b/iso/efiboot/loader/entries/01-tuxOS-iso-x86_64-linux.conf
similarity index 100%
rename from efiboot/loader/entries/01-tuxOS-iso-x86_64-linux.conf
rename to iso/efiboot/loader/entries/01-tuxOS-iso-x86_64-linux.conf
diff --git a/efiboot/loader/loader.conf b/iso/efiboot/loader/loader.conf
similarity index 100%
rename from efiboot/loader/loader.conf
rename to iso/efiboot/loader/loader.conf
diff --git a/grub/grub.cfg b/iso/grub/grub.cfg
similarity index 100%
rename from grub/grub.cfg
rename to iso/grub/grub.cfg
diff --git a/packages.x86_64 b/iso/packages.x86_64
similarity index 100%
rename from packages.x86_64
rename to iso/packages.x86_64
diff --git a/pacman.conf b/iso/pacman.conf
similarity index 100%
rename from pacman.conf
rename to iso/pacman.conf
diff --git a/profiledef.sh b/iso/profiledef.sh
similarity index 100%
rename from profiledef.sh
rename to iso/profiledef.sh
diff --git a/syslinux/splash.png b/iso/syslinux/splash.png
similarity index 100%
rename from syslinux/splash.png
rename to iso/syslinux/splash.png
diff --git a/syslinux/syslinux.cfg b/iso/syslinux/syslinux.cfg
similarity index 100%
rename from syslinux/syslinux.cfg
rename to iso/syslinux/syslinux.cfg
diff --git a/syslinux/tuxOS_iso_head.cfg b/iso/syslinux/tuxOS_iso_head.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_head.cfg
rename to iso/syslinux/tuxOS_iso_head.cfg
diff --git a/syslinux/tuxOS_iso_pxe-linux.cfg b/iso/syslinux/tuxOS_iso_pxe-linux.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_pxe-linux.cfg
rename to iso/syslinux/tuxOS_iso_pxe-linux.cfg
diff --git a/syslinux/tuxOS_iso_pxe.cfg b/iso/syslinux/tuxOS_iso_pxe.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_pxe.cfg
rename to iso/syslinux/tuxOS_iso_pxe.cfg
diff --git a/syslinux/tuxOS_iso_sys-linux.cfg b/iso/syslinux/tuxOS_iso_sys-linux.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_sys-linux.cfg
rename to iso/syslinux/tuxOS_iso_sys-linux.cfg
diff --git a/syslinux/tuxOS_iso_sys.cfg b/iso/syslinux/tuxOS_iso_sys.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_sys.cfg
rename to iso/syslinux/tuxOS_iso_sys.cfg
diff --git a/syslinux/tuxOS_iso_tail.cfg b/iso/syslinux/tuxOS_iso_tail.cfg
similarity index 100%
rename from syslinux/tuxOS_iso_tail.cfg
rename to iso/syslinux/tuxOS_iso_tail.cfg