diff --git a/.bin/d7ii/Modules/Defs/dUninstaller.txt b/docs/TODO
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller.txt
rename to docs/TODO
diff --git a/Images/ConEmu.jpg b/images/ConEmu.jpg
similarity index 100%
rename from Images/ConEmu.jpg
rename to images/ConEmu.jpg
diff --git a/Images/Linux.jpg b/images/Linux.jpg
similarity index 100%
rename from Images/Linux.jpg
rename to images/Linux.jpg
diff --git a/Images/Pxelinux.jpg b/images/Pxelinux.jpg
similarity index 100%
rename from Images/Pxelinux.jpg
rename to images/Pxelinux.jpg
diff --git a/Images/Syslinux.jpg b/images/Syslinux.jpg
similarity index 100%
rename from Images/Syslinux.jpg
rename to images/Syslinux.jpg
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/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/find_user_wallpapers.py b/scripts/outer_scripts_to_review/find_user_wallpapers.py
similarity index 100%
rename from .bin/Scripts/find_user_wallpapers.py
rename to scripts/outer_scripts_to_review/find_user_wallpapers.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_eset_nod32_av.py b/scripts/outer_scripts_to_review/install_eset_nod32_av.py
similarity index 100%
rename from .bin/Scripts/install_eset_nod32_av.py
rename to scripts/outer_scripts_to_review/install_eset_nod32_av.py
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/network_stability_test.py b/scripts/outer_scripts_to_review/network_stability_test.py
similarity index 100%
rename from .bin/Scripts/network_stability_test.py
rename to scripts/outer_scripts_to_review/network_stability_test.py
diff --git a/.bin/Scripts/reset_browsers.py b/scripts/outer_scripts_to_review/reset_browsers.py
similarity index 100%
rename from .bin/Scripts/reset_browsers.py
rename to scripts/outer_scripts_to_review/reset_browsers.py
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/upload-logs b/scripts/outer_scripts_to_review/upload-logs
similarity index 100%
rename from .bin/Scripts/upload-logs
rename to scripts/outer_scripts_to_review/upload-logs
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/io_graph.py b/scripts/wk.prev/functions/io_graph.py
similarity index 100%
rename from .bin/Scripts/functions/io_graph.py
rename to scripts/wk.prev/functions/io_graph.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/osticket.py b/scripts/wk.prev/functions/osticket.py
similarity index 100%
rename from .bin/Scripts/functions/osticket.py
rename to scripts/wk.prev/functions/osticket.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/osticket.py b/scripts/wk.prev/settings/osticket.py
similarity index 100%
rename from .bin/Scripts/settings/osticket.py
rename to scripts/wk.prev/settings/osticket.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/.bin/d7ii/Modules/Defs/dUninstaller_FileSystemObjects.txt b/scripts/wk/io.py
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_FileSystemObjects.txt
rename to scripts/wk/io.py
diff --git a/.bin/d7ii/Modules/Defs/dUninstaller_RegKeys.txt b/scripts/wk/net.py
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_RegKeys.txt
rename to scripts/wk/net.py
diff --git a/.bin/d7ii/Modules/Defs/dUninstaller_RegValues.txt b/scripts/wk/std.py
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_RegValues.txt
rename to scripts/wk/std.py
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/1201_eset.png b/setup/linux/include/EFI/boot/icons/1201_eset.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/1201_eset.png
rename to setup/linux/include/EFI/boot/icons/1201_eset.png
diff --git a/.linux_items/include/EFI/boot/icons/1201_hdclone.png b/setup/linux/include/EFI/boot/icons/1201_hdclone.png
similarity index 100%
rename from .linux_items/include/EFI/boot/icons/1201_hdclone.png
rename to setup/linux/include/EFI/boot/icons/1201_hdclone.png
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/adjtime b/setup/linux/include/airootfs/etc/adjtime
similarity index 100%
rename from .linux_items/include/airootfs/etc/adjtime
rename to setup/linux/include/airootfs/etc/adjtime
diff --git a/.bin/1201_Root_CA.crt b/setup/linux/include/airootfs/etc/ca-certificates/trust-source/anchors/1201_Root_CA.crt
similarity index 100%
rename from .bin/1201_Root_CA.crt
rename to setup/linux/include/airootfs/etc/ca-certificates/trust-source/anchors/1201_Root_CA.crt
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/.ssh/config b/setup/linux/include/airootfs/etc/skel/.ssh/config
similarity index 100%
rename from .linux_items/include/airootfs/etc/skel/.ssh/config
rename to setup/linux/include/airootfs/etc/skel/.ssh/config
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/.linux_items/include/syslinux/1201_eset.cfg b/setup/linux/include/syslinux/1201_eset.cfg
similarity index 100%
rename from .linux_items/include/syslinux/1201_eset.cfg
rename to setup/linux/include/syslinux/1201_eset.cfg
diff --git a/.linux_items/include/syslinux/1201_hdclone.cfg b/setup/linux/include/syslinux/1201_hdclone.cfg
similarity index 100%
rename from .linux_items/include/syslinux/1201_hdclone.cfg
rename to setup/linux/include/syslinux/1201_hdclone.cfg
diff --git a/.linux_items/include/syslinux/splash.png b/setup/linux/include/syslinux/splash.png
similarity index 100%
rename from .linux_items/include/syslinux/splash.png
rename to setup/linux/include/syslinux/splash.png
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/.linux_items/include_x/airootfs/etc/skel/.Xauthority b/setup/linux/include_x/airootfs/etc/skel/.Xauthority
similarity index 100%
rename from .linux_items/include_x/airootfs/etc/skel/.Xauthority
rename to setup/linux/include_x/airootfs/etc/skel/.Xauthority
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/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.30 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.30
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.30
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.30
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.31 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.31
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.31
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.31
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.32 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.32
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.32
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.32
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.33 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.33
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.33
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.33
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.34 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.34
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.34
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.34
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.35 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.35
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.35
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.35
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.36 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.36
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.36
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.36
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.37 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.37
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.37
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.37
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.38 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.38
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.38
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.38
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.39 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.39
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.39
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.39
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.40 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.40
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.40
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.40
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.41 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.41
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.41
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.41
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.42 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.42
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.42
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.42
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.43 b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.43
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.43
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/10.120.1.43
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Control b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Control
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Control
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Control
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Data b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Data
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Data
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Data
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Lore b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Lore
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Lore
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Lore
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Supremo b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Supremo
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Supremo
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Supremo
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Unicron b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Unicron
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/Unicron
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/Unicron
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/bender b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/bender
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/bender
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/bender
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/combine b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/combine
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/combine
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/combine
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/cortana b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/cortana
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/cortana
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/cortana
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/glados b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/glados
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/glados
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/glados
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/locutus b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/locutus
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/locutus
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/locutus
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/sex-robot b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/sex-robot
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/sex-robot
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/sex-robot
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/shodan b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/shodan
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/shodan
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/shodan
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/six b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/six
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/six
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/six
diff --git a/.linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/skynet b/setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/skynet
similarity index 100%
rename from .linux_items/include_x/airootfs/usr/share/wallpapers/test-stations/skynet
rename to setup/linux/include_x/airootfs/usr/share/wallpapers/test-stations/skynet
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/_include/CPU-Z/cpuz.ini
similarity index 100%
rename from .pe_items/_include/CPU-Z/cpuz.ini
rename to setup/pe/_include/CPU-Z/cpuz.ini
diff --git a/.pe_items/_include/ConEmu/ConEmu.xml b/setup/pe/_include/ConEmu/ConEmu.xml
similarity index 100%
rename from .pe_items/_include/ConEmu/ConEmu.xml
rename to setup/pe/_include/ConEmu/ConEmu.xml
diff --git a/.pe_items/_include/HWiNFO/HWiNFO.INI b/setup/pe/_include/HWiNFO/HWiNFO.INI
similarity index 100%
rename from .pe_items/_include/HWiNFO/HWiNFO.INI
rename to setup/pe/_include/HWiNFO/HWiNFO.INI
diff --git a/.pe_items/_include/NotepadPlusPlus/config.xml b/setup/pe/_include/NotepadPlusPlus/config.xml
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/config.xml
rename to setup/pe/_include/NotepadPlusPlus/config.xml
diff --git a/.pe_items/_include/NotepadPlusPlus/npp.cmd b/setup/pe/_include/NotepadPlusPlus/npp.cmd
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/npp.cmd
rename to setup/pe/_include/NotepadPlusPlus/npp.cmd
diff --git a/.pe_items/_include/NotepadPlusPlus/stylers.model.xml b/setup/pe/_include/NotepadPlusPlus/stylers.model.xml
similarity index 100%
rename from .pe_items/_include/NotepadPlusPlus/stylers.model.xml
rename to setup/pe/_include/NotepadPlusPlus/stylers.model.xml
diff --git a/.pe_items/_include/Q-Dir/Q-Dir.ini b/setup/pe/_include/Q-Dir/Q-Dir.ini
similarity index 100%
rename from .pe_items/_include/Q-Dir/Q-Dir.ini
rename to setup/pe/_include/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/.linux_items/include/airootfs/etc/ca-certificates/trust-source/anchors/1201_Root_CA.crt b/setup/windows/bin/1201_Root_CA.crt
similarity index 100%
rename from .linux_items/include/airootfs/etc/ca-certificates/trust-source/anchors/1201_Root_CA.crt
rename to setup/windows/bin/1201_Root_CA.crt
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/WinAIORepair/__associations.ini b/setup/windows/bin/WinAIORepair/__associations.ini
similarity index 100%
rename from .bin/WinAIORepair/__associations.ini
rename to setup/windows/bin/WinAIORepair/__associations.ini
diff --git a/.bin/WinAIORepair/__empty.ini b/setup/windows/bin/WinAIORepair/__empty.ini
similarity index 100%
rename from .bin/WinAIORepair/__empty.ini
rename to setup/windows/bin/WinAIORepair/__empty.ini
diff --git a/.bin/WinAIORepair/__permissions.ini b/setup/windows/bin/WinAIORepair/__permissions.ini
similarity index 100%
rename from .bin/WinAIORepair/__permissions.ini
rename to setup/windows/bin/WinAIORepair/__permissions.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/.bin/d7ii/3rd Party Tools/CreateRestorePoint.cmd b/setup/windows/bin/d7ii/3rd Party Tools/CreateRestorePoint.cmd
similarity index 100%
rename from .bin/d7ii/3rd Party Tools/CreateRestorePoint.cmd
rename to setup/windows/bin/d7ii/3rd Party Tools/CreateRestorePoint.cmd
diff --git a/.bin/d7ii/3rd Party Tools/MBAM_Install.cmd b/setup/windows/bin/d7ii/3rd Party Tools/MBAM_Install.cmd
similarity index 100%
rename from .bin/d7ii/3rd Party Tools/MBAM_Install.cmd
rename to setup/windows/bin/d7ii/3rd Party Tools/MBAM_Install.cmd
diff --git a/.bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd b/setup/windows/bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd
similarity index 100%
rename from .bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd
rename to setup/windows/bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd
diff --git a/.bin/d7ii/3rd Party Tools/Python_Check.cmd b/setup/windows/bin/d7ii/3rd Party Tools/Python_Check.cmd
similarity index 100%
rename from .bin/d7ii/3rd Party Tools/Python_Check.cmd
rename to setup/windows/bin/d7ii/3rd Party Tools/Python_Check.cmd
diff --git a/.bin/d7ii/3rd Party Tools/WizardKit Launcher.cmd b/setup/windows/bin/d7ii/3rd Party Tools/WizardKit Launcher.cmd
similarity index 100%
rename from .bin/d7ii/3rd Party Tools/WizardKit Launcher.cmd
rename to setup/windows/bin/d7ii/3rd Party Tools/WizardKit Launcher.cmd
diff --git a/.bin/d7ii/Config/1201Logo.bmp b/setup/windows/bin/d7ii/Config/1201Logo.bmp
similarity index 100%
rename from .bin/d7ii/Config/1201Logo.bmp
rename to setup/windows/bin/d7ii/Config/1201Logo.bmp
diff --git a/.bin/d7ii/Config/AltText.ini b/setup/windows/bin/d7ii/Config/AltText.ini
similarity index 100%
rename from .bin/d7ii/Config/AltText.ini
rename to setup/windows/bin/d7ii/Config/AltText.ini
diff --git a/.bin/d7ii/Config/AppOverrides.ini b/setup/windows/bin/d7ii/Config/AppOverrides.ini
similarity index 100%
rename from .bin/d7ii/Config/AppOverrides.ini
rename to setup/windows/bin/d7ii/Config/AppOverrides.ini
diff --git a/.bin/d7ii/Config/CustomApps/AdwCleaner (Updated).cfg b/setup/windows/bin/d7ii/Config/CustomApps/AdwCleaner (Updated).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/AdwCleaner (Updated).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/AdwCleaner (Updated).cfg
diff --git a/.bin/d7ii/Config/CustomApps/Disable Windows Updates.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Disable Windows Updates.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Disable Windows Updates.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Disable Windows Updates.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Enable Windows Updates.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Enable Windows Updates.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Enable Windows Updates.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Enable Windows Updates.cfg
diff --git a/.bin/d7ii/Config/CustomApps/HitmanPro (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps/HitmanPro (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/HitmanPro (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/HitmanPro (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg b/setup/windows/bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Install SW Bundle.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Install SW Bundle.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Install SW Bundle.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Install SW Bundle.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Malwarebytes Download.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Download.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Malwarebytes Download.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Download.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Malwarebytes Install.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Install.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Malwarebytes Install.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Install.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Malwarebytes Scan.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Scan.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Malwarebytes Scan.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Scan.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Malwarebytes Uninstall.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Uninstall.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Malwarebytes Uninstall.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Malwarebytes Uninstall.cfg
diff --git a/.bin/d7ii/Config/CustomApps/Python Check.cfg b/setup/windows/bin/d7ii/Config/CustomApps/Python Check.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/Python Check.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/Python Check.cfg
diff --git a/.bin/d7ii/Config/CustomApps/RKill (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps/RKill (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/RKill (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/RKill (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg b/setup/windows/bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg
diff --git a/.bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg b/setup/windows/bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg
diff --git a/.bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg b/setup/windows/bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg
diff --git a/.bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg b/setup/windows/bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Everything.ini b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Everything.ini
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Everything.ini
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Everything.ini
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/HMP.cmd b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/HMP.cmd
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/HMP.cmd
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/HMP.cmd
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/JRT_Auto.cmd b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/JRT_Auto.cmd
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/JRT_Auto.cmd
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/JRT_Auto.cmd
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Neutron.ini b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Neutron.ini
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Neutron.ini
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/Neutron.ini
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/PatchMyPC.reg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/PatchMyPC.reg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/PatchMyPC.reg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/PatchMyPC.reg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/a2cmd.cmd b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/a2cmd.cmd
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/a2cmd.cmd
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/a2cmd.cmd
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/cpuz.ini b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/cpuz.ini
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/cpuz.ini
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/cpuz.ini
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/pagedfrg.reg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/pagedfrg.reg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/pagedfrg.reg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/pagedfrg.reg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/rkill.cmd b/setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/rkill.cmd
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/rkill.cmd
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/3rd Party Configs/rkill.cmd
diff --git a/.bin/d7ii/Config/CustomApps_d7II/AS SSD Benchmark.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/AS SSD Benchmark.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/AS SSD Benchmark.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/AS SSD Benchmark.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/AdwCleaner.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/AdwCleaner.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/AdwCleaner.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/AdwCleaner.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Auslogics DD Portable.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Auslogics DD Portable.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Auslogics DD Portable.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Auslogics DD Portable.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Autoruns.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Autoruns.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Autoruns.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Autoruns.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Avast! aswMBR.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Avast! aswMBR.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Avast! aswMBR.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Avast! aswMBR.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/BatteryInfoView.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/BatteryInfoView.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/BatteryInfoView.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/BatteryInfoView.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Belarc Advisor (Install-Report).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Belarc Advisor (Install-Report).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Belarc Advisor (Install-Report).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Belarc Advisor (Install-Report).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Bitdefender Rootkit Remover.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Bitdefender Rootkit Remover.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Bitdefender Rootkit Remover.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Bitdefender Rootkit Remover.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/BluescreenView.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/BluescreenView.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/BluescreenView.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/BluescreenView.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/CPU-Z.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/CPU-Z.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/CPU-Z.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/CPU-Z.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/ComboFix (Uninstall).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/ComboFix (Uninstall).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/ComboFix (Uninstall).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/ComboFix (Uninstall).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/ComboFix.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/ComboFix.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/ComboFix.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/ComboFix.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/CrowdInspect.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/CrowdInspect.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/CrowdInspect.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/CrowdInspect.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/CrystalDiskInfo.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/CrystalDiskInfo.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/CrystalDiskInfo.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/CrystalDiskInfo.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/CurrPorts.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/CurrPorts.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/CurrPorts.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/CurrPorts.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/ESET Smart Installer.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/ESET Smart Installer.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/ESET Smart Installer.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/ESET Smart Installer.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan (Offline).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan (Offline).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan (Offline).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan (Offline).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Deep Scan.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Quick Scan.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Quick Scan.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Quick Scan.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Quick Scan.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Smart Scan.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Smart Scan.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Smart Scan.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Emsisoft a2cmd Smart Scan.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Everything Search Engine.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Everything Search Engine.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Everything Search Engine.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Everything Search Engine.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/ExecutedProgramsList.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/ExecutedProgramsList.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/ExecutedProgramsList.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/ExecutedProgramsList.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/GMER.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/GMER.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/GMER.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/GMER.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/GPU-Z Report.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/GPU-Z Report.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/GPU-Z Report.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/GPU-Z Report.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/GPU-Z.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/GPU-Z.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/GPU-Z.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/GPU-Z.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Google Chrome Software Removal Tool.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Google Chrome Software Removal Tool.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Google Chrome Software Removal Tool.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Google Chrome Software Removal Tool.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/HeavyLoad.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/HeavyLoad.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/HeavyLoad.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/HeavyLoad.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/HitmanPro (Manual).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/HitmanPro (Manual).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/HitmanPro (Manual).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/HitmanPro (Manual).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/HitmanPro.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/HitmanPro.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/HitmanPro.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/HitmanPro.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/JRT.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/JRT.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/JRT.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/JRT.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller (Silent).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller (Silent).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller (Silent).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller (Silent).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Kaspersky TDSSKiller.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/KillEmAll v5.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/KillEmAll v5.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/KillEmAll v5.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/KillEmAll v5.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MBRCheck (Offline).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck (Offline).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MBRCheck (Offline).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck (Offline).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MBRCheck (Report Only).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck (Report Only).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MBRCheck (Report Only).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck (Report Only).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MBRCheck.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MBRCheck.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MBRCheck.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Install).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Install).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Install).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Install).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Portable).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Portable).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Portable).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MS Office Config Analyzer Tool (Portable).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/MalwareBytes Anti-Rootkit.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/MalwareBytes Anti-Rootkit.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/MalwareBytes Anti-Rootkit.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/MalwareBytes Anti-Rootkit.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Malwarebytes v2.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Malwarebytes v2.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Malwarebytes v2.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Malwarebytes v2.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Offline).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Offline).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Offline).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Offline).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent-Offline).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent-Offline).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent-Offline).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger (Silent-Offline).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/McAfee Stinger.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/McAfee Stinger.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/McAfee Stinger.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Microsoft .NET Framework Repair Tool.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft .NET Framework Repair Tool.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Microsoft .NET Framework Repair Tool.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft .NET Framework Repair Tool.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Portable.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Portable.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Portable.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Portable.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Win Update (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Win Update (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Win Update (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Win Update (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Winsock (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Winsock (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Winsock (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft FixIt Winsock (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Microsoft Safety Scanner.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft Safety Scanner.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Microsoft Safety Scanner.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Microsoft Safety Scanner.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Neutron (Sync Time).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Neutron (Sync Time).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Neutron (Sync Time).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Neutron (Sync Time).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/OTL.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/OTL.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/OTL.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/OTL.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/OpenHardwareMonitor.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/OpenHardwareMonitor.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/OpenHardwareMonitor.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/OpenHardwareMonitor.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Opened Files View.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Opened Files View.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Opened Files View.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Opened Files View.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/OpenedFilesView.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/OpenedFilesView.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/OpenedFilesView.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/OpenedFilesView.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/PatchMyPC (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/PatchMyPC (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/PatchMyPC (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/PatchMyPC (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/PatchMyPC.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/PatchMyPC.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/PatchMyPC.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/PatchMyPC.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Petya Encryption Fix.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Petya Encryption Fix.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Petya Encryption Fix.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Petya Encryption Fix.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform CCleaner.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Defraggler.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform Recuva.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Recuva.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform Recuva.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Recuva.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Piriform Speccy.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Speccy.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Piriform Speccy.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Piriform Speccy.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/PreviousFilesRecovery.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/PreviousFilesRecovery.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/PreviousFilesRecovery.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/PreviousFilesRecovery.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/RegFromApp-x32.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp-x32.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/RegFromApp-x32.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp-x32.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/RegFromApp-x64.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp-x64.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/RegFromApp-x64.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp-x64.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/RegFromApp.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/RegFromApp.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/RegFromApp.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Revo Uninstaller.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Revo Uninstaller.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Revo Uninstaller.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Revo Uninstaller.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Rogue Killer.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Rogue Killer.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Rogue Killer.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Rogue Killer.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/ShadowCopyView.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/ShadowCopyView.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/ShadowCopyView.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/ShadowCopyView.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Should I Remove It (Uninstall).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Should I Remove It (Uninstall).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Should I Remove It (Uninstall).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Should I Remove It (Uninstall).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Should I Remove It.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Should I Remove It.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Should I Remove It.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Should I Remove It.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Sophos Virus Removal Tool.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Sophos Virus Removal Tool.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Sophos Virus Removal Tool.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Sophos Virus Removal Tool.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/SpaceSniffer.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/SpaceSniffer.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/SpaceSniffer.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/SpaceSniffer.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/StartUpLite.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/StartUpLite.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/StartUpLite.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/StartUpLite.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/SuperAntiSpyware.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/SuperAntiSpyware.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/SuperAntiSpyware.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/SuperAntiSpyware.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Svchost Process Analyzer.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Svchost Process Analyzer.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Svchost Process Analyzer.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Svchost Process Analyzer.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Sysinternals PageDefrag (XP).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Sysinternals PageDefrag (XP).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Sysinternals PageDefrag (XP).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Sysinternals PageDefrag (XP).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/TCPOptimizer.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/TCPOptimizer.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/TCPOptimizer.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/TCPOptimizer.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/TreeSize.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/TreeSize.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/TreeSize.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/TreeSize.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/USB Devices View.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/USB Devices View.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/USB Devices View.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/USB Devices View.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/USBDeview.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/USBDeview.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/USBDeview.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/USBDeview.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/UltraSearch.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/UltraSearch.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/UltraSearch.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/UltraSearch.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Unchecky (Install).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Unchecky (Install).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Unchecky (Install).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Unchecky (Install).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Deep Scan).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Deep Scan).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Deep Scan).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Deep Scan).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Manual).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Manual).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Manual).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Manual).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Quick Scan).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Quick Scan).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Quick Scan).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/VipreRescueScanner (Quick Scan).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader Uninstall.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader Uninstall.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader Uninstall.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader Uninstall.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/VirusTotal Uploader.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/WhatIsHang.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/WhatIsHang.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/WhatIsHang.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/WhatIsHang.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO (Auto).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO (Auto).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO (Auto).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO (Auto).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/Windows Repair AIO.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/cports.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/cports.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/cports.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/cports.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/herdProtect (Uninstall).cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/herdProtect (Uninstall).cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/herdProtect (Uninstall).cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/herdProtect (Uninstall).cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/herdProtect.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/herdProtect.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/herdProtect.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/herdProtect.cfg
diff --git a/.bin/d7ii/Config/CustomApps_d7II/rkill.cfg b/setup/windows/bin/d7ii/Config/CustomApps_d7II/rkill.cfg
similarity index 100%
rename from .bin/d7ii/Config/CustomApps_d7II/rkill.cfg
rename to setup/windows/bin/d7ii/Config/CustomApps_d7II/rkill.cfg
diff --git a/.bin/d7ii/Config/Email.Settings.dat b/setup/windows/bin/d7ii/Config/Email.Settings.dat
similarity index 100%
rename from .bin/d7ii/Config/Email.Settings.dat
rename to setup/windows/bin/d7ii/Config/Email.Settings.dat
diff --git a/.bin/d7ii/Config/FTP.Settings.dat b/setup/windows/bin/d7ii/Config/FTP.Settings.dat
similarity index 100%
rename from .bin/d7ii/Config/FTP.Settings.dat
rename to setup/windows/bin/d7ii/Config/FTP.Settings.dat
diff --git a/.bin/d7ii/Config/Folders.txt b/setup/windows/bin/d7ii/Config/Folders.txt
similarity index 100%
rename from .bin/d7ii/Config/Folders.txt
rename to setup/windows/bin/d7ii/Config/Folders.txt
diff --git a/.bin/d7ii/Config/IntFunctions/MBAM_Prefs.cfg b/setup/windows/bin/d7ii/Config/IntFunctions/MBAM_Prefs.cfg
similarity index 100%
rename from .bin/d7ii/Config/IntFunctions/MBAM_Prefs.cfg
rename to setup/windows/bin/d7ii/Config/IntFunctions/MBAM_Prefs.cfg
diff --git a/.bin/d7ii/Config/Links.txt b/setup/windows/bin/d7ii/Config/Links.txt
similarity index 100%
rename from .bin/d7ii/Config/Links.txt
rename to setup/windows/bin/d7ii/Config/Links.txt
diff --git a/.bin/d7ii/Config/OS Branding/OSBranding.ini b/setup/windows/bin/d7ii/Config/OS Branding/OSBranding.ini
similarity index 100%
rename from .bin/d7ii/Config/OS Branding/OSBranding.ini
rename to setup/windows/bin/d7ii/Config/OS Branding/OSBranding.ini
diff --git a/.bin/d7ii/Config/OS Branding/oeminfo.ini b/setup/windows/bin/d7ii/Config/OS Branding/oeminfo.ini
similarity index 100%
rename from .bin/d7ii/Config/OS Branding/oeminfo.ini
rename to setup/windows/bin/d7ii/Config/OS Branding/oeminfo.ini
diff --git a/.bin/d7ii/Config/Profiles/Default.cfg b/setup/windows/bin/d7ii/Config/Profiles/Default.cfg
similarity index 100%
rename from .bin/d7ii/Config/Profiles/Default.cfg
rename to setup/windows/bin/d7ii/Config/Profiles/Default.cfg
diff --git a/.bin/d7ii/Config/Profiles/Diagnose and Testing.cfg b/setup/windows/bin/d7ii/Config/Profiles/Diagnose and Testing.cfg
similarity index 100%
rename from .bin/d7ii/Config/Profiles/Diagnose and Testing.cfg
rename to setup/windows/bin/d7ii/Config/Profiles/Diagnose and Testing.cfg
diff --git a/.bin/d7ii/Config/Profiles/Full.cfg b/setup/windows/bin/d7ii/Config/Profiles/Full.cfg
similarity index 100%
rename from .bin/d7ii/Config/Profiles/Full.cfg
rename to setup/windows/bin/d7ii/Config/Profiles/Full.cfg
diff --git a/.bin/d7ii/Config/Profiles/Quick.cfg b/setup/windows/bin/d7ii/Config/Profiles/Quick.cfg
similarity index 100%
rename from .bin/d7ii/Config/Profiles/Quick.cfg
rename to setup/windows/bin/d7ii/Config/Profiles/Quick.cfg
diff --git a/.bin/d7ii/Config/Reg.Settings.dat b/setup/windows/bin/d7ii/Config/Reg.Settings.dat
similarity index 100%
rename from .bin/d7ii/Config/Reg.Settings.dat
rename to setup/windows/bin/d7ii/Config/Reg.Settings.dat
diff --git a/.bin/d7ii/Config/RegLinks.txt b/setup/windows/bin/d7ii/Config/RegLinks.txt
similarity index 100%
rename from .bin/d7ii/Config/RegLinks.txt
rename to setup/windows/bin/d7ii/Config/RegLinks.txt
diff --git a/.bin/d7ii/Config/SiteSearch.txt b/setup/windows/bin/d7ii/Config/SiteSearch.txt
similarity index 100%
rename from .bin/d7ii/Config/SiteSearch.txt
rename to setup/windows/bin/d7ii/Config/SiteSearch.txt
diff --git a/.bin/d7ii/Config/SortOrder/AuditBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/AuditBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/AuditBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/AuditBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/AuditBox2.cfg b/setup/windows/bin/d7ii/Config/SortOrder/AuditBox2.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/AuditBox2.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/AuditBox2.cfg
diff --git a/.bin/d7ii/Config/SortOrder/CustomMaint b/setup/windows/bin/d7ii/Config/SortOrder/CustomMaint
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/CustomMaint
rename to setup/windows/bin/d7ii/Config/SortOrder/CustomMaint
diff --git a/.bin/d7ii/Config/SortOrder/CustomTools.cfg b/setup/windows/bin/d7ii/Config/SortOrder/CustomTools.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/CustomTools.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/CustomTools.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MaintBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MaintBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MaintBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MaintBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MaintBox2.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MaintBox2.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MaintBox2.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MaintBox2.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MaintBox3.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MaintBox3.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MaintBox3.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MaintBox3.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MalwareBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MalwareBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MalwareBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MalwareBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MalwareBox2.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MalwareBox2.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MalwareBox2.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MalwareBox2.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MalwareBox3.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MalwareBox3.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MalwareBox3.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MalwareBox3.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MalwarePost.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MalwarePost.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MalwarePost.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MalwarePost.cfg
diff --git a/.bin/d7ii/Config/SortOrder/MalwarePre.cfg b/setup/windows/bin/d7ii/Config/SortOrder/MalwarePre.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/MalwarePre.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/MalwarePre.cfg
diff --git a/.bin/d7ii/Config/SortOrder/OfflineBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/OfflineBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/OfflineBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/OfflineBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/RepairBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/RepairBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/RepairBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/RepairBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/RepairBox2.cfg b/setup/windows/bin/d7ii/Config/SortOrder/RepairBox2.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/RepairBox2.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/RepairBox2.cfg
diff --git a/.bin/d7ii/Config/SortOrder/RepairBox3.cfg b/setup/windows/bin/d7ii/Config/SortOrder/RepairBox3.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/RepairBox3.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/RepairBox3.cfg
diff --git a/.bin/d7ii/Config/SortOrder/RepairWin.cfg b/setup/windows/bin/d7ii/Config/SortOrder/RepairWin.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/RepairWin.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/RepairWin.cfg
diff --git a/.bin/d7ii/Config/SortOrder/TweaksBox1.cfg b/setup/windows/bin/d7ii/Config/SortOrder/TweaksBox1.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/TweaksBox1.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/TweaksBox1.cfg
diff --git a/.bin/d7ii/Config/SortOrder/d7IIEndSession.cfg b/setup/windows/bin/d7ii/Config/SortOrder/d7IIEndSession.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/d7IIEndSession.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/d7IIEndSession.cfg
diff --git a/.bin/d7ii/Config/SortOrder/d7IIStartSession.cfg b/setup/windows/bin/d7ii/Config/SortOrder/d7IIStartSession.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/d7IIStartSession.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/d7IIStartSession.cfg
diff --git a/.bin/d7ii/Config/SortOrder/d7IIStartup.cfg b/setup/windows/bin/d7ii/Config/SortOrder/d7IIStartup.cfg
similarity index 100%
rename from .bin/d7ii/Config/SortOrder/d7IIStartup.cfg
rename to setup/windows/bin/d7ii/Config/SortOrder/d7IIStartup.cfg
diff --git a/.bin/d7ii/Config/Templates/Email/BreakFix Report.txt b/setup/windows/bin/d7ii/Config/Templates/Email/BreakFix Report.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Email/BreakFix Report.txt
rename to setup/windows/bin/d7ii/Config/Templates/Email/BreakFix Report.txt
diff --git a/.bin/d7ii/Config/Templates/Email/Client Diagnostic Report.txt b/setup/windows/bin/d7ii/Config/Templates/Email/Client Diagnostic Report.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Email/Client Diagnostic Report.txt
rename to setup/windows/bin/d7ii/Config/Templates/Email/Client Diagnostic Report.txt
diff --git a/.bin/d7ii/Config/Templates/Email/Contract Report.txt b/setup/windows/bin/d7ii/Config/Templates/Email/Contract Report.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Email/Contract Report.txt
rename to setup/windows/bin/d7ii/Config/Templates/Email/Contract Report.txt
diff --git a/.bin/d7ii/Config/Templates/Notes/Company Info.txt b/setup/windows/bin/d7ii/Config/Templates/Notes/Company Info.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Notes/Company Info.txt
rename to setup/windows/bin/d7ii/Config/Templates/Notes/Company Info.txt
diff --git a/.bin/d7ii/Config/Templates/Notes/Detected Infections.txt b/setup/windows/bin/d7ii/Config/Templates/Notes/Detected Infections.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Notes/Detected Infections.txt
rename to setup/windows/bin/d7ii/Config/Templates/Notes/Detected Infections.txt
diff --git a/.bin/d7ii/Config/Templates/Notes/Equipment Received.txt b/setup/windows/bin/d7ii/Config/Templates/Notes/Equipment Received.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Notes/Equipment Received.txt
rename to setup/windows/bin/d7ii/Config/Templates/Notes/Equipment Received.txt
diff --git a/.bin/d7ii/Config/Templates/Notes/User Info.txt b/setup/windows/bin/d7ii/Config/Templates/Notes/User Info.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Notes/User Info.txt
rename to setup/windows/bin/d7ii/Config/Templates/Notes/User Info.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Diagnostics - Maintenance Needed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - Maintenance Needed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Diagnostics - Maintenance Needed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - Maintenance Needed.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Diagnostics - PC Repair Needed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - PC Repair Needed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Diagnostics - PC Repair Needed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - PC Repair Needed.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Diagnostics - Virus Detected.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - Virus Detected.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Diagnostics - Virus Detected.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics - Virus Detected.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Diagnostics Completed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics Completed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Diagnostics Completed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Diagnostics Completed.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Invoice.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Invoice.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Invoice.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Invoice.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Maintenance Completed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Maintenance Completed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Maintenance Completed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Maintenance Completed.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/PC Repair Completed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/PC Repair Completed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/PC Repair Completed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/PC Repair Completed.txt
diff --git a/.bin/d7ii/Config/Templates/Snippets/Virus Removal Completed.txt b/setup/windows/bin/d7ii/Config/Templates/Snippets/Virus Removal Completed.txt
similarity index 100%
rename from .bin/d7ii/Config/Templates/Snippets/Virus Removal Completed.txt
rename to setup/windows/bin/d7ii/Config/Templates/Snippets/Virus Removal Completed.txt
diff --git a/.bin/d7ii/Config/d7II.ini b/setup/windows/bin/d7ii/Config/d7II.ini
similarity index 100%
rename from .bin/d7ii/Config/d7II.ini
rename to setup/windows/bin/d7ii/Config/d7II.ini
diff --git a/.bin/d7ii/Config/d7II_DefaultApps.INI b/setup/windows/bin/d7ii/Config/d7II_DefaultApps.INI
similarity index 100%
rename from .bin/d7ii/Config/d7II_DefaultApps.INI
rename to setup/windows/bin/d7ii/Config/d7II_DefaultApps.INI
diff --git a/.bin/d7ii/Config/d7II_SFX_Mini.ini b/setup/windows/bin/d7ii/Config/d7II_SFX_Mini.ini
similarity index 100%
rename from .bin/d7ii/Config/d7II_SFX_Mini.ini
rename to setup/windows/bin/d7ii/Config/d7II_SFX_Mini.ini
diff --git a/.bin/d7ii/Modules/Defs/dUninstaller_RunValues.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller.txt
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_RunValues.txt
rename to setup/windows/bin/d7ii/Modules/Defs/dUninstaller.txt
diff --git a/.bin/d7ii/Modules/Defs/dUninstaller_StartMenuFolders.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_FileSystemObjects.txt
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_StartMenuFolders.txt
rename to setup/windows/bin/d7ii/Modules/Defs/dUninstaller_FileSystemObjects.txt
diff --git a/.bin/d7ii/Modules/Defs/dUninstaller_Whitelist.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RegKeys.txt
similarity index 100%
rename from .bin/d7ii/Modules/Defs/dUninstaller_Whitelist.txt
rename to setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RegKeys.txt
diff --git a/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RegValues.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RegValues.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RunValues.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_RunValues.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_StartMenuFolders.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_StartMenuFolders.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_Whitelist.txt b/setup/windows/bin/d7ii/Modules/Defs/dUninstaller_Whitelist.txt
new file mode 100644
index 00000000..e69de29b
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/ESETConfigs/eset-config-msp.xml b/setup/windows/cbin/_include/ESETConfigs/eset-config-msp.xml
similarity index 100%
rename from .cbin/_include/ESETConfigs/eset-config-msp.xml
rename to setup/windows/cbin/_include/ESETConfigs/eset-config-msp.xml
diff --git a/.cbin/_include/ESETConfigs/eset-config.xml b/setup/windows/cbin/_include/ESETConfigs/eset-config.xml
similarity index 100%
rename from .cbin/_include/ESETConfigs/eset-config.xml
rename to setup/windows/cbin/_include/ESETConfigs/eset-config.xml
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/ShutUp10/1201.cfg b/setup/windows/cbin/_include/ShutUp10/1201.cfg
similarity index 100%
rename from .cbin/_include/ShutUp10/1201.cfg
rename to setup/windows/cbin/_include/ShutUp10/1201.cfg
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