diff --git a/.linux_items/include/syslinux/splash.png b/docs/TODO
similarity index 100%
rename from .linux_items/include/syslinux/splash.png
rename to docs/TODO
diff --git a/Images/ConEmu.png b/images/ConEmu.png
similarity index 100%
rename from Images/ConEmu.png
rename to images/ConEmu.png
diff --git a/Images/Linux.png b/images/Linux.png
similarity index 100%
rename from Images/Linux.png
rename to images/Linux.png
diff --git a/Images/Pxelinux.png b/images/Pxelinux.png
similarity index 100%
rename from Images/Pxelinux.png
rename to images/Pxelinux.png
diff --git a/Images/Syslinux.png b/images/Syslinux.png
similarity index 100%
rename from Images/Syslinux.png
rename to images/Syslinux.png
diff --git a/Images/WinPE.jpg b/images/WinPE.jpg
similarity index 100%
rename from Images/WinPE.jpg
rename to images/WinPE.jpg
diff --git a/Images/WizardHat.xcf b/images/WizardHat.xcf
similarity index 100%
rename from Images/WizardHat.xcf
rename to images/WizardHat.xcf
diff --git a/Images/logo.svg b/images/logo.svg
similarity index 100%
rename from Images/logo.svg
rename to images/logo.svg
diff --git a/Images/rEFInd.png b/images/rEFInd.png
similarity index 100%
rename from Images/rEFInd.png
rename to images/rEFInd.png
diff --git a/.bin/Scripts/Copy WizardKit.cmd b/scripts/Copy WizardKit.cmd
similarity index 100%
rename from .bin/Scripts/Copy WizardKit.cmd
rename to scripts/Copy WizardKit.cmd
diff --git a/.bin/Scripts/Launch.cmd b/scripts/Launch.cmd
similarity index 100%
rename from .bin/Scripts/Launch.cmd
rename to scripts/Launch.cmd
diff --git a/.bin/Scripts/Launcher_Template.cmd b/scripts/Launcher_Template.cmd
similarity index 100%
rename from .bin/Scripts/Launcher_Template.cmd
rename to scripts/Launcher_Template.cmd
diff --git a/.bin/Scripts/add-known-networks b/scripts/add-known-networks
similarity index 100%
rename from .bin/Scripts/add-known-networks
rename to scripts/add-known-networks
diff --git a/.bin/Scripts/apple-fans b/scripts/apple-fans
similarity index 100%
rename from .bin/Scripts/apple-fans
rename to scripts/apple-fans
diff --git a/.bin/Scripts/borrowed/acpi.py b/scripts/borrowed/acpi.py
similarity index 100%
rename from .bin/Scripts/borrowed/acpi.py
rename to scripts/borrowed/acpi.py
diff --git a/.bin/Scripts/borrowed/knownpaths-LICENSE.txt b/scripts/borrowed/knownpaths-LICENSE.txt
similarity index 100%
rename from .bin/Scripts/borrowed/knownpaths-LICENSE.txt
rename to scripts/borrowed/knownpaths-LICENSE.txt
diff --git a/.bin/Scripts/borrowed/knownpaths.py b/scripts/borrowed/knownpaths.py
similarity index 100%
rename from .bin/Scripts/borrowed/knownpaths.py
rename to scripts/borrowed/knownpaths.py
diff --git a/.bin/Scripts/borrowed/set-eol.ps1 b/scripts/borrowed/set-eol.ps1
similarity index 100%
rename from .bin/Scripts/borrowed/set-eol.ps1
rename to scripts/borrowed/set-eol.ps1
diff --git a/.bin/Scripts/build_kit.ps1 b/scripts/build_kit.ps1
similarity index 100%
rename from .bin/Scripts/build_kit.ps1
rename to scripts/build_kit.ps1
diff --git a/.bin/Scripts/build_pe.ps1 b/scripts/build_pe.ps1
similarity index 100%
rename from .bin/Scripts/build_pe.ps1
rename to scripts/build_pe.ps1
diff --git a/.bin/Scripts/echo-and-hold b/scripts/echo-and-hold
similarity index 100%
rename from .bin/Scripts/echo-and-hold
rename to scripts/echo-and-hold
diff --git a/.bin/Scripts/init_client_dir.cmd b/scripts/init_client_dir.cmd
similarity index 100%
rename from .bin/Scripts/init_client_dir.cmd
rename to scripts/init_client_dir.cmd
diff --git a/.bin/Scripts/launch-in-tmux b/scripts/launch-in-tmux
similarity index 100%
rename from .bin/Scripts/launch-in-tmux
rename to scripts/launch-in-tmux
diff --git a/.bin/Scripts/mount-raw-image b/scripts/mount-raw-image
similarity index 100%
rename from .bin/Scripts/mount-raw-image
rename to scripts/mount-raw-image
diff --git a/.bin/Scripts/msword-search b/scripts/msword-search
similarity index 100%
rename from .bin/Scripts/msword-search
rename to scripts/msword-search
diff --git a/.bin/Scripts/activate.py b/scripts/outer_scripts_to_review/activate.py
similarity index 100%
rename from .bin/Scripts/activate.py
rename to scripts/outer_scripts_to_review/activate.py
diff --git a/.bin/Scripts/build-ufd b/scripts/outer_scripts_to_review/build-ufd
similarity index 100%
rename from .bin/Scripts/build-ufd
rename to scripts/outer_scripts_to_review/build-ufd
diff --git a/.bin/Scripts/cbs_fix.py b/scripts/outer_scripts_to_review/cbs_fix.py
similarity index 100%
rename from .bin/Scripts/cbs_fix.py
rename to scripts/outer_scripts_to_review/cbs_fix.py
diff --git a/.bin/Scripts/check_disk.py b/scripts/outer_scripts_to_review/check_disk.py
similarity index 100%
rename from .bin/Scripts/check_disk.py
rename to scripts/outer_scripts_to_review/check_disk.py
diff --git a/.bin/Scripts/ddrescue-tui b/scripts/outer_scripts_to_review/ddrescue-tui
similarity index 100%
rename from .bin/Scripts/ddrescue-tui
rename to scripts/outer_scripts_to_review/ddrescue-tui
diff --git a/.bin/Scripts/ddrescue-tui-menu b/scripts/outer_scripts_to_review/ddrescue-tui-menu
similarity index 100%
rename from .bin/Scripts/ddrescue-tui-menu
rename to scripts/outer_scripts_to_review/ddrescue-tui-menu
diff --git a/.bin/Scripts/dism.py b/scripts/outer_scripts_to_review/dism.py
similarity index 100%
rename from .bin/Scripts/dism.py
rename to scripts/outer_scripts_to_review/dism.py
diff --git a/.bin/Scripts/hw-diags b/scripts/outer_scripts_to_review/hw-diags
similarity index 100%
rename from .bin/Scripts/hw-diags
rename to scripts/outer_scripts_to_review/hw-diags
diff --git a/.bin/Scripts/hw-diags-audio b/scripts/outer_scripts_to_review/hw-diags-audio
similarity index 100%
rename from .bin/Scripts/hw-diags-audio
rename to scripts/outer_scripts_to_review/hw-diags-audio
diff --git a/.bin/Scripts/hw-diags-iobenchmark b/scripts/outer_scripts_to_review/hw-diags-iobenchmark
similarity index 100%
rename from .bin/Scripts/hw-diags-iobenchmark
rename to scripts/outer_scripts_to_review/hw-diags-iobenchmark
diff --git a/.bin/Scripts/hw-diags-menu b/scripts/outer_scripts_to_review/hw-diags-menu
similarity index 100%
rename from .bin/Scripts/hw-diags-menu
rename to scripts/outer_scripts_to_review/hw-diags-menu
diff --git a/.bin/Scripts/hw-diags-network b/scripts/outer_scripts_to_review/hw-diags-network
similarity index 100%
rename from .bin/Scripts/hw-diags-network
rename to scripts/outer_scripts_to_review/hw-diags-network
diff --git a/.bin/Scripts/hw-diags-prime95 b/scripts/outer_scripts_to_review/hw-diags-prime95
similarity index 100%
rename from .bin/Scripts/hw-diags-prime95
rename to scripts/outer_scripts_to_review/hw-diags-prime95
diff --git a/.bin/Scripts/hw-drive-info b/scripts/outer_scripts_to_review/hw-drive-info
similarity index 100%
rename from .bin/Scripts/hw-drive-info
rename to scripts/outer_scripts_to_review/hw-drive-info
diff --git a/.bin/Scripts/hw-info b/scripts/outer_scripts_to_review/hw-info
similarity index 100%
rename from .bin/Scripts/hw-info
rename to scripts/outer_scripts_to_review/hw-info
diff --git a/.bin/Scripts/hw-sensors b/scripts/outer_scripts_to_review/hw-sensors
similarity index 100%
rename from .bin/Scripts/hw-sensors
rename to scripts/outer_scripts_to_review/hw-sensors
diff --git a/.bin/Scripts/hw-sensors-monitor b/scripts/outer_scripts_to_review/hw-sensors-monitor
similarity index 100%
rename from .bin/Scripts/hw-sensors-monitor
rename to scripts/outer_scripts_to_review/hw-sensors-monitor
diff --git a/.bin/Scripts/install_sw_bundle.py b/scripts/outer_scripts_to_review/install_sw_bundle.py
similarity index 100%
rename from .bin/Scripts/install_sw_bundle.py
rename to scripts/outer_scripts_to_review/install_sw_bundle.py
diff --git a/.bin/Scripts/install_vcredists.py b/scripts/outer_scripts_to_review/install_vcredists.py
similarity index 100%
rename from .bin/Scripts/install_vcredists.py
rename to scripts/outer_scripts_to_review/install_vcredists.py
diff --git a/.bin/Scripts/mount-all-volumes b/scripts/outer_scripts_to_review/mount-all-volumes
similarity index 100%
rename from .bin/Scripts/mount-all-volumes
rename to scripts/outer_scripts_to_review/mount-all-volumes
diff --git a/.bin/Scripts/mount-backup-shares b/scripts/outer_scripts_to_review/mount-backup-shares
similarity index 100%
rename from .bin/Scripts/mount-backup-shares
rename to scripts/outer_scripts_to_review/mount-backup-shares
diff --git a/.bin/Scripts/safemode_enter.py b/scripts/outer_scripts_to_review/safemode_enter.py
similarity index 100%
rename from .bin/Scripts/safemode_enter.py
rename to scripts/outer_scripts_to_review/safemode_enter.py
diff --git a/.bin/Scripts/safemode_exit.py b/scripts/outer_scripts_to_review/safemode_exit.py
similarity index 100%
rename from .bin/Scripts/safemode_exit.py
rename to scripts/outer_scripts_to_review/safemode_exit.py
diff --git a/.bin/Scripts/sfc_scan.py b/scripts/outer_scripts_to_review/sfc_scan.py
similarity index 100%
rename from .bin/Scripts/sfc_scan.py
rename to scripts/outer_scripts_to_review/sfc_scan.py
diff --git a/.bin/Scripts/system_diagnostics.py b/scripts/outer_scripts_to_review/system_diagnostics.py
similarity index 100%
rename from .bin/Scripts/system_diagnostics.py
rename to scripts/outer_scripts_to_review/system_diagnostics.py
diff --git a/.bin/Scripts/system_setup.py b/scripts/outer_scripts_to_review/system_setup.py
similarity index 100%
rename from .bin/Scripts/system_setup.py
rename to scripts/outer_scripts_to_review/system_setup.py
diff --git a/.bin/Scripts/transferred_keys.py b/scripts/outer_scripts_to_review/transferred_keys.py
similarity index 100%
rename from .bin/Scripts/transferred_keys.py
rename to scripts/outer_scripts_to_review/transferred_keys.py
diff --git a/.bin/Scripts/update_kit.py b/scripts/outer_scripts_to_review/update_kit.py
similarity index 100%
rename from .bin/Scripts/update_kit.py
rename to scripts/outer_scripts_to_review/update_kit.py
diff --git a/.bin/Scripts/user_data_transfer.py b/scripts/outer_scripts_to_review/user_data_transfer.py
similarity index 100%
rename from .bin/Scripts/user_data_transfer.py
rename to scripts/outer_scripts_to_review/user_data_transfer.py
diff --git a/.bin/Scripts/windows_updates.py b/scripts/outer_scripts_to_review/windows_updates.py
similarity index 100%
rename from .bin/Scripts/windows_updates.py
rename to scripts/outer_scripts_to_review/windows_updates.py
diff --git a/.bin/Scripts/winpe_root_menu.py b/scripts/outer_scripts_to_review/winpe_root_menu.py
similarity index 100%
rename from .bin/Scripts/winpe_root_menu.py
rename to scripts/outer_scripts_to_review/winpe_root_menu.py
diff --git a/.bin/Scripts/pacinit b/scripts/pacinit
similarity index 100%
rename from .bin/Scripts/pacinit
rename to scripts/pacinit
diff --git a/.bin/Scripts/photorec-sort b/scripts/photorec-sort
similarity index 100%
rename from .bin/Scripts/photorec-sort
rename to scripts/photorec-sort
diff --git a/.bin/Scripts/remount-rw b/scripts/remount-rw
similarity index 100%
rename from .bin/Scripts/remount-rw
rename to scripts/remount-rw
diff --git a/.bin/Scripts/wk-power-command b/scripts/wk-power-command
similarity index 100%
rename from .bin/Scripts/wk-power-command
rename to scripts/wk-power-command
diff --git a/.bin/Scripts/debug/hw_diags.py b/scripts/wk.prev/debug/hw_diags.py
similarity index 100%
rename from .bin/Scripts/debug/hw_diags.py
rename to scripts/wk.prev/debug/hw_diags.py
diff --git a/.bin/Scripts/functions/activation.py b/scripts/wk.prev/functions/activation.py
similarity index 100%
rename from .bin/Scripts/functions/activation.py
rename to scripts/wk.prev/functions/activation.py
diff --git a/.bin/Scripts/functions/backup.py b/scripts/wk.prev/functions/backup.py
similarity index 100%
rename from .bin/Scripts/functions/backup.py
rename to scripts/wk.prev/functions/backup.py
diff --git a/.bin/Scripts/functions/browsers.py b/scripts/wk.prev/functions/browsers.py
similarity index 100%
rename from .bin/Scripts/functions/browsers.py
rename to scripts/wk.prev/functions/browsers.py
diff --git a/.bin/Scripts/functions/cleanup.py b/scripts/wk.prev/functions/cleanup.py
similarity index 100%
rename from .bin/Scripts/functions/cleanup.py
rename to scripts/wk.prev/functions/cleanup.py
diff --git a/.bin/Scripts/functions/common.py b/scripts/wk.prev/functions/common.py
similarity index 100%
rename from .bin/Scripts/functions/common.py
rename to scripts/wk.prev/functions/common.py
diff --git a/.bin/Scripts/functions/data.py b/scripts/wk.prev/functions/data.py
similarity index 100%
rename from .bin/Scripts/functions/data.py
rename to scripts/wk.prev/functions/data.py
diff --git a/.bin/Scripts/functions/ddrescue.py b/scripts/wk.prev/functions/ddrescue.py
similarity index 100%
rename from .bin/Scripts/functions/ddrescue.py
rename to scripts/wk.prev/functions/ddrescue.py
diff --git a/.bin/Scripts/functions/disk.py b/scripts/wk.prev/functions/disk.py
similarity index 100%
rename from .bin/Scripts/functions/disk.py
rename to scripts/wk.prev/functions/disk.py
diff --git a/.bin/Scripts/functions/hw_diags.py b/scripts/wk.prev/functions/hw_diags.py
similarity index 100%
rename from .bin/Scripts/functions/hw_diags.py
rename to scripts/wk.prev/functions/hw_diags.py
diff --git a/.bin/Scripts/functions/info.py b/scripts/wk.prev/functions/info.py
similarity index 100%
rename from .bin/Scripts/functions/info.py
rename to scripts/wk.prev/functions/info.py
diff --git a/.bin/Scripts/functions/json.py b/scripts/wk.prev/functions/json.py
similarity index 100%
rename from .bin/Scripts/functions/json.py
rename to scripts/wk.prev/functions/json.py
diff --git a/.bin/Scripts/functions/network.py b/scripts/wk.prev/functions/network.py
similarity index 100%
rename from .bin/Scripts/functions/network.py
rename to scripts/wk.prev/functions/network.py
diff --git a/.bin/Scripts/functions/product_keys.py b/scripts/wk.prev/functions/product_keys.py
similarity index 100%
rename from .bin/Scripts/functions/product_keys.py
rename to scripts/wk.prev/functions/product_keys.py
diff --git a/.bin/Scripts/functions/repairs.py b/scripts/wk.prev/functions/repairs.py
similarity index 100%
rename from .bin/Scripts/functions/repairs.py
rename to scripts/wk.prev/functions/repairs.py
diff --git a/.bin/Scripts/functions/safemode.py b/scripts/wk.prev/functions/safemode.py
similarity index 100%
rename from .bin/Scripts/functions/safemode.py
rename to scripts/wk.prev/functions/safemode.py
diff --git a/.bin/Scripts/functions/sensors.py b/scripts/wk.prev/functions/sensors.py
similarity index 100%
rename from .bin/Scripts/functions/sensors.py
rename to scripts/wk.prev/functions/sensors.py
diff --git a/.bin/Scripts/functions/setup.py b/scripts/wk.prev/functions/setup.py
similarity index 100%
rename from .bin/Scripts/functions/setup.py
rename to scripts/wk.prev/functions/setup.py
diff --git a/.bin/Scripts/functions/sw_diags.py b/scripts/wk.prev/functions/sw_diags.py
similarity index 100%
rename from .bin/Scripts/functions/sw_diags.py
rename to scripts/wk.prev/functions/sw_diags.py
diff --git a/.bin/Scripts/functions/threading.py b/scripts/wk.prev/functions/threading.py
similarity index 100%
rename from .bin/Scripts/functions/threading.py
rename to scripts/wk.prev/functions/threading.py
diff --git a/.bin/Scripts/functions/tmux.py b/scripts/wk.prev/functions/tmux.py
similarity index 100%
rename from .bin/Scripts/functions/tmux.py
rename to scripts/wk.prev/functions/tmux.py
diff --git a/.bin/Scripts/functions/ufd.py b/scripts/wk.prev/functions/ufd.py
similarity index 100%
rename from .bin/Scripts/functions/ufd.py
rename to scripts/wk.prev/functions/ufd.py
diff --git a/.bin/Scripts/functions/update.py b/scripts/wk.prev/functions/update.py
similarity index 100%
rename from .bin/Scripts/functions/update.py
rename to scripts/wk.prev/functions/update.py
diff --git a/.bin/Scripts/functions/windows_setup.py b/scripts/wk.prev/functions/windows_setup.py
similarity index 100%
rename from .bin/Scripts/functions/windows_setup.py
rename to scripts/wk.prev/functions/windows_setup.py
diff --git a/.bin/Scripts/functions/windows_updates.py b/scripts/wk.prev/functions/windows_updates.py
similarity index 100%
rename from .bin/Scripts/functions/windows_updates.py
rename to scripts/wk.prev/functions/windows_updates.py
diff --git a/.bin/Scripts/functions/winpe_menus.py b/scripts/wk.prev/functions/winpe_menus.py
similarity index 100%
rename from .bin/Scripts/functions/winpe_menus.py
rename to scripts/wk.prev/functions/winpe_menus.py
diff --git a/.bin/Scripts/settings/browsers.py b/scripts/wk.prev/settings/browsers.py
similarity index 100%
rename from .bin/Scripts/settings/browsers.py
rename to scripts/wk.prev/settings/browsers.py
diff --git a/.bin/Scripts/settings/cleanup.py b/scripts/wk.prev/settings/cleanup.py
similarity index 100%
rename from .bin/Scripts/settings/cleanup.py
rename to scripts/wk.prev/settings/cleanup.py
diff --git a/.bin/Scripts/settings/data.py b/scripts/wk.prev/settings/data.py
similarity index 100%
rename from .bin/Scripts/settings/data.py
rename to scripts/wk.prev/settings/data.py
diff --git a/.bin/Scripts/settings/ddrescue.py b/scripts/wk.prev/settings/ddrescue.py
similarity index 100%
rename from .bin/Scripts/settings/ddrescue.py
rename to scripts/wk.prev/settings/ddrescue.py
diff --git a/.bin/Scripts/settings/hw_diags.py b/scripts/wk.prev/settings/hw_diags.py
similarity index 100%
rename from .bin/Scripts/settings/hw_diags.py
rename to scripts/wk.prev/settings/hw_diags.py
diff --git a/.bin/Scripts/settings/info.py b/scripts/wk.prev/settings/info.py
similarity index 100%
rename from .bin/Scripts/settings/info.py
rename to scripts/wk.prev/settings/info.py
diff --git a/.bin/Scripts/settings/launchers.py b/scripts/wk.prev/settings/launchers.py
similarity index 100%
rename from .bin/Scripts/settings/launchers.py
rename to scripts/wk.prev/settings/launchers.py
diff --git a/.bin/Scripts/settings/main.py b/scripts/wk.prev/settings/main.py
similarity index 100%
rename from .bin/Scripts/settings/main.py
rename to scripts/wk.prev/settings/main.py
diff --git a/.bin/Scripts/settings/music.py b/scripts/wk.prev/settings/music.py
similarity index 100%
rename from .bin/Scripts/settings/music.py
rename to scripts/wk.prev/settings/music.py
diff --git a/.bin/Scripts/settings/partition_uids.py b/scripts/wk.prev/settings/partition_uids.py
similarity index 100%
rename from .bin/Scripts/settings/partition_uids.py
rename to scripts/wk.prev/settings/partition_uids.py
diff --git a/.bin/Scripts/settings/sensors.py b/scripts/wk.prev/settings/sensors.py
similarity index 100%
rename from .bin/Scripts/settings/sensors.py
rename to scripts/wk.prev/settings/sensors.py
diff --git a/.bin/Scripts/settings/setup.py b/scripts/wk.prev/settings/setup.py
similarity index 100%
rename from .bin/Scripts/settings/setup.py
rename to scripts/wk.prev/settings/setup.py
diff --git a/.bin/Scripts/settings/sources.py b/scripts/wk.prev/settings/sources.py
similarity index 100%
rename from .bin/Scripts/settings/sources.py
rename to scripts/wk.prev/settings/sources.py
diff --git a/.bin/Scripts/settings/sw_diags.py b/scripts/wk.prev/settings/sw_diags.py
similarity index 100%
rename from .bin/Scripts/settings/sw_diags.py
rename to scripts/wk.prev/settings/sw_diags.py
diff --git a/.bin/Scripts/settings/tools.py b/scripts/wk.prev/settings/tools.py
similarity index 100%
rename from .bin/Scripts/settings/tools.py
rename to scripts/wk.prev/settings/tools.py
diff --git a/.bin/Scripts/settings/ufd.py b/scripts/wk.prev/settings/ufd.py
similarity index 100%
rename from .bin/Scripts/settings/ufd.py
rename to scripts/wk.prev/settings/ufd.py
diff --git a/.bin/Scripts/settings/windows_builds.py b/scripts/wk.prev/settings/windows_builds.py
similarity index 100%
rename from .bin/Scripts/settings/windows_builds.py
rename to scripts/wk.prev/settings/windows_builds.py
diff --git a/.bin/Scripts/settings/windows_setup.py b/scripts/wk.prev/settings/windows_setup.py
similarity index 100%
rename from .bin/Scripts/settings/windows_setup.py
rename to scripts/wk.prev/settings/windows_setup.py
diff --git a/.bin/Scripts/settings/winpe.py b/scripts/wk.prev/settings/winpe.py
similarity index 100%
rename from .bin/Scripts/settings/winpe.py
rename to scripts/wk.prev/settings/winpe.py
diff --git a/.linux_items/include_x/airootfs/etc/skel/.Xauthority b/scripts/wk/exe.py
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.Xauthority
rename to scripts/wk/exe.py
diff --git a/scripts/wk/io.py b/scripts/wk/io.py
new file mode 100644
index 00000000..e69de29b
diff --git a/scripts/wk/net.py b/scripts/wk/net.py
new file mode 100644
index 00000000..e69de29b
diff --git a/scripts/wk/std.py b/scripts/wk/std.py
new file mode 100644
index 00000000..e69de29b
diff --git a/Build Linux b/setup/build_linux
similarity index 100%
rename from Build Linux
rename to setup/build_linux
diff --git a/Build PE.cmd b/setup/build_pe.cmd
similarity index 100%
rename from Build PE.cmd
rename to setup/build_pe.cmd
diff --git a/Build Kit.cmd b/setup/build_windows.cmd
similarity index 100%
rename from Build Kit.cmd
rename to setup/build_windows.cmd
diff --git a/.linux_items/authorized_keys b/setup/linux/authorized_keys
similarity index 100%
rename from .linux_items/authorized_keys
rename to setup/linux/authorized_keys
diff --git a/.linux_items/build_additions.txt b/setup/linux/build_additions.txt
similarity index 100%
rename from .linux_items/build_additions.txt
rename to setup/linux/build_additions.txt
diff --git a/.linux_items/include/EFI/boot/icons/dgpu.png b/setup/linux/include/EFI/boot/icons/dgpu.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/dgpu.png
rename to setup/linux/include/EFI/boot/icons/dgpu.png
diff --git a/.linux_items/include/EFI/boot/icons/wk_arch.png b/setup/linux/include/EFI/boot/icons/wk_arch.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/wk_arch.png
rename to setup/linux/include/EFI/boot/icons/wk_arch.png
diff --git a/.linux_items/include/EFI/boot/icons/wk_memtest.png b/setup/linux/include/EFI/boot/icons/wk_memtest.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/wk_memtest.png
rename to setup/linux/include/EFI/boot/icons/wk_memtest.png
diff --git a/.linux_items/include/EFI/boot/icons/wk_win.png b/setup/linux/include/EFI/boot/icons/wk_win.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/wk_win.png
rename to setup/linux/include/EFI/boot/icons/wk_win.png
diff --git a/.linux_items/include/EFI/boot/refind.conf b/setup/linux/include/EFI/boot/refind.conf
similarity index 100%
rename from .linux_items/include/EFI/boot/refind.conf
rename to setup/linux/include/EFI/boot/refind.conf
diff --git a/.linux_items/include/EFI/boot/selection_big.png b/setup/linux/include/EFI/boot/selection_big.png
similarity index 100%
rename from .linux_items/include/EFI/boot/selection_big.png
rename to setup/linux/include/EFI/boot/selection_big.png
diff --git a/.linux_items/include/EFI/boot/selection_small.png b/setup/linux/include/EFI/boot/selection_small.png
similarity index 100%
rename from .linux_items/include/EFI/boot/selection_small.png
rename to setup/linux/include/EFI/boot/selection_small.png
diff --git a/.linux_items/include/airootfs/etc/default/ufw b/setup/linux/include/airootfs/etc/default/ufw
similarity index 100%
rename from .linux_items/include/airootfs/etc/default/ufw
rename to setup/linux/include/airootfs/etc/default/ufw
diff --git a/.linux_items/include/airootfs/etc/hostname b/setup/linux/include/airootfs/etc/hostname
similarity index 100%
rename from .linux_items/include/airootfs/etc/hostname
rename to setup/linux/include/airootfs/etc/hostname
diff --git a/.linux_items/include/airootfs/etc/hosts b/setup/linux/include/airootfs/etc/hosts
similarity index 100%
rename from .linux_items/include/airootfs/etc/hosts
rename to setup/linux/include/airootfs/etc/hosts
diff --git a/.linux_items/include/airootfs/etc/locale.conf b/setup/linux/include/airootfs/etc/locale.conf
similarity index 100%
rename from .linux_items/include/airootfs/etc/locale.conf
rename to setup/linux/include/airootfs/etc/locale.conf
diff --git a/.linux_items/include/airootfs/etc/locale.gen b/setup/linux/include/airootfs/etc/locale.gen
similarity index 100%
rename from .linux_items/include/airootfs/etc/locale.gen
rename to setup/linux/include/airootfs/etc/locale.gen
diff --git a/.linux_items/include/airootfs/etc/motd b/setup/linux/include/airootfs/etc/motd
similarity index 100%
rename from .linux_items/include/airootfs/etc/motd
rename to setup/linux/include/airootfs/etc/motd
diff --git a/.linux_items/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/setup/linux/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
similarity index 100%
rename from .linux_items/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
rename to setup/linux/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
diff --git a/.linux_items/include/airootfs/etc/skel/.aliases b/setup/linux/include/airootfs/etc/skel/.aliases
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.aliases
rename to setup/linux/include/airootfs/etc/skel/.aliases
diff --git a/.linux_items/include/airootfs/etc/skel/.bashrc b/setup/linux/include/airootfs/etc/skel/.bashrc
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.bashrc
rename to setup/linux/include/airootfs/etc/skel/.bashrc
diff --git a/.linux_items/include/airootfs/etc/skel/.dircolors b/setup/linux/include/airootfs/etc/skel/.dircolors
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.dircolors
rename to setup/linux/include/airootfs/etc/skel/.dircolors
diff --git a/.linux_items/include/airootfs/etc/skel/.rsync_exclusions b/setup/linux/include/airootfs/etc/skel/.rsync_exclusions
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.rsync_exclusions
rename to setup/linux/include/airootfs/etc/skel/.rsync_exclusions
diff --git a/.linux_items/include/airootfs/etc/skel/.tmux.conf b/setup/linux/include/airootfs/etc/skel/.tmux.conf
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.tmux.conf
rename to setup/linux/include/airootfs/etc/skel/.tmux.conf
diff --git a/.linux_items/include/airootfs/etc/skel/.update_network b/setup/linux/include/airootfs/etc/skel/.update_network
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.update_network
rename to setup/linux/include/airootfs/etc/skel/.update_network
diff --git a/.linux_items/include/airootfs/etc/skel/.vimrc b/setup/linux/include/airootfs/etc/skel/.vimrc
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.vimrc
rename to setup/linux/include/airootfs/etc/skel/.vimrc
diff --git a/.linux_items/include/airootfs/etc/skel/.zlogin b/setup/linux/include/airootfs/etc/skel/.zlogin
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.zlogin
rename to setup/linux/include/airootfs/etc/skel/.zlogin
diff --git a/.linux_items/include/airootfs/etc/skel/.zshrc b/setup/linux/include/airootfs/etc/skel/.zshrc
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.zshrc
rename to setup/linux/include/airootfs/etc/skel/.zshrc
diff --git a/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
similarity index 100%
rename from .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
rename to setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
diff --git a/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
similarity index 100%
rename from .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
rename to setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
diff --git a/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
similarity index 100%
rename from .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
rename to setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
diff --git a/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service b/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
similarity index 100%
rename from .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
rename to setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
diff --git a/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
similarity index 100%
rename from .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
rename to setup/linux/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
diff --git a/.linux_items/include/airootfs/etc/udev/rules.d/99-udisks2.rules b/setup/linux/include/airootfs/etc/udev/rules.d/99-udisks2.rules
similarity index 100%
rename from .linux_items/include/airootfs/etc/udev/rules.d/99-udisks2.rules
rename to setup/linux/include/airootfs/etc/udev/rules.d/99-udisks2.rules
diff --git a/.linux_items/include/airootfs/etc/udevil/udevil.conf b/setup/linux/include/airootfs/etc/udevil/udevil.conf
similarity index 100%
rename from .linux_items/include/airootfs/etc/udevil/udevil.conf
rename to setup/linux/include/airootfs/etc/udevil/udevil.conf
diff --git a/.linux_items/include/airootfs/etc/ufw/ufw.conf b/setup/linux/include/airootfs/etc/ufw/ufw.conf
similarity index 100%
rename from .linux_items/include/airootfs/etc/ufw/ufw.conf
rename to setup/linux/include/airootfs/etc/ufw/ufw.conf
diff --git a/.linux_items/include/airootfs/etc/ufw/user.rules b/setup/linux/include/airootfs/etc/ufw/user.rules
similarity index 100%
rename from .linux_items/include/airootfs/etc/ufw/user.rules
rename to setup/linux/include/airootfs/etc/ufw/user.rules
diff --git a/.linux_items/include/airootfs/etc/ufw/user6.rules b/setup/linux/include/airootfs/etc/ufw/user6.rules
similarity index 100%
rename from .linux_items/include/airootfs/etc/ufw/user6.rules
rename to setup/linux/include/airootfs/etc/ufw/user6.rules
diff --git a/.linux_items/include/airootfs/etc/vconsole.conf b/setup/linux/include/airootfs/etc/vconsole.conf
similarity index 100%
rename from .linux_items/include/airootfs/etc/vconsole.conf
rename to setup/linux/include/airootfs/etc/vconsole.conf
diff --git a/.linux_items/include/isolinux/isolinux.cfg b/setup/linux/include/isolinux/isolinux.cfg
similarity index 100%
rename from .linux_items/include/isolinux/isolinux.cfg
rename to setup/linux/include/isolinux/isolinux.cfg
diff --git a/setup/linux/include/syslinux/splash.png b/setup/linux/include/syslinux/splash.png
new file mode 100644
index 00000000..e69de29b
diff --git a/.linux_items/include/syslinux/syslinux.cfg b/setup/linux/include/syslinux/syslinux.cfg
similarity index 100%
rename from .linux_items/include/syslinux/syslinux.cfg
rename to setup/linux/include/syslinux/syslinux.cfg
diff --git a/.linux_items/include/syslinux/wk.cfg b/setup/linux/include/syslinux/wk.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk.cfg
rename to setup/linux/include/syslinux/wk.cfg
diff --git a/.linux_items/include/syslinux/wk_hdt.cfg b/setup/linux/include/syslinux/wk_hdt.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_hdt.cfg
rename to setup/linux/include/syslinux/wk_hdt.cfg
diff --git a/.linux_items/include/syslinux/wk_head.cfg b/setup/linux/include/syslinux/wk_head.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_head.cfg
rename to setup/linux/include/syslinux/wk_head.cfg
diff --git a/.linux_items/include/syslinux/wk_iso.cfg b/setup/linux/include/syslinux/wk_iso.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_iso.cfg
rename to setup/linux/include/syslinux/wk_iso.cfg
diff --git a/.linux_items/include/syslinux/wk_iso_linux.cfg b/setup/linux/include/syslinux/wk_iso_linux.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_iso_linux.cfg
rename to setup/linux/include/syslinux/wk_iso_linux.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/setup/linux/include/syslinux/wk_pxe.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_pxe.cfg
rename to setup/linux/include/syslinux/wk_pxe.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe_linux.cfg b/setup/linux/include/syslinux/wk_pxe_linux.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_pxe_linux.cfg
rename to setup/linux/include/syslinux/wk_pxe_linux.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe_winpe.cfg b/setup/linux/include/syslinux/wk_pxe_winpe.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_pxe_winpe.cfg
rename to setup/linux/include/syslinux/wk_pxe_winpe.cfg
diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/setup/linux/include/syslinux/wk_sys.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_sys.cfg
rename to setup/linux/include/syslinux/wk_sys.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/setup/linux/include/syslinux/wk_sys_linux.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_sys_linux.cfg
rename to setup/linux/include/syslinux/wk_sys_linux.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_winpe.cfg b/setup/linux/include/syslinux/wk_sys_winpe.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_sys_winpe.cfg
rename to setup/linux/include/syslinux/wk_sys_winpe.cfg
diff --git a/.linux_items/include/syslinux/wk_tail.cfg b/setup/linux/include/syslinux/wk_tail.cfg
similarity index 100%
rename from .linux_items/include/syslinux/wk_tail.cfg
rename to setup/linux/include/syslinux/wk_tail.cfg
diff --git a/.linux_items/include_x/airootfs/etc/oblogout.conf b/setup/linux/include_x/airootfs/etc/oblogout.conf
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/oblogout.conf
rename to setup/linux/include_x/airootfs/etc/oblogout.conf
diff --git a/setup/linux/include_x/airootfs/etc/skel/.Xauthority b/setup/linux/include_x/airootfs/etc/skel/.Xauthority
new file mode 100644
index 00000000..e69de29b
diff --git a/.linux_items/include_x/airootfs/etc/skel/.Xresources b/setup/linux/include_x/airootfs/etc/skel/.Xresources
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.Xresources
rename to setup/linux/include_x/airootfs/etc/skel/.Xresources
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/Thunar/accels.scm b/setup/linux/include_x/airootfs/etc/skel/.config/Thunar/accels.scm
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/Thunar/accels.scm
rename to setup/linux/include_x/airootfs/etc/skel/.config/Thunar/accels.scm
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/Thunar/uca.xml b/setup/linux/include_x/airootfs/etc/skel/.config/Thunar/uca.xml
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/Thunar/uca.xml
rename to setup/linux/include_x/airootfs/etc/skel/.config/Thunar/uca.xml
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/dunst/dunstrc b/setup/linux/include_x/airootfs/etc/skel/.config/dunst/dunstrc
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/dunst/dunstrc
rename to setup/linux/include_x/airootfs/etc/skel/.config/dunst/dunstrc
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/setup/linux/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini
rename to setup/linux/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/i3/config b/setup/linux/include_x/airootfs/etc/skel/.config/i3/config
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/i3/config
rename to setup/linux/include_x/airootfs/etc/skel/.config/i3/config
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/i3status/config b/setup/linux/include_x/airootfs/etc/skel/.config/i3status/config
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/i3status/config
rename to setup/linux/include_x/airootfs/etc/skel/.config/i3status/config
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/mimeapps.list b/setup/linux/include_x/airootfs/etc/skel/.config/mimeapps.list
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/mimeapps.list
rename to setup/linux/include_x/airootfs/etc/skel/.config/mimeapps.list
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/openbox/autostart b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/autostart
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/openbox/autostart
rename to setup/linux/include_x/airootfs/etc/skel/.config/openbox/autostart
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/openbox/environment b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/environment
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/openbox/environment
rename to setup/linux/include_x/airootfs/etc/skel/.config/openbox/environment
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/openbox/menu.xml b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/openbox/menu.xml
rename to setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/openbox/rc.xml b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/openbox/rc.xml
rename to setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/rofi/config b/setup/linux/include_x/airootfs/etc/skel/.config/rofi/config
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/rofi/config
rename to setup/linux/include_x/airootfs/etc/skel/.config/rofi/config
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer b/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
rename to setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service b/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service
rename to setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer b/setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer
rename to setup/linux/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/tint2/tint2rc b/setup/linux/include_x/airootfs/etc/skel/.config/tint2/tint2rc
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/tint2/tint2rc
rename to setup/linux/include_x/airootfs/etc/skel/.config/tint2/tint2rc
diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon b/setup/linux/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon
rename to setup/linux/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon
diff --git a/.linux_items/include_x/airootfs/etc/skel/.conky_start b/setup/linux/include_x/airootfs/etc/skel/.conky_start
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.conky_start
rename to setup/linux/include_x/airootfs/etc/skel/.conky_start
diff --git a/.linux_items/include_x/airootfs/etc/skel/.conkyrc_base b/setup/linux/include_x/airootfs/etc/skel/.conkyrc_base
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.conkyrc_base
rename to setup/linux/include_x/airootfs/etc/skel/.conkyrc_base
diff --git a/.linux_items/include_x/airootfs/etc/skel/.gtkrc-2.0 b/setup/linux/include_x/airootfs/etc/skel/.gtkrc-2.0
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.gtkrc-2.0
rename to setup/linux/include_x/airootfs/etc/skel/.gtkrc-2.0
diff --git a/.linux_items/include_x/airootfs/etc/skel/.start_desktop_apps b/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.start_desktop_apps
rename to setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
diff --git a/.linux_items/include_x/airootfs/etc/skel/.update_conky b/setup/linux/include_x/airootfs/etc/skel/.update_conky
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.update_conky
rename to setup/linux/include_x/airootfs/etc/skel/.update_conky
diff --git a/.linux_items/include_x/airootfs/etc/skel/.update_x b/setup/linux/include_x/airootfs/etc/skel/.update_x
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.update_x
rename to setup/linux/include_x/airootfs/etc/skel/.update_x
diff --git a/.linux_items/include_x/airootfs/etc/skel/.wallpaper b/setup/linux/include_x/airootfs/etc/skel/.wallpaper
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.wallpaper
rename to setup/linux/include_x/airootfs/etc/skel/.wallpaper
diff --git a/.linux_items/include_x/airootfs/etc/skel/.xinitrc b/setup/linux/include_x/airootfs/etc/skel/.xinitrc
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.xinitrc
rename to setup/linux/include_x/airootfs/etc/skel/.xinitrc
diff --git a/.linux_items/include_x/airootfs/etc/skel/.zlogin b/setup/linux/include_x/airootfs/etc/skel/.zlogin
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.zlogin
rename to setup/linux/include_x/airootfs/etc/skel/.zlogin
diff --git a/.linux_items/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/setup/linux/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop
rename to setup/linux/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop
diff --git a/.linux_items/include_x/airootfs/usr/share/applications/Hardware Information.desktop b/setup/linux/include_x/airootfs/usr/share/applications/Hardware Information.desktop
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/applications/Hardware Information.desktop
rename to setup/linux/include_x/airootfs/usr/share/applications/Hardware Information.desktop
diff --git a/.linux_items/include_x/airootfs/usr/share/applications/NetworkTest.desktop b/setup/linux/include_x/airootfs/usr/share/applications/NetworkTest.desktop
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/applications/NetworkTest.desktop
rename to setup/linux/include_x/airootfs/usr/share/applications/NetworkTest.desktop
diff --git a/.linux_items/known_networks b/setup/linux/known_networks
similarity index 100%
rename from .linux_items/known_networks
rename to setup/linux/known_networks
diff --git a/.linux_items/packages/aur b/setup/linux/packages/aur
similarity index 100%
rename from .linux_items/packages/aur
rename to setup/linux/packages/aur
diff --git a/.linux_items/packages/dependencies b/setup/linux/packages/dependencies
similarity index 100%
rename from .linux_items/packages/dependencies
rename to setup/linux/packages/dependencies
diff --git a/.linux_items/packages/live_add b/setup/linux/packages/live_add
similarity index 100%
rename from .linux_items/packages/live_add
rename to setup/linux/packages/live_add
diff --git a/.linux_items/packages/live_add_min b/setup/linux/packages/live_add_min
similarity index 100%
rename from .linux_items/packages/live_add_min
rename to setup/linux/packages/live_add_min
diff --git a/.linux_items/packages/live_add_x b/setup/linux/packages/live_add_x
similarity index 100%
rename from .linux_items/packages/live_add_x
rename to setup/linux/packages/live_add_x
diff --git a/.linux_items/packages/live_remove b/setup/linux/packages/live_remove
similarity index 100%
rename from .linux_items/packages/live_remove
rename to setup/linux/packages/live_remove
diff --git a/.pe_items/System32/Winpeshl.ini b/setup/pe/System32/Winpeshl.ini
similarity index 100%
rename from .pe_items/System32/Winpeshl.ini
rename to setup/pe/System32/Winpeshl.ini
diff --git a/.pe_items/System32/menu.cmd b/setup/pe/System32/menu.cmd
similarity index 100%
rename from .pe_items/System32/menu.cmd
rename to setup/pe/System32/menu.cmd
diff --git a/.pe_items/_include/CPU-Z/cpuz.ini b/setup/pe/bin/CPU-Z/cpuz.ini
similarity index 100%
rename from .pe_items/_include/CPU-Z/cpuz.ini
rename to setup/pe/bin/CPU-Z/cpuz.ini
diff --git a/.pe_items/_include/ConEmu/ConEmu.xml b/setup/pe/bin/ConEmu/ConEmu.xml
similarity index 100%
rename from .pe_items/_include/ConEmu/ConEmu.xml
rename to setup/pe/bin/ConEmu/ConEmu.xml
diff --git a/.pe_items/_include/HWiNFO/HWiNFO.INI b/setup/pe/bin/HWiNFO/HWiNFO.INI
similarity index 100%
rename from .pe_items/_include/HWiNFO/HWiNFO.INI
rename to setup/pe/bin/HWiNFO/HWiNFO.INI
diff --git a/.pe_items/_include/NotepadPlusPlus/config.xml b/setup/pe/bin/NotepadPlusPlus/config.xml
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/config.xml
rename to setup/pe/bin/NotepadPlusPlus/config.xml
diff --git a/.pe_items/_include/NotepadPlusPlus/npp.cmd b/setup/pe/bin/NotepadPlusPlus/npp.cmd
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/npp.cmd
rename to setup/pe/bin/NotepadPlusPlus/npp.cmd
diff --git a/.pe_items/_include/NotepadPlusPlus/stylers.model.xml b/setup/pe/bin/NotepadPlusPlus/stylers.model.xml
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/stylers.model.xml
rename to setup/pe/bin/NotepadPlusPlus/stylers.model.xml
diff --git a/.pe_items/_include/Q-Dir/Q-Dir.ini b/setup/pe/bin/Q-Dir/Q-Dir.ini
similarity index 100%
rename from .pe_items/_include/Q-Dir/Q-Dir.ini
rename to setup/pe/bin/Q-Dir/Q-Dir.ini
diff --git a/.kit_items/Drivers/Extras/AMD.url b/setup/windows/Drivers/Extras/AMD.url
similarity index 100%
rename from .kit_items/Drivers/Extras/AMD.url
rename to setup/windows/Drivers/Extras/AMD.url
diff --git a/.kit_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url b/setup/windows/Drivers/Extras/Dell (FTP - Browse for Drivers).url
similarity index 100%
rename from .kit_items/Drivers/Extras/Dell (FTP - Browse for Drivers).url
rename to setup/windows/Drivers/Extras/Dell (FTP - Browse for Drivers).url
diff --git a/.kit_items/Drivers/Extras/Dell (Simplified Interface).url b/setup/windows/Drivers/Extras/Dell (Simplified Interface).url
similarity index 100%
rename from .kit_items/Drivers/Extras/Dell (Simplified Interface).url
rename to setup/windows/Drivers/Extras/Dell (Simplified Interface).url
diff --git a/.kit_items/Drivers/Extras/Dell (Support Site).url b/setup/windows/Drivers/Extras/Dell (Support Site).url
similarity index 100%
rename from .kit_items/Drivers/Extras/Dell (Support Site).url
rename to setup/windows/Drivers/Extras/Dell (Support Site).url
diff --git a/.kit_items/Drivers/Extras/Device Remover.url b/setup/windows/Drivers/Extras/Device Remover.url
similarity index 100%
rename from .kit_items/Drivers/Extras/Device Remover.url
rename to setup/windows/Drivers/Extras/Device Remover.url
diff --git a/.kit_items/Drivers/Extras/Display Driver Uninstaller.url b/setup/windows/Drivers/Extras/Display Driver Uninstaller.url
similarity index 100%
rename from .kit_items/Drivers/Extras/Display Driver Uninstaller.url
rename to setup/windows/Drivers/Extras/Display Driver Uninstaller.url
diff --git a/.kit_items/Drivers/Extras/HP.url b/setup/windows/Drivers/Extras/HP.url
similarity index 100%
rename from .kit_items/Drivers/Extras/HP.url
rename to setup/windows/Drivers/Extras/HP.url
diff --git a/.kit_items/Drivers/Extras/Intel Driver & Support Assistant.url b/setup/windows/Drivers/Extras/Intel Driver & Support Assistant.url
similarity index 100%
rename from .kit_items/Drivers/Extras/Intel Driver & Support Assistant.url
rename to setup/windows/Drivers/Extras/Intel Driver & Support Assistant.url
diff --git a/.kit_items/Drivers/Extras/NVIDIA.url b/setup/windows/Drivers/Extras/NVIDIA.url
similarity index 100%
rename from .kit_items/Drivers/Extras/NVIDIA.url
rename to setup/windows/Drivers/Extras/NVIDIA.url
diff --git a/.kit_items/Drivers/Extras/Samsung Tools & Software.url b/setup/windows/Drivers/Extras/Samsung Tools & Software.url
similarity index 100%
rename from .kit_items/Drivers/Extras/Samsung Tools & Software.url
rename to setup/windows/Drivers/Extras/Samsung Tools & Software.url
diff --git a/.kit_items/Installers/BackBlaze.url b/setup/windows/Installers/BackBlaze.url
similarity index 100%
rename from .kit_items/Installers/BackBlaze.url
rename to setup/windows/Installers/BackBlaze.url
diff --git a/.kit_items/Misc/Fix Missing Optical Drive.reg b/setup/windows/Misc/Fix Missing Optical Drive.reg
similarity index 100%
rename from .kit_items/Misc/Fix Missing Optical Drive.reg
rename to setup/windows/Misc/Fix Missing Optical Drive.reg
diff --git a/.kit_items/Misc/Nirsoft Utilities - Outlook.url b/setup/windows/Misc/Nirsoft Utilities - Outlook.url
similarity index 100%
rename from .kit_items/Misc/Nirsoft Utilities - Outlook.url
rename to setup/windows/Misc/Nirsoft Utilities - Outlook.url
diff --git a/.kit_items/Misc/Nirsoft Utilities - Passwords.url b/setup/windows/Misc/Nirsoft Utilities - Passwords.url
similarity index 100%
rename from .kit_items/Misc/Nirsoft Utilities - Passwords.url
rename to setup/windows/Misc/Nirsoft Utilities - Passwords.url
diff --git a/.kit_items/Misc/Sysinternals Suite (Live).url b/setup/windows/Misc/Sysinternals Suite (Live).url
similarity index 100%
rename from .kit_items/Misc/Sysinternals Suite (Live).url
rename to setup/windows/Misc/Sysinternals Suite (Live).url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/AV Removal Tools.url b/setup/windows/Uninstallers/AV Removal Tools/AV Removal Tools.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/AV Removal Tools.url
rename to setup/windows/Uninstallers/AV Removal Tools/AV Removal Tools.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/AVG.url b/setup/windows/Uninstallers/AV Removal Tools/AVG.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/AVG.url
rename to setup/windows/Uninstallers/AV Removal Tools/AVG.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/Avast.url b/setup/windows/Uninstallers/AV Removal Tools/Avast.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/Avast.url
rename to setup/windows/Uninstallers/AV Removal Tools/Avast.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/Avira.url b/setup/windows/Uninstallers/AV Removal Tools/Avira.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/Avira.url
rename to setup/windows/Uninstallers/AV Removal Tools/Avira.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/ESET.url b/setup/windows/Uninstallers/AV Removal Tools/ESET.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/ESET.url
rename to setup/windows/Uninstallers/AV Removal Tools/ESET.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/Kaspersky.url b/setup/windows/Uninstallers/AV Removal Tools/Kaspersky.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/Kaspersky.url
rename to setup/windows/Uninstallers/AV Removal Tools/Kaspersky.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/MBAM.url b/setup/windows/Uninstallers/AV Removal Tools/MBAM.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/MBAM.url
rename to setup/windows/Uninstallers/AV Removal Tools/MBAM.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/McAfee.url b/setup/windows/Uninstallers/AV Removal Tools/McAfee.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/McAfee.url
rename to setup/windows/Uninstallers/AV Removal Tools/McAfee.url
diff --git a/.kit_items/Uninstallers/AV Removal Tools/Norton.url b/setup/windows/Uninstallers/AV Removal Tools/Norton.url
similarity index 100%
rename from .kit_items/Uninstallers/AV Removal Tools/Norton.url
rename to setup/windows/Uninstallers/AV Removal Tools/Norton.url
diff --git a/.bin/ConEmu/ConEmu.xml b/setup/windows/bin/ConEmu/ConEmu.xml
similarity index 100%
rename from .bin/ConEmu/ConEmu.xml
rename to setup/windows/bin/ConEmu/ConEmu.xml
diff --git a/.bin/HWiNFO/general.ini b/setup/windows/bin/HWiNFO/general.ini
similarity index 100%
rename from .bin/HWiNFO/general.ini
rename to setup/windows/bin/HWiNFO/general.ini
diff --git a/.bin/_Drivers/SDIO/sdi.cfg b/setup/windows/bin/_Drivers/SDIO/sdi.cfg
similarity index 100%
rename from .bin/_Drivers/SDIO/sdi.cfg
rename to setup/windows/bin/_Drivers/SDIO/sdi.cfg
diff --git a/.cbin/_include/AIDA64/full.rpf b/setup/windows/cbin/_include/AIDA64/full.rpf
similarity index 100%
rename from .cbin/_include/AIDA64/full.rpf
rename to setup/windows/cbin/_include/AIDA64/full.rpf
diff --git a/.cbin/_include/AIDA64/installed_programs.rpf b/setup/windows/cbin/_include/AIDA64/installed_programs.rpf
similarity index 100%
rename from .cbin/_include/AIDA64/installed_programs.rpf
rename to setup/windows/cbin/_include/AIDA64/installed_programs.rpf
diff --git a/.cbin/_include/AIDA64/licenses.rpf b/setup/windows/cbin/_include/AIDA64/licenses.rpf
similarity index 100%
rename from .cbin/_include/AIDA64/licenses.rpf
rename to setup/windows/cbin/_include/AIDA64/licenses.rpf
diff --git a/.cbin/_include/BleachBit/BleachBit.ini b/setup/windows/cbin/_include/BleachBit/BleachBit.ini
similarity index 100%
rename from .cbin/_include/BleachBit/BleachBit.ini
rename to setup/windows/cbin/_include/BleachBit/BleachBit.ini
diff --git a/.cbin/_include/NotepadPlusPlus/config.xml b/setup/windows/cbin/_include/NotepadPlusPlus/config.xml
similarity index 100%
rename from .cbin/_include/NotepadPlusPlus/config.xml
rename to setup/windows/cbin/_include/NotepadPlusPlus/config.xml
diff --git a/.cbin/_include/XMPlay/xmplay.ini b/setup/windows/cbin/_include/XMPlay/xmplay.ini
similarity index 100%
rename from .cbin/_include/XMPlay/xmplay.ini
rename to setup/windows/cbin/_include/XMPlay/xmplay.ini
diff --git a/.cbin/_include/XYplorerFree/Data/XYplorer.ini b/setup/windows/cbin/_include/XYplorerFree/Data/XYplorer.ini
similarity index 100%
rename from .cbin/_include/XYplorerFree/Data/XYplorer.ini
rename to setup/windows/cbin/_include/XYplorerFree/Data/XYplorer.ini
diff --git a/.cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt b/setup/windows/cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
similarity index 100%
rename from .cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
rename to setup/windows/cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
diff --git a/.cbin/_include/_Office/2016_hb_32.xml b/setup/windows/cbin/_include/_Office/2016_hb_32.xml
similarity index 100%
rename from .cbin/_include/_Office/2016_hb_32.xml
rename to setup/windows/cbin/_include/_Office/2016_hb_32.xml
diff --git a/.cbin/_include/_Office/2016_hb_64.xml b/setup/windows/cbin/_include/_Office/2016_hb_64.xml
similarity index 100%
rename from .cbin/_include/_Office/2016_hb_64.xml
rename to setup/windows/cbin/_include/_Office/2016_hb_64.xml
diff --git a/.cbin/_include/_Office/2016_hs_32.xml b/setup/windows/cbin/_include/_Office/2016_hs_32.xml
similarity index 100%
rename from .cbin/_include/_Office/2016_hs_32.xml
rename to setup/windows/cbin/_include/_Office/2016_hs_32.xml
diff --git a/.cbin/_include/_Office/2016_hs_64.xml b/setup/windows/cbin/_include/_Office/2016_hs_64.xml
similarity index 100%
rename from .cbin/_include/_Office/2016_hs_64.xml
rename to setup/windows/cbin/_include/_Office/2016_hs_64.xml
diff --git a/.cbin/_include/_Office/2019_hb_32.xml b/setup/windows/cbin/_include/_Office/2019_hb_32.xml
similarity index 100%
rename from .cbin/_include/_Office/2019_hb_32.xml
rename to setup/windows/cbin/_include/_Office/2019_hb_32.xml
diff --git a/.cbin/_include/_Office/2019_hb_64.xml b/setup/windows/cbin/_include/_Office/2019_hb_64.xml
similarity index 100%
rename from .cbin/_include/_Office/2019_hb_64.xml
rename to setup/windows/cbin/_include/_Office/2019_hb_64.xml
diff --git a/.cbin/_include/_Office/2019_hs_32.xml b/setup/windows/cbin/_include/_Office/2019_hs_32.xml
similarity index 100%
rename from .cbin/_include/_Office/2019_hs_32.xml
rename to setup/windows/cbin/_include/_Office/2019_hs_32.xml
diff --git a/.cbin/_include/_Office/2019_hs_64.xml b/setup/windows/cbin/_include/_Office/2019_hs_64.xml
similarity index 100%
rename from .cbin/_include/_Office/2019_hs_64.xml
rename to setup/windows/cbin/_include/_Office/2019_hs_64.xml
diff --git a/.cbin/_include/_Office/365_32.xml b/setup/windows/cbin/_include/_Office/365_32.xml
similarity index 100%
rename from .cbin/_include/_Office/365_32.xml
rename to setup/windows/cbin/_include/_Office/365_32.xml
diff --git a/.cbin/_include/_Office/365_64.xml b/setup/windows/cbin/_include/_Office/365_64.xml
similarity index 100%
rename from .cbin/_include/_Office/365_64.xml
rename to setup/windows/cbin/_include/_Office/365_64.xml
diff --git a/.cbin/_include/_vcredists/InstallAll.bat b/setup/windows/cbin/_include/_vcredists/InstallAll.bat
similarity index 100%
rename from .cbin/_include/_vcredists/InstallAll.bat
rename to setup/windows/cbin/_include/_vcredists/InstallAll.bat