diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj
index bbebd1a2..d75069e2 100644
--- a/platforms/Windows/bld/bld.wixproj
+++ b/platforms/Windows/bld/bld.wixproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
       TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index 294a8df5..127b6738 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -352,40 +352,40 @@
 
     <ComponentGroup Id="argument_parser" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ArgumentParser.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="tools_support_core" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCUtility.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_driver" Directory="_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
       <Component>
-        <File Name="swiftc.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
+        <File Name="swiftc.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
       </Component>
 
       <Component>
-        <File Name="swift.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
+        <File Name="swift.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-help.exe" />
       </Component>
 
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.dll" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 4ab56054..70f8d952 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -6,12 +6,13 @@
     <VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
     <DefineConstants>
       $(DefineConstants);
-      INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
-      INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
-      ANDROID_INCLUDE_ARM64_SDK=$(ANDROID_INCLUDE_ARM64_SDK);
-      ANDROID_INCLUDE_x86_64_SDK=$(ANDROID_INCLUDE_x86_64_SDK);
-      ANDROID_INCLUDE_ARM_SDK=$(ANDROID_INCLUDE_ARM_SDK);
-      ANDROID_INCLUDE_X86_SDK=$(ANDROID_INCLUDE_X86_SDK);
+      INCLUDE_ANDROID_ARM_SDK=$(INCLUDE_ANDROID_ARM_SDK);
+      INCLUDE_ANDROID_ARM64_SDK=$(INCLUDE_ANDROID_ARM64_SDK);
+      INCLUDE_ANDROID_X86_SDK=$(INCLUDE_ANDROID_X86_SDK);
+      INCLUDE_ANDROID_X86_64_SDK=$(INCLUDE_ANDROID_X86_64_SDK);
+      INCLUDE_WINDOWS_AMD64_SDK=$(INCLUDE_WINDOWS_AMD64_SDK);
+      INCLUDE_WINDOWS_ARM64_SDK=$(INCLUDE_WINDOWS_ARM64_SDK);
+      INCLUDE_WINDOWS_X86_SDK=$(INCLUDE_WINDOWS_X86_SDK);
     </DefineConstants>
   </PropertyGroup>
 
@@ -25,30 +26,33 @@
     <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="sdk_amd64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
+  <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
+  <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM64_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_sdk_aarch64" />
+  <ItemGroup Condition=" '$(INCLUDE_ANDROID_X86_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_i686_sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(ANDROID_INCLUDE_x86_64_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_sdk_x86_64" />
+  <ItemGroup Condition=" '$(INCLUDE_ANDROID_x86_64_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_x86_64_sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_sdk_armv7" />
+  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_AMD64_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="windows_amd64_sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(ANDROID_INCLUDE_X86_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
+  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 1137736c..7e9d5786 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -27,22 +27,28 @@
     -->
     <Variable Name="InstallRoot" bal:Overridable="yes" Type="formatted" Persisted="yes"
       Value="[LocalAppDataFolder]Programs\Swift" />
-    <Variable Name="OptionsInstallBld" Value="1" />
-    <Variable Name="OptionsInstallCli" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallDbg" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallIde" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallRtl" Value="1" />
-    <Variable Name="OptionsInstallUtl" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallAndroidSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallAndroidSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallAndroidSdkArm" bal:Overridable="yes" Persisted="yes" Value="0" />
-    <Variable Name="OptionsInstallAndroidSdkX86" bal:Overridable="yes" Persisted="yes" Value="0" />
+
+    <Variable Name="OptionsInstallBLD" Value="1" />
+    <Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallRTL" Value="1" />
+
+    <Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />
+
+    <Variable Name="OptionsInstallWindowsSDKX86" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallWindowsRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
+
+    <Variable Name="OptionsInstallWindowsSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallWindowsRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
+
+    <Variable Name="OptionsInstallWindowsSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallWindowsRedistARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
+
+    <Variable Name="OptionsInstallAndroidSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallAndroidSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallAndroidSDKARM" bal:Overridable="yes" Persisted="yes" Value="0" />
+    <Variable Name="OptionsInstallAndroidSDKX86" bal:Overridable="yes" Persisted="yes" Value="0" />
 
     <!--
     For the online bundle, we need to provide a download URL for each package and its .cabs.
