diff --git a/setup/windows/Drivers/Extras/AMD.url b/setup/windows/Drivers/Extras/AMD.url
deleted file mode 100644
index 0c691d79..00000000
--- a/setup/windows/Drivers/Extras/AMD.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://support.amd.com/en-us/download
diff --git a/setup/windows/Drivers/Extras/Dell (FTP - Browse for Drivers).url b/setup/windows/Drivers/Extras/Dell (FTP - Browse for Drivers).url
deleted file mode 100644
index 9c50bf4c..00000000
--- a/setup/windows/Drivers/Extras/Dell (FTP - Browse for Drivers).url	
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://ftp.dell.com/browse_for_drivers/
diff --git a/setup/windows/Drivers/Extras/Dell (Simplified Interface).url b/setup/windows/Drivers/Extras/Dell (Simplified Interface).url
deleted file mode 100644
index 02eed53f..00000000
--- a/setup/windows/Drivers/Extras/Dell (Simplified Interface).url	
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://downloads.dell.com/published/Pages/index.html
diff --git a/setup/windows/Drivers/Extras/Dell (Support Site).url b/setup/windows/Drivers/Extras/Dell (Support Site).url
deleted file mode 100644
index 870d5a6c..00000000
--- a/setup/windows/Drivers/Extras/Dell (Support Site).url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[InternetShortcut]
-URL=http://support.dell.com/
-IDList=
-HotKey=0
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
diff --git a/setup/windows/Drivers/Extras/Device Remover.url b/setup/windows/Drivers/Extras/Device Remover.url
deleted file mode 100644
index 2da40e96..00000000
--- a/setup/windows/Drivers/Extras/Device Remover.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-IDList=
-URL=http://www.majorgeeks.com/files/details/device_remover_543c.html
diff --git a/setup/windows/Drivers/Extras/Display Driver Uninstaller.url b/setup/windows/Drivers/Extras/Display Driver Uninstaller.url
deleted file mode 100644
index 9669192c..00000000
--- a/setup/windows/Drivers/Extras/Display Driver Uninstaller.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-IDList=
-URL=https://www.wagnardsoft.com/
diff --git a/setup/windows/Drivers/Extras/HP.url b/setup/windows/Drivers/Extras/HP.url
deleted file mode 100644
index 02deee1e..00000000
--- a/setup/windows/Drivers/Extras/HP.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=http://support.hp.com/us-en/drivers
diff --git a/setup/windows/Drivers/Extras/Intel Driver & Support Assistant.url b/setup/windows/Drivers/Extras/Intel Driver & Support Assistant.url
deleted file mode 100644
index 1a2fa711..00000000
--- a/setup/windows/Drivers/Extras/Intel Driver & Support Assistant.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-IDList=
-URL=https://www.intel.com/content/www/us/en/support/detect.html
diff --git a/setup/windows/Drivers/Extras/NVIDIA.url b/setup/windows/Drivers/Extras/NVIDIA.url
deleted file mode 100644
index 1d54f978..00000000
--- a/setup/windows/Drivers/Extras/NVIDIA.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://www.nvidia.com/Download/index.aspx?lang=en-us
diff --git a/setup/windows/Drivers/Extras/Samsung Tools & Software.url b/setup/windows/Drivers/Extras/Samsung Tools & Software.url
deleted file mode 100644
index 4e78090b..00000000
--- a/setup/windows/Drivers/Extras/Samsung Tools & Software.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-IDList=
-URL=http://www.samsung.com/semiconductor/minisite/ssd/download/tools.html
diff --git a/setup/windows/Installers/BackBlaze.url b/setup/windows/Installers/BackBlaze.url
deleted file mode 100644
index 117de4e4..00000000
--- a/setup/windows/Installers/BackBlaze.url
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-URL=https://www.backblaze.com/gen/install_backblaze-af9duk
-IDList=
diff --git a/setup/windows/Misc/Fix Missing Optical Drive.reg b/setup/windows/Misc/Fix Missing Optical Drive.reg
deleted file mode 100644
index 75920302..00000000
--- a/setup/windows/Misc/Fix Missing Optical Drive.reg	
+++ /dev/null
@@ -1,6 +0,0 @@
-Windows Registry Editor Version 5.00
-
-;Delete entries acording to http://support.microsoft.com/kb/314060
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}]
-"UpperFilters"=-
-"LowerFilters"=-
\ No newline at end of file
diff --git a/setup/windows/Misc/Nirsoft Utilities - Outlook.url b/setup/windows/Misc/Nirsoft Utilities - Outlook.url
deleted file mode 100644
index 4c29ee45..00000000
--- a/setup/windows/Misc/Nirsoft Utilities - Outlook.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-IDList=
-URL=http://www.nirsoft.net/outlook_office_software.html
-HotKey=0
diff --git a/setup/windows/Misc/Nirsoft Utilities - Passwords.url b/setup/windows/Misc/Nirsoft Utilities - Passwords.url
deleted file mode 100644
index 9a94bfcb..00000000
--- a/setup/windows/Misc/Nirsoft Utilities - Passwords.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-IDList=
-URL=http://www.nirsoft.net/password_recovery_tools.html
-HotKey=0
diff --git a/setup/windows/Misc/Sysinternals Suite (Live).url b/setup/windows/Misc/Sysinternals Suite (Live).url
deleted file mode 100644
index 8c05d050..00000000
--- a/setup/windows/Misc/Sysinternals Suite (Live).url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-IDList=
-URL=http://live.sysinternals.com/
diff --git a/setup/windows/Uninstallers/AV Removal Tools/AV Removal Tools.url b/setup/windows/Uninstallers/AV Removal Tools/AV Removal Tools.url
deleted file mode 100644
index 2e7c0cdd..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/AV Removal Tools.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://kb.eset.com/esetkb/index?page=content&id=SOLN146
-IDList=
diff --git a/setup/windows/Uninstallers/AV Removal Tools/AVG.url b/setup/windows/Uninstallers/AV Removal Tools/AVG.url
deleted file mode 100644
index 11225565..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/AVG.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.avg.com/us-en/utilities
-IDList=
diff --git a/setup/windows/Uninstallers/AV Removal Tools/Avast.url b/setup/windows/Uninstallers/AV Removal Tools/Avast.url
deleted file mode 100644
index 9b75b640..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/Avast.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://files.avast.com/iavs9x/avastclear.exe
-IDList=
-HotKey=0
diff --git a/setup/windows/Uninstallers/AV Removal Tools/Avira.url b/setup/windows/Uninstallers/AV Removal Tools/Avira.url
deleted file mode 100644
index 7d78f29e..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/Avira.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://dlpro.antivir.com/package/regcleaner/win32/en/avira_registry_cleaner_en.zip
-IDList=
-HotKey=0
diff --git a/setup/windows/Uninstallers/AV Removal Tools/ESET.url b/setup/windows/Uninstallers/AV Removal Tools/ESET.url
deleted file mode 100644
index a7d04ad8..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/ESET.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://download.eset.com/special/ESETUninstaller.exe
-IDList=
-HotKey=0
diff --git a/setup/windows/Uninstallers/AV Removal Tools/Kaspersky.url b/setup/windows/Uninstallers/AV Removal Tools/Kaspersky.url
deleted file mode 100644
index 9edc0ea8..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/Kaspersky.url	
+++ /dev/null
@@ -1,6 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://media.kaspersky.com/utilities/ConsumerUtilities/kavremvr.exe
-IDList=
-HotKey=0
diff --git a/setup/windows/Uninstallers/AV Removal Tools/MBAM.url b/setup/windows/Uninstallers/AV Removal Tools/MBAM.url
deleted file mode 100644
index e29e24c4..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/MBAM.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.malwarebytes.org/mbam-clean.exe
-IDList=
diff --git a/setup/windows/Uninstallers/AV Removal Tools/McAfee.url b/setup/windows/Uninstallers/AV Removal Tools/McAfee.url
deleted file mode 100644
index b18f3fba..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/McAfee.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://download.mcafee.com/products/licensed/cust_support_patches/MCPR.exe
-IDList=
diff --git a/setup/windows/Uninstallers/AV Removal Tools/Norton.url b/setup/windows/Uninstallers/AV Removal Tools/Norton.url
deleted file mode 100644
index 0eec5fff..00000000
--- a/setup/windows/Uninstallers/AV Removal Tools/Norton.url	
+++ /dev/null
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,1
-[InternetShortcut]
-URL=ftp://ftp.symantec.com/public/english_us_canada/removal_tools/Norton_Removal_Tool.exe
-IDList=
diff --git a/setup/windows/cbin/_include/AIDA64/basic.rpf b/setup/windows/bin/AIDA64/basic.rpf
similarity index 100%
rename from setup/windows/cbin/_include/AIDA64/basic.rpf
rename to setup/windows/bin/AIDA64/basic.rpf
diff --git a/setup/windows/bin/_Drivers/SDIO/sdi.cfg b/setup/windows/bin/SDIO/sdi.cfg
similarity index 100%
rename from setup/windows/bin/_Drivers/SDIO/sdi.cfg
rename to setup/windows/bin/SDIO/sdi.cfg
diff --git a/setup/windows/cbin/_include/BleachBit/BleachBit.ini b/setup/windows/cbin/BleachBit/BleachBit.ini
similarity index 100%
rename from setup/windows/cbin/_include/BleachBit/BleachBit.ini
rename to setup/windows/cbin/BleachBit/BleachBit.ini
diff --git a/setup/windows/cbin/_include/NotepadPlusPlus/config.xml b/setup/windows/cbin/NotepadPlusPlus/config.xml
similarity index 100%
rename from setup/windows/cbin/_include/NotepadPlusPlus/config.xml
rename to setup/windows/cbin/NotepadPlusPlus/config.xml
diff --git a/setup/windows/cbin/_include/XMPlay/xmplay.ini b/setup/windows/cbin/XMPlay/xmplay.ini
similarity index 100%
rename from setup/windows/cbin/_include/XMPlay/xmplay.ini
rename to setup/windows/cbin/XMPlay/xmplay.ini
diff --git a/setup/windows/cbin/_include/XYplorerFree/Data/XYplorer.ini b/setup/windows/cbin/XYplorerFree/Data/XYplorer.ini
similarity index 100%
rename from setup/windows/cbin/_include/XYplorerFree/Data/XYplorer.ini
rename to setup/windows/cbin/XYplorerFree/Data/XYplorer.ini
diff --git a/setup/windows/cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt b/setup/windows/cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt
deleted file mode 100644
index 4f6d46da..00000000
--- a/setup/windows/cbin/_include/_Drivers/Intel RST/SetupRST_13.x.txt	
+++ /dev/null
@@ -1 +0,0 @@
-Broken. "requires" .NET 4.5 but fails to accept .NET 4.6 or newer (which we install).
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2016_hb_32.xml b/setup/windows/cbin/_include/_Office/2016_hb_32.xml
deleted file mode 100644
index 7e95c225..00000000
--- a/setup/windows/cbin/_include/_Office/2016_hb_32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="32" Channel="Current">
-    <Product ID="HomeBusinessRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2016_hb_64.xml b/setup/windows/cbin/_include/_Office/2016_hb_64.xml
deleted file mode 100644
index 6482438b..00000000
--- a/setup/windows/cbin/_include/_Office/2016_hb_64.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="64" Channel="Current">
-    <Product ID="HomeBusinessRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2016_hs_32.xml b/setup/windows/cbin/_include/_Office/2016_hs_32.xml
deleted file mode 100644
index 1d034da0..00000000
--- a/setup/windows/cbin/_include/_Office/2016_hs_32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="32" Channel="Current">
-    <Product ID="HomeStudentRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2016_hs_64.xml b/setup/windows/cbin/_include/_Office/2016_hs_64.xml
deleted file mode 100644
index 4c636636..00000000
--- a/setup/windows/cbin/_include/_Office/2016_hs_64.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="64" Channel="Current">
-    <Product ID="HomeStudentRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2019_hb_32.xml b/setup/windows/cbin/_include/_Office/2019_hb_32.xml
deleted file mode 100644
index d98dd66a..00000000
--- a/setup/windows/cbin/_include/_Office/2019_hb_32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="32" Channel="Current">
-    <Product ID="HomeBusiness2019Retail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2019_hb_64.xml b/setup/windows/cbin/_include/_Office/2019_hb_64.xml
deleted file mode 100644
index 29e10c4f..00000000
--- a/setup/windows/cbin/_include/_Office/2019_hb_64.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="64" Channel="Current">
-    <Product ID="HomeBusiness2019Retail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2019_hs_32.xml b/setup/windows/cbin/_include/_Office/2019_hs_32.xml
deleted file mode 100644
index 3fc1606a..00000000
--- a/setup/windows/cbin/_include/_Office/2019_hs_32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="32" Channel="Current">
-    <Product ID="HomeStudent2019Retail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/2019_hs_64.xml b/setup/windows/cbin/_include/_Office/2019_hs_64.xml
deleted file mode 100644
index 3d2956fd..00000000
--- a/setup/windows/cbin/_include/_Office/2019_hs_64.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="64" Channel="Current">
-    <Product ID="HomeStudent2019Retail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/365_32.xml b/setup/windows/cbin/_include/_Office/365_32.xml
deleted file mode 100644
index 093542a6..00000000
--- a/setup/windows/cbin/_include/_Office/365_32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="32" Channel="Current">
-    <Product ID="O365ProPlusRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_Office/365_64.xml b/setup/windows/cbin/_include/_Office/365_64.xml
deleted file mode 100644
index d2b6862a..00000000
--- a/setup/windows/cbin/_include/_Office/365_64.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configuration>
-  <Add OfficeClientEdition="64" Channel="Current">
-    <Product ID="O365ProPlusRetail">
-      <Language ID="en-us" />
-    </Product>
-  </Add>
-</Configuration>
\ No newline at end of file
diff --git a/setup/windows/cbin/_include/_vcredists/InstallAll.bat b/setup/windows/cbin/_include/_vcredists/InstallAll.bat
deleted file mode 100644
index 5d935b34..00000000
--- a/setup/windows/cbin/_include/_vcredists/InstallAll.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-setlocal
-
-start "" /wait "2010\x32\vcredist.exe" /passive /norestart
-start "" /wait "2010\x64\vcredist.exe" /passive /norestart
-
-start "" /wait "2012u4\x32\vcredist.exe" /passive /norestart
-start "" /wait "2012u4\x64\vcredist.exe" /passive /norestart
-
-start "" /wait "2013\x32\vcredist.exe" /install /passive /norestart
-start "" /wait "2013\x64\vcredist.exe" /install /passive /norestart
-
-start "" /wait "2015u3\x32\vcredist.exe" /install /passive /norestart
-start "" /wait "2015u3\x64\vcredist.exe" /install /passive /norestart
-
-start "" /wait "2017\x32\vcredist.exe" /install /passive /norestart
-start "" /wait "2017\x64\vcredist.exe" /install /passive /norestart
-
-endlocal