diff --git a/documentation/general/workloads/workload-finalizer.md b/documentation/general/workloads/workload-finalizer.md
index 9c127a43b908..b361e57d6851 100644
--- a/documentation/general/workloads/workload-finalizer.md
+++ b/documentation/general/workloads/workload-finalizer.md
@@ -2,4 +2,4 @@
 
 When the .NET SDK is uninstalled, any workloads that were installed with that SDK should also be uninstalled.  In order to do this when uninstalling an SDK which was installed via the standalone EXE installer bundle, there is a piece of native code called the finalizer.  The finalizer removes any reference counts on workload packs and manifests from the SDK that is being uninstalled, and uninstalls any MSIs which then have no reference counts.
 
-The finalizer code is here: https://github.com/dotnet/installer/tree/main/src/finalizer
\ No newline at end of file
+The finalizer code is [here](/src/Layout/finalizer/README.md)
\ No newline at end of file
diff --git a/eng/Build.props b/eng/Build.props
index 5b44646015ed..e14d248b9fd2 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -13,7 +13,7 @@
        it depends on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(OS)' == 'Windows_NT'">
-    <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 1cd123606659..a725552b67b3 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -29,7 +29,7 @@
 
   <Target Name="GetNonStableProductVersion">
     <!-- Retrieve the non-stable product version. -->
-    <MSBuild Projects="$(RepoRoot)src/Installer/redist-installer/redist-installer.proj"
+    <MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
              Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
     </MSBuild>
diff --git a/sdk.sln b/sdk.sln
index da43f07f8aa1..cd031374bf2a 100644
--- a/sdk.sln
+++ b/sdk.sln
@@ -485,11 +485,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{3FA6F1CB-295B-4414-B18F-93845917A8CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Installer\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Layout\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Installer\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Installer\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Redist.Common.Net.Core.SDK.VSTemplateLocator", "src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
 EndProject
diff --git a/source-build.slnf b/source-build.slnf
index 78816b6d17ee..7ff7f4b2ebe1 100644
--- a/source-build.slnf
+++ b/source-build.slnf
@@ -20,8 +20,8 @@
       "src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
       "src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
       "src\\Containers\\packaging\\package.csproj",
-      "src\\Installer\\redist-installer\\redist-installer.proj",
-      "src\\Installer\\pkg\\dotnet-sdk.proj",
+      "src\\Layout\\redist-installer\\redist-installer.proj",
+      "src\\Layout\\pkg\\dotnet-sdk.proj",
       "src\\Layout\\redist\\redist.csproj",
       "src\\Layout\\redist\\tools\\tool_fsc.csproj",
       "src\\Layout\\redist\\tools\\tool_msbuild.csproj",
diff --git a/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj b/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj
index ec27d4208e18..8dc2f3c15e12 100644
--- a/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj
+++ b/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Net.Sdk.AnalyzerRedirecting\Microsoft.Net.Sdk.AnalyzerRedirecting.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
   </ItemGroup>
 
   <!-- Shared infra to build and use the sdk-tasks -->
diff --git a/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj b/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj
index e71943ff3b74..97107e24572b 100644
--- a/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj
+++ b/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
   </ItemGroup>
 
   <Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
diff --git a/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj b/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj
index d70ef30b6953..c24dda225121 100644
--- a/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj
+++ b/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
   </ItemGroup>
 
   <Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
diff --git a/src/Installer/finalizer/CMakeLists.txt b/src/Layout/finalizer/CMakeLists.txt
similarity index 100%
rename from src/Installer/finalizer/CMakeLists.txt
rename to src/Layout/finalizer/CMakeLists.txt
diff --git a/src/Installer/finalizer/Directory.Build.props b/src/Layout/finalizer/Directory.Build.props
similarity index 52%
rename from src/Installer/finalizer/Directory.Build.props
rename to src/Layout/finalizer/Directory.Build.props
index 79225ac8b807..d9dd5e292e07 100644
--- a/src/Installer/finalizer/Directory.Build.props
+++ b/src/Layout/finalizer/Directory.Build.props
@@ -4,6 +4,6 @@
     <SetPlatformFromArchitecture>true</SetPlatformFromArchitecture>
   </PropertyGroup>
 
-  <Import Project="..\..\..\Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>
\ No newline at end of file
diff --git a/src/Installer/finalizer/README.md b/src/Layout/finalizer/README.md
similarity index 100%
rename from src/Installer/finalizer/README.md
rename to src/Layout/finalizer/README.md
diff --git a/src/Installer/finalizer/finalizer-build.csproj b/src/Layout/finalizer/finalizer-build.csproj
similarity index 100%
rename from src/Installer/finalizer/finalizer-build.csproj
rename to src/Layout/finalizer/finalizer-build.csproj
diff --git a/src/Installer/finalizer/finalizer.cpp b/src/Layout/finalizer/finalizer.cpp
similarity index 100%
rename from src/Installer/finalizer/finalizer.cpp
rename to src/Layout/finalizer/finalizer.cpp
diff --git a/src/Installer/finalizer/finalizer.nativeproj b/src/Layout/finalizer/finalizer.nativeproj
similarity index 100%
rename from src/Installer/finalizer/finalizer.nativeproj
rename to src/Layout/finalizer/finalizer.nativeproj
diff --git a/src/Installer/finalizer/native.rc b/src/Layout/finalizer/native.rc
similarity index 100%
rename from src/Installer/finalizer/native.rc
rename to src/Layout/finalizer/native.rc
diff --git a/src/Installer/finalizer/precomp.h b/src/Layout/finalizer/precomp.h
similarity index 100%
rename from src/Installer/finalizer/precomp.h
rename to src/Layout/finalizer/precomp.h
diff --git a/src/Installer/pkg/deb/postinst b/src/Layout/pkg/deb/postinst
similarity index 100%
rename from src/Installer/pkg/deb/postinst
rename to src/Layout/pkg/deb/postinst
diff --git a/src/Installer/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj
similarity index 100%
rename from src/Installer/pkg/dotnet-sdk.proj
rename to src/Layout/pkg/dotnet-sdk.proj
diff --git a/src/Installer/redist-installer/Directory.Build.props b/src/Layout/redist-installer/Directory.Build.props
similarity index 100%
rename from src/Installer/redist-installer/Directory.Build.props
rename to src/Layout/redist-installer/Directory.Build.props
diff --git a/src/Installer/redist-installer/Directory.Build.targets b/src/Layout/redist-installer/Directory.Build.targets
similarity index 100%
rename from src/Installer/redist-installer/Directory.Build.targets
rename to src/Layout/redist-installer/Directory.Build.targets
diff --git a/src/Installer/redist-installer/packaging/osx/Distribution-Template b/src/Layout/redist-installer/packaging/osx/Distribution-Template
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/Distribution-Template
rename to src/Layout/redist-installer/packaging/osx/Distribution-Template
diff --git a/src/Installer/redist-installer/packaging/osx/Distribution-Template-x64 b/src/Layout/redist-installer/packaging/osx/Distribution-Template-x64
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/Distribution-Template-x64
rename to src/Layout/redist-installer/packaging/osx/Distribution-Template-x64
diff --git a/src/Installer/redist-installer/packaging/osx/resources/conclusion.html.lci b/src/Layout/redist-installer/packaging/osx/resources/conclusion.html.lci
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/conclusion.html.lci
rename to src/Layout/redist-installer/packaging/osx/resources/conclusion.html.lci
diff --git a/src/Installer/redist-installer/packaging/osx/resources/cs.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/cs.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/cs.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/cs.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/cs.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/cs.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/cs.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/cs.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/de.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/de.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/de.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/de.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/de.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/de.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/de.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/de.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/dotnetbackground.png b/src/Layout/redist-installer/packaging/osx/resources/dotnetbackground.png
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/dotnetbackground.png
rename to src/Layout/redist-installer/packaging/osx/resources/dotnetbackground.png
diff --git a/src/Installer/redist-installer/packaging/osx/resources/en.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/en.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/en.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/en.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/en.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/en.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/en.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/en.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/es.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/es.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/es.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/es.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/es.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/es.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/es.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/es.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/fr.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/fr.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/fr.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/fr.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/fr.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/fr.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/fr.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/fr.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/it.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/it.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/it.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/it.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/it.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/it.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/it.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/it.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ja.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/ja.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ja.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/ja.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ja.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/ja.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ja.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/ja.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ko.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/ko.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ko.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/ko.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ko.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/ko.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ko.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/ko.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/pl.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/pl.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/pl.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/pl.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/pl.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/pl.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/pl.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/pl.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/pt-br.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/pt-br.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/pt-br.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/pt-br.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/pt-br.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/pt-br.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/pt-br.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/pt-br.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ru.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/ru.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ru.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/ru.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/ru.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/ru.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/ru.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/ru.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/tr.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/tr.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/tr.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/tr.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/tr.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/tr.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/tr.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/tr.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/welcome.html.lci b/src/Layout/redist-installer/packaging/osx/resources/welcome.html.lci
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/welcome.html.lci
rename to src/Layout/redist-installer/packaging/osx/resources/welcome.html.lci
diff --git a/src/Installer/redist-installer/packaging/osx/resources/zh-hans.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/zh-hans.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/zh-hans.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/zh-hans.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/zh-hans.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/zh-hans.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/zh-hans.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/zh-hans.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/zh-hant.lproj/conclusion.html b/src/Layout/redist-installer/packaging/osx/resources/zh-hant.lproj/conclusion.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/zh-hant.lproj/conclusion.html
rename to src/Layout/redist-installer/packaging/osx/resources/zh-hant.lproj/conclusion.html
diff --git a/src/Installer/redist-installer/packaging/osx/resources/zh-hant.lproj/welcome.html b/src/Layout/redist-installer/packaging/osx/resources/zh-hant.lproj/welcome.html
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/resources/zh-hant.lproj/welcome.html
rename to src/Layout/redist-installer/packaging/osx/resources/zh-hant.lproj/welcome.html
diff --git a/src/Installer/redist-installer/packaging/osx/scripts/postinstall b/src/Layout/redist-installer/packaging/osx/scripts/postinstall
similarity index 100%
rename from src/Installer/redist-installer/packaging/osx/scripts/postinstall
rename to src/Layout/redist-installer/packaging/osx/scripts/postinstall
diff --git a/src/Installer/redist-installer/packaging/windows/Init.cmd b/src/Layout/redist-installer/packaging/windows/Init.cmd
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/Init.cmd
rename to src/Layout/redist-installer/packaging/windows/Init.cmd
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1028/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1028/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1028/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1028/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1029/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1029/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1029/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1029/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1031/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1031/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1031/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1031/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1033/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1033/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1033/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1033/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1036/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1036/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1036/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1036/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1040/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1040/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1040/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1040/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1041/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1041/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1041/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1041/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1042/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1042/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1042/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1042/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1045/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1045/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1045/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1045/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1046/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1046/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1046/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1046/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1049/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1049/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1049/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1049/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/1055/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/1055/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/1055/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/1055/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/2052/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/2052/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/2052/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/2052/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/LCID/3082/bundle.wxl b/src/Layout/redist-installer/packaging/windows/LCID/3082/bundle.wxl
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/LCID/3082/bundle.wxl
rename to src/Layout/redist-installer/packaging/windows/LCID/3082/bundle.wxl
diff --git a/src/Installer/redist-installer/packaging/windows/StableFileIdForApphostTransform.xslt b/src/Layout/redist-installer/packaging/windows/StableFileIdForApphostTransform.xslt
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/StableFileIdForApphostTransform.xslt
rename to src/Layout/redist-installer/packaging/windows/StableFileIdForApphostTransform.xslt
diff --git a/src/Installer/redist-installer/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec b/src/Layout/redist-installer/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec
rename to src/Layout/redist-installer/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec
diff --git a/src/Installer/redist-installer/packaging/windows/bundle.thm b/src/Layout/redist-installer/packaging/windows/bundle.thm
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/bundle.thm
rename to src/Layout/redist-installer/packaging/windows/bundle.thm
diff --git a/src/Installer/redist-installer/packaging/windows/bundle.wxs b/src/Layout/redist-installer/packaging/windows/bundle.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/bundle.wxs
rename to src/Layout/redist-installer/packaging/windows/bundle.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/dotnet.wxs b/src/Layout/redist-installer/packaging/windows/dotnet.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/dotnet.wxs
rename to src/Layout/redist-installer/packaging/windows/dotnet.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/dotnethome_x64.wxs b/src/Layout/redist-installer/packaging/windows/dotnethome_x64.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/dotnethome_x64.wxs
rename to src/Layout/redist-installer/packaging/windows/dotnethome_x64.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/dummyeula.rtf b/src/Layout/redist-installer/packaging/windows/dummyeula.rtf
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/dummyeula.rtf
rename to src/Layout/redist-installer/packaging/windows/dummyeula.rtf
diff --git a/src/Installer/redist-installer/packaging/windows/generatebundle.ps1 b/src/Layout/redist-installer/packaging/windows/generatebundle.ps1
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/generatebundle.ps1
rename to src/Layout/redist-installer/packaging/windows/generatebundle.ps1
diff --git a/src/Installer/redist-installer/packaging/windows/generatemsi.ps1 b/src/Layout/redist-installer/packaging/windows/generatemsi.ps1
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/generatemsi.ps1
rename to src/Layout/redist-installer/packaging/windows/generatemsi.ps1
diff --git a/src/Installer/redist-installer/packaging/windows/generatenupkg.ps1 b/src/Layout/redist-installer/packaging/windows/generatenupkg.ps1
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/generatenupkg.ps1
rename to src/Layout/redist-installer/packaging/windows/generatenupkg.ps1
diff --git a/src/Installer/redist-installer/packaging/windows/generatesdkplaceholdermsi.ps1 b/src/Layout/redist-installer/packaging/windows/generatesdkplaceholdermsi.ps1
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/generatesdkplaceholdermsi.ps1
rename to src/Layout/redist-installer/packaging/windows/generatesdkplaceholdermsi.ps1
diff --git a/src/Installer/redist-installer/packaging/windows/generatetemplatesmsi.ps1 b/src/Layout/redist-installer/packaging/windows/generatetemplatesmsi.ps1
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/generatetemplatesmsi.ps1
rename to src/Layout/redist-installer/packaging/windows/generatetemplatesmsi.ps1
diff --git a/src/Installer/redist-installer/packaging/windows/manifests.wxs b/src/Layout/redist-installer/packaging/windows/manifests.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/manifests.wxs
rename to src/Layout/redist-installer/packaging/windows/manifests.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/msi b/src/Layout/redist-installer/packaging/windows/msi
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/msi
rename to src/Layout/redist-installer/packaging/windows/msi
diff --git a/src/Installer/redist-installer/packaging/windows/msi.ico b/src/Layout/redist-installer/packaging/windows/msi.ico
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/msi.ico
rename to src/Layout/redist-installer/packaging/windows/msi.ico
diff --git a/src/Installer/redist-installer/packaging/windows/provider.wxs b/src/Layout/redist-installer/packaging/windows/provider.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/provider.wxs
rename to src/Layout/redist-installer/packaging/windows/provider.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/registrykeys.wxs b/src/Layout/redist-installer/packaging/windows/registrykeys.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/registrykeys.wxs
rename to src/Layout/redist-installer/packaging/windows/registrykeys.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/sdkplaceholder.wxs b/src/Layout/redist-installer/packaging/windows/sdkplaceholder.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/sdkplaceholder.wxs
rename to src/Layout/redist-installer/packaging/windows/sdkplaceholder.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/templates.wxs b/src/Layout/redist-installer/packaging/windows/templates.wxs
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/templates.wxs
rename to src/Layout/redist-installer/packaging/windows/templates.wxs
diff --git a/src/Installer/redist-installer/packaging/windows/variables.wxi b/src/Layout/redist-installer/packaging/windows/variables.wxi
similarity index 100%
rename from src/Installer/redist-installer/packaging/windows/variables.wxi
rename to src/Layout/redist-installer/packaging/windows/variables.wxi
diff --git a/src/Installer/redist-installer/redist-installer.proj b/src/Layout/redist-installer/redist-installer.proj
similarity index 82%
rename from src/Installer/redist-installer/redist-installer.proj
rename to src/Layout/redist-installer/redist-installer.proj
index 95210d909836..0151cea698f4 100644
--- a/src/Installer/redist-installer/redist-installer.proj
+++ b/src/Layout/redist-installer/redist-installer.proj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
-    <ProjectReference Include="$(RepoRoot)src\Layout\redist\redist.csproj" />
+    <ProjectReference Include="..\redist\redist.csproj" />
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <ProjectReference Include="$(RepoRoot)src\Installer\finalizer\finalizer-build.csproj" />
+    <ProjectReference Include="..\finalizer\finalizer-build.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Installer/redist-installer/targets/BundledDotnetTools.targets b/src/Layout/redist-installer/targets/BundledDotnetTools.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/BundledDotnetTools.targets
rename to src/Layout/redist-installer/targets/BundledDotnetTools.targets
diff --git a/src/Installer/redist-installer/targets/BundledManifests.targets b/src/Layout/redist-installer/targets/BundledManifests.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/BundledManifests.targets
rename to src/Layout/redist-installer/targets/BundledManifests.targets
diff --git a/src/Installer/redist-installer/targets/BundledTemplates.targets b/src/Layout/redist-installer/targets/BundledTemplates.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/BundledTemplates.targets
rename to src/Layout/redist-installer/targets/BundledTemplates.targets
diff --git a/src/Installer/redist-installer/targets/Crossgen.targets b/src/Layout/redist-installer/targets/Crossgen.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/Crossgen.targets
rename to src/Layout/redist-installer/targets/Crossgen.targets
diff --git a/src/Installer/redist-installer/targets/GenerateArchives.targets b/src/Layout/redist-installer/targets/GenerateArchives.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/GenerateArchives.targets
rename to src/Layout/redist-installer/targets/GenerateArchives.targets
diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Layout/redist-installer/targets/GenerateBundledVersions.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/GenerateBundledVersions.targets
rename to src/Layout/redist-installer/targets/GenerateBundledVersions.targets
diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Layout/redist-installer/targets/GenerateLayout.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/GenerateLayout.targets
rename to src/Layout/redist-installer/targets/GenerateLayout.targets
diff --git a/src/Installer/redist-installer/targets/GenerateMSIs.targets b/src/Layout/redist-installer/targets/GenerateMSIs.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/GenerateMSIs.targets
rename to src/Layout/redist-installer/targets/GenerateMSIs.targets
diff --git a/src/Installer/redist-installer/targets/GeneratePKG.targets b/src/Layout/redist-installer/targets/GeneratePKG.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/GeneratePKG.targets
rename to src/Layout/redist-installer/targets/GeneratePKG.targets
diff --git a/src/Installer/redist-installer/targets/RestoreLayout.targets b/src/Layout/redist-installer/targets/RestoreLayout.targets
similarity index 100%
rename from src/Installer/redist-installer/targets/RestoreLayout.targets
rename to src/Layout/redist-installer/targets/RestoreLayout.targets