@@ -68,7 +74,7 @@
         SourceFile="!(bindpath.rtl)\rtl.msi"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtl]" />
+        <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
       </MsiPackage>
 
       <MsiPackage
@@ -79,86 +85,88 @@
 
       <MsiPackage
         SourceFile="!(bindpath.cli)\cli.msi"
-        InstallCondition="OptionsInstallCli = 1"
+        InstallCondition="OptionsInstallCLI = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
       <MsiPackage
         SourceFile="!(bindpath.dbg)\dbg.msi"
-        InstallCondition="OptionsInstallDbg = 1"
+        InstallCondition="OptionsInstallDBG = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
       <MsiPackage
         SourceFile="!(bindpath.ide)\ide.msi"
-        InstallCondition="OptionsInstallIde = 1"
+        InstallCondition="OptionsInstallIDE = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_X86_SDK) == true?>
+      <?if $(INCLUDE_ANDROID_ARM_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi"
-          InstallCondition="OptionsInstallSdkX86 = 1"
+          SourceFile="!(bindpath.android_armv7_sdk)\sdk.android.armv7.msi"
+          InstallCondition="OptionsInstallAndroidSDKARM = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" />
         </MsiPackage>
       <?endif?>
 
-      <MsiPackage
-        SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi"
-        InstallCondition="OptionsInstallSdkAMD64 = 1"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistAMD64]" />
-      </MsiPackage>
+      <?if $(INCLUDE_ANDROID_ARM64_SDK) == true ?>
+        <MsiPackage
+          SourceFile="!(bindpath.android_aarch64_sdk)\sdk.android.aarch64.msi"
+          InstallCondition="OptionsInstallAndroidSDKARM64 = 1"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
 
-      <?if $(INCLUDE_ARM64_SDK) == true ?>
+      <?if $(INCLUDE_ANDROID_X86_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.sdk_arm64)\sdk.arm64.msi"
-          InstallCondition="OptionsInstallSdkArm64 = 1"
+          SourceFile="!(bindpath.android_i686_sdk)\sdk.android.i686.msi"
+          InstallCondition="OptionsInstallAndroidSDKX86 = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
         </MsiPackage>
       <?endif?>
 
-      <?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?>
+      <?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
-          InstallCondition="OptionsInstallAndroidSdkArm64 = 1"
+          SourceFile="!(bindpath.android_x86_64_sdk)\sdk.android.x86_64.msi"
+          InstallCondition="OptionsInstallAndroidSDKAMD64 = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
         </MsiPackage>
       <?endif?>
 
-      <?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?>
+      <?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi"
-          InstallCondition="OptionsInstallAndroidSdkAMD64 = 1"
+          SourceFile="!(bindpath.windows_amd64_sdk)\sdk.windows.amd64.msi"
+          InstallCondition="OptionsInstallWindowsSDKAMD64 = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
         </MsiPackage>
       <?endif?>
 
-      <?if $(ANDROID_INCLUDE_ARM_SDK) == true ?>
+      <?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi"
-          InstallCondition="OptionsInstallAndroidSdkArm = 1"
+          SourceFile="!(bindpath.windows_arm64_sdk)\sdk.windows.arm64.msi"
+          InstallCondition="OptionsInstallWindowsSDKARM64 = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" />
         </MsiPackage>
       <?endif?>
 
-      <?if $(ANDROID_INCLUDE_X86_SDK) == true ?>
+      <?if $(INCLUDE_WINDOWS_X86_SDK) == true?>
         <MsiPackage
-          SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi"
-          InstallCondition="OptionsInstallAndroidSdkX86 = 1"
+          SourceFile="!(bindpath.windows_x86_sdk)\sdk.windows.x86.msi"
+          InstallCondition="OptionsInstallWindowsSDKX86 = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" />
         </MsiPackage>
       <?endif?>
      </Chain>
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index aaf9f129..1144b068 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -56,21 +56,21 @@
             </Button>
 
             <Label X="176" Y="111" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBld" X="176" Y="141" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCli" X="176" Y="159" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDbg" X="176" Y="177" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIde" X="176" Y="195" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallRtl" X="176" Y="213" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallSdkAMD64" X="176" Y="231" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistAMD64" X="194" Y="249" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkAMD64">#(loc.Redist_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallSdkArm64" X="176" Y="267" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistArm64" X="194" Y="285" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkArm64">#(loc.Redist_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallSdkX86" X="176" Y="303" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistX86" X="194" Y="321" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkX86">#(loc.Redist_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSdkArm64" X="176" Y="339" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSdkAMD64" X="176" Y="357" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSdkArm" X="176" Y="375" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSdkX86" X="176" Y="393" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallBLD" X="176" Y="141" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="176" Y="159" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="176" Y="177" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="176" Y="195" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallRTL" X="176" Y="213" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallSDKAMD64" X="176" Y="231" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallRedistAMD64" X="194" Y="249" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKAMD64">#(loc.Redist_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallSDKARM64" X="176" Y="267" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallRedistARM64" X="194" Y="285" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKArm64">#(loc.Redist_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallSDKX86" X="176" Y="303" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallRedistX86" X="194" Y="321" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKX86">#(loc.Redist_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM4" X="176" Y="339" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="176" Y="357" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM" X="176" Y="375" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKX86" X="176" Y="393" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_x86)</Checkbox>
 
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
index c4366751..88f83903 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/cli.wixproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
       INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index e7921306..e7f64c2c 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -112,73 +112,73 @@
 
     <ComponentGroup Id="collections" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\Collections.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Collections.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\DequeModule.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\OrderedCollections.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="llbuild" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llbuildSwift.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="system" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SystemPackage.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
       </Component>
     </ComponentGroup>
 
@@ -188,53 +188,53 @@
       <ComponentGroupRef Id="PackagePlugin" />
 
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-build.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-build.exe" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-package.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-package.exe" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-run.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-run.exe" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-test.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-test.exe" />
       </Component>
 
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\Basics.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Basics.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\Build.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Build.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\Commands.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Commands.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\CoreCommands.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\DriverSupport.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageGraph.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageLoading.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModel.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModelSyntax.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModelSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SourceControl.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SourceControl.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SPMBuildCore.dll" />
       </Component>
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\Workspace.dll" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Workspace.dll" />
       </Component>
 
       <!-- FIXME(compnerd) we should include the SPM import libraries -->
diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj
index ed9bd07a..70298d5b 100644
--- a/platforms/Windows/dbg/dbg.wixproj
+++ b/platforms/Windows/dbg/dbg.wixproj
@@ -2,10 +2,7 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
-      SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD);
-      INCLUDE_SWIFT_INSPECT=$(INCLUDE_SWIFT_INSPECT);
     </DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs
index 23c18d61..50092278 100644
--- a/platforms/Windows/dbg/dbg.wxs
+++ b/platforms/Windows/dbg/dbg.wxs
@@ -105,14 +105,10 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_inspect" Directory="ToolsVersioned">
-      <?if $(INCLUDE_SWIFT_INSPECT) == true ?>
-        <Component Id="swift_inspect.exe">
-          <File Source="$(SWIFT_INSPECT_BUILD)\swift-inspect.exe" />
-        </Component>
-
-        <ComponentRef Id="SystemToolsEnvironmentVariables" />
-      <?endif?>
+    <ComponentGroup Id="swift_inspect">
+      <Component Directory="_usr_bin">
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-inspect.exe" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="_usr_include__InternalSwiftStaticMirror">
diff --git a/platforms/Windows/ide/ide.wixproj b/platforms/Windows/ide/ide.wixproj
index 1aaf7911..84df0a38 100644
--- a/platforms/Windows/ide/ide.wixproj
+++ b/platforms/Windows/ide/ide.wixproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
     </DefineConstants>
   </PropertyGroup>
diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs
index 0295ebee..94c952c7 100644
--- a/platforms/Windows/ide/ide.wxs
+++ b/platforms/Windows/ide/ide.wxs
@@ -44,7 +44,7 @@
 
     <ComponentGroup Id="lsp" Directory="_usr_bin">
       <Component>
-        <File Source="$(DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" />
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\sourcekit-lsp.exe" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index 664206f7..ea69a063 100644
--- a/platforms/Windows/readme.md
+++ b/platforms/Windows/readme.md
@@ -32,14 +32,20 @@ The bundle authoring (in `installer.wxs`) drives optional install directory and
 | Variable | Description |
 | -------- | ----------- |
 | InstallRoot | A formatted string variable that specifies the installation root directory. The default value specified in `installer.wxs` should match the equivalent `INSTALLROOT` authoring in `shared.wxs`. The bundle variable is passed to each `MsiPackage` so overwrites the default directory authored in the MSI packages -- but keeping them in sync avoids the confusion if the default directory should change. |
-| OptionsInstallBld | Controls whether bld.msi will be installed. |
-| OptionsInstallCli | Controls whether cli.msi will be installed. |
-| OptionsInstallDbg | Controls whether dbg.msi will be installed. |
-| OptionsInstallIde | Controls whether ide.msi will be installed. |
-| OptionsInstallRtl | Controls whether rtl.msi will be installed. |
-| OptionsInstallSdkX86 | Controls whether the x86 SDK will be installed. |
-| OptionsInstallSdkAMD64 | Controls whether the AMD64 SDK will be installed. |
-| OptionsInstallSdkArm64 | Controls whether the Arm64 SDK will be installed. |
+| OptionsInstallCLI | Controls whether command-line tools will be installed. |
+| OptionsInstallDBG | Controls whether debugging tools will be installed. |
+| OptionsInstallIDE | Controls whether IDE integration tools will be installed. |
+| OptionsInstallUtilties | Controls whether additional utilities will be installed. |
+| OptionsInstallAndroidSDKAMD64 | Controls whether the Android AMD64 SDK will be installed. |
+| OptionsInstallAndroidSDKARM | Controls whether the Android ARM SDK will be installed. |
+| OptionsInstallAndroidSDKARM64 | Controls whether the Android ARM64 SDK will be installed. |
+| OptionsInstallAndroidSDKX86 | Controls whether the Android X86 SDK will be installed. |
+| OptionsInstallWindowsSDKX86 | Controls whether the Windows X86 SDK will be installed. |
+| OptionsInstallWindowsRedistAMD64 | Controls whether the Windows AMD64 Redistributable MSM will be installed. |
+| OptionsInstallWindowsSDKAMD64 | Controls whether the Windows AMD64 SDK will be installed. |
+| OptionsInstallWindowsRedistARM64 | Controls whether the Windows ARM64 Redistributable MSM will be installed. |
+| OptionsInstallWindowsSDKX86 | Controls whether the Windows X86 SDK will be installed. |
+| OptionsInstallWindowsRedistX86 | Controls whether the Windows X86 Redistributable MSM will be installed. |
 
 Those variables are tied to controls in the bundle theme (`installer\theme.xml`) on the Options page. For example, the install directory is an `Editbox` control that takes the `InstallRoot` name to tie itself to the `InstallRoot` variable in `installer.wxs`:
 
@@ -50,7 +56,7 @@ Those variables are tied to controls in the bundle theme (`installer\theme.xml`)
 Likewise, the feature selection controls are all checkboxes tied to the variables that control feature selection:
 
 ```xml
-<Checkbox Name="OptionsInstallIde" X="185" Y="170" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsInstallIde)</Checkbox>
+<Checkbox Name="OptionsInstallIDE" X="185" Y="170" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsInstallIDE)</Checkbox>
 ```
 
 `Checkbox` controls set variables to `1` when checked and `0` when unchecked.
@@ -60,7 +66,7 @@ The variables are used in `installer.wxs` bundle authoring to control the instal
 ```xml
 <MsiPackage
   SourceFile="!(bindpath.ide)\ide.msi"
-  InstallCondition="OptionsInstallIde = 1"
+  InstallCondition="OptionsInstallIDE = 1"
   DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
   <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
 </MsiPackage>
@@ -81,7 +87,7 @@ The same variables that drive install directory and feature selection are availa
 
 
 ```sh
-installer.exe /passive InstallRoot=X:\Swift OptionsInstallIde=0 OptionsInstallSdkX86=0 OptionsInstallSdkArm64=0
+installer.exe /passive InstallRoot=X:\Swift OptionsInstallIDE=0 OptionsInstallWindowsSDKX86=0 OptionsInstallWindowsSDKARM64=0
 ```
 
 To create a layout from a online bundle to allow for offline install:
@@ -106,8 +112,8 @@ MSBuild automatically imports Directory.Build.props files in your tree. We use D
 | ArePackageCabsEmbedded | Always set to false to keep the .cab files external to the .msi files. This save user disk space: Burn caches packages so it can always uninstall and repair. MSI also caches packages for uninstall. If the cab is embedded, you have two copies and MSI doesn't always use its cached copy as a source for repair. With an external .cab, MSI caches only the tiny .msi file and not the (relatively huge) .cab. |
 | BundleFlavor, IsBundleCompressed | BundleFlavor defaults to `online` to build an online bundle. Set by the invocation of MSBuild to build an online or offline bundle. Controls IsBundleCompressed. |
 | DefineConstants | Passes a subset of MSBuild properties into the WiX build as preprocessor variables. |
-| INCLUDE_SWIFT_INSPECT | swift-inspect is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_INSPECT_BUILD` defines the directory to find the artifacts. |
-| INCLUDE_X86_SDK, INCLUDE_ARM64_SDK | The x86 and Arm64 SDKs are currently conditionalized out, pending build changes. Set these to `true` to include them in the bundles. Note that bundle\theme.xml currently has commented-out checkboxes that need to be restored when the x86 and Arm64 SDKs are brought back. |
+| INCLUDE_SWIFT_DOCC | swift-docc is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_DOCC_BUILD` defines the directory to find the artifacts. |
+| INCLUDE_ANDROID_ARM_SDK, INCLUDE_ANDROID_ARM64_SDK, INCLUDE_ANDROID_X86_SDK, INCLUDE_ANDROID_x86_64_SDK, INCLUDE_WINDOWS_AMD64_SDK, INCLUDE_WINDOWS_ARM64_SDK, INCLUDE_WINDOWS_X86_SDK | The included SDKs are currently conditionalized out. Set these to `true` to include them in the bundles. |
 
 
 ## SDKs
@@ -165,7 +171,6 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
   -p:BaseReleaseDownloadUrl=todo://base/release/download/url ^
   -p:Configuration=Release ^
   -p:BaseOutputPath=%PackageRoot%\online\ ^
-  -p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
   -p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
   -p:PLATFORM_ROOT_X86=path\to\x86\platform ^
   -p:PLATFORM_ROOT_AMD64=path\to\amd64\platform ^
diff --git a/platforms/Windows/android_sdk/android_sdk.wixproj b/platforms/Windows/sdk/drd/sdk.wixproj
similarity index 87%
rename from platforms/Windows/android_sdk/android_sdk.wixproj
rename to platforms/Windows/sdk/drd/sdk.wixproj
index 5d5bd4fc..064f0d69 100644
--- a/platforms/Windows/android_sdk/android_sdk.wixproj
+++ b/platforms/Windows/sdk/drd/sdk.wixproj
@@ -1,6 +1,6 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <OutputName>android_sdk.$(ProductArchitecture)</OutputName>
+    <OutputName>sdk.android.$(ProductArchitecture)</OutputName>
     <Platform>x86</Platform>
 
     <SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>
@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\shared\shared.wixproj" />
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/sdk/drd/sdk.wxs
similarity index 99%
rename from platforms/Windows/android_sdk/android_sdk.wxs
rename to platforms/Windows/sdk/drd/sdk.wxs
index 9f1df9c8..ae238b1b 100644
--- a/platforms/Windows/android_sdk/android_sdk.wxs
+++ b/platforms/Windows/sdk/drd/sdk.wxs
@@ -40,7 +40,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="android_sdk.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="sdk.android.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(AndroidSDKUpgradeCode)" />
 
diff --git a/platforms/Windows/sdk/sdk.wixproj b/platforms/Windows/sdk/win/sdk.wixproj
similarity index 51%
rename from platforms/Windows/sdk/sdk.wixproj
rename to platforms/Windows/sdk/win/sdk.wixproj
index ce51bdae..cd84a9ed 100644
--- a/platforms/Windows/sdk/sdk.wixproj
+++ b/platforms/Windows/sdk/win/sdk.wixproj
@@ -1,6 +1,6 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <OutputName>sdk.$(ProductArchitecture)</OutputName>
+    <OutputName>sdk.windows.$(ProductArchitecture)</OutputName>
     <Platform>x86</Platform>
 
     <SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>
@@ -22,18 +22,18 @@
   Shared .wixlibs used by other, "normal" packages.
   -->
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=x86;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=x86;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=amd64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=amd64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/win/sdk.wxs
similarity index 99%
rename from platforms/Windows/sdk/sdk.wxs
rename to platforms/Windows/sdk/win/sdk.wxs
index a408f2d1..eecad8f9 100644
--- a/platforms/Windows/sdk/sdk.wxs
+++ b/platforms/Windows/sdk/win/sdk.wxs
@@ -23,7 +23,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="sdk.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="sdk.windows.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsSDKUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index b983040e..b1dd1330 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -59,20 +59,6 @@
     </DirectoryRef>
   </Fragment>
 
-  <Fragment>
-    <DirectoryRef Id="INSTALLROOT">
-      <Directory Name="Tools">
-        <Directory Id="ToolsVersioned" Name="$(ProductVersion)" />
-      </Directory>
-    </DirectoryRef>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="SystemToolsEnvironmentVariables" Guid="5BA7803B-1EA5-45D3-8FD7-C75518C2C099" Directory="ToolsVersioned">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[ToolsVersioned]" />
-    </Component>
-  </Fragment>
-
   <!--
   Use RemoveFolderEx to clean up the empty subdirectories Windows Installer
   leaves when there are other directory siblings left behind, as happens when
@@ -100,11 +86,6 @@
         <RegistryValue Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersioned" Value="[ToolchainsVersioned]" />
         <util:RemoveFolderEx Property="TOOLCHAINSVERSIONED" Condition="TOOLCHAINSVERSIONED" />
       </Component>
-
-      <Component Id="VersionedDirectoryCleanupTools">
-        <RegistryValue Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolsVersioned" Value="[ToolsVersioned]" />
-        <util:RemoveFolderEx Property="TOOLSVERSIONED" Condition="TOOLSVERSIONED" />
-      </Component>
     </ComponentGroup>
 
     <Property Id="PLATFORMSVERSIONED">
@@ -122,10 +103,6 @@
     <Property Id="TOOLCHAINSVERSIONED">
       <RegistrySearch Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersioned" Type="directory" />
     </Property>
-
-    <Property Id="TOOLSVERSIONED">
-      <RegistrySearch Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolsVersioned" Type="directory" />
-    </Property>
   </Fragment>
 
   <!--