diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 59526b0ca..89b59ca95 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -373,11 +373,12 @@ stages:
 # the VMR synchronization step is run to validate that the PR can be merged and later
 # synchronized into the VMR without problems.
 # You can do this by allowing the Synchronize_VMR stage from above in PRs.
-- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-  - template: eng/pipelines/templates/stages/vmr-build.yml
-    parameters:
-      vmrBranch: ${{ parameters.vmrBranch }}
-      isBuiltFromVmr: false
+# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184)
+# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+#   - template: eng/pipelines/templates/stages/vmr-build.yml
+#     parameters:
+#       vmrBranch: ${{ parameters.vmrBranch }}
+#       isBuiltFromVmr: false
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - stage: Publish
diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh
index f948ff503..16f302215 100755
--- a/eng/vmr-sync.sh
+++ b/eng/vmr-sync.sh
@@ -22,7 +22,7 @@
 ###
 ### The whole process can be reproduced locally easily by running this script.
 ### The patches are located in a folder in the 'dotnet/installer' repository.
-### At the moment of writing, the location is 'src/SourceBuild/tarball/patches' but to get
+### At the moment of writing, the location is 'src/SourceBuild/patches' but to get
 ### the up-to-date location, please see the 'patchesPath' property in
 ### https://github.com/dotnet/dotnet/blob/main/src/source-mappings.json
 ###
diff --git a/src/SourceBuild/README.md b/src/SourceBuild/README.md
index cb90757a6..7fb9a6e6a 100644
--- a/src/SourceBuild/README.md
+++ b/src/SourceBuild/README.md
@@ -44,7 +44,7 @@ git format-patch --zero-commit --no-signature -1
 ```
 
 Then, move the patch file into this repo, at
-`src/SourceBuild/tarball/patches/<repo>`.
+`src/SourceBuild/patches/<repo>`.
 
 > If you define `PATCH_DIR` to point at the `patches` directory, you can use
 > `-o` to place the patch file directly in the right directory:
diff --git a/src/SourceBuild/tarball/content/.gitignore b/src/SourceBuild/content/.gitignore
similarity index 100%
rename from src/SourceBuild/tarball/content/.gitignore
rename to src/SourceBuild/content/.gitignore
diff --git a/src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md b/src/SourceBuild/content/CODE_OF_CONDUCT.md
similarity index 100%
rename from src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md
rename to src/SourceBuild/content/CODE_OF_CONDUCT.md
diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/Directory.Build.props
rename to src/SourceBuild/content/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/Directory.Build.targets
rename to src/SourceBuild/content/Directory.Build.targets
diff --git a/src/SourceBuild/tarball/content/LICENSE.TXT b/src/SourceBuild/content/LICENSE.TXT
similarity index 100%
rename from src/SourceBuild/tarball/content/LICENSE.TXT
rename to src/SourceBuild/content/LICENSE.TXT
diff --git a/src/SourceBuild/tarball/content/SECURITY.md b/src/SourceBuild/content/SECURITY.md
similarity index 100%
rename from src/SourceBuild/tarball/content/SECURITY.md
rename to src/SourceBuild/content/SECURITY.md
diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/content/build.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/build.proj
rename to src/SourceBuild/content/build.proj
diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/content/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/build.sh
rename to src/SourceBuild/content/build.sh
diff --git a/src/SourceBuild/tarball/content/eng/Build.props b/src/SourceBuild/content/eng/Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/Build.props
rename to src/SourceBuild/content/eng/Build.props
diff --git a/src/SourceBuild/tarball/content/eng/No.proj b/src/SourceBuild/content/eng/No.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/No.proj
rename to src/SourceBuild/content/eng/No.proj
diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/Versions.props
rename to src/SourceBuild/content/eng/Versions.props
diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/AfterSourceBuild.proj b/src/SourceBuild/content/eng/arcade-overrides/AfterSourceBuild.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/arcade-overrides/AfterSourceBuild.proj
rename to src/SourceBuild/content/eng/arcade-overrides/AfterSourceBuild.proj
diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets
rename to src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets
diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeTools.targets b/src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeTools.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeTools.targets
rename to src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeTools.targets
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
rename to src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/content/eng/bootstrap/README.template.md
similarity index 98%
rename from src/SourceBuild/tarball/content/eng/bootstrap/README.template.md
rename to src/SourceBuild/content/eng/bootstrap/README.template.md
index d092f1f4f..455afb472 100644
--- a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md
+++ b/src/SourceBuild/content/eng/bootstrap/README.template.md
@@ -10,7 +10,7 @@ What this means:
 In the VMR, you can find:
 - source files of [each product repository](#list-of-components) which are mirrored inside of their respective directories under [`src/`](https://github.com/dotnet/dotnet/tree/main/src),
 - tooling that enables [building the whole .NET product from source](https://github.com/dotnet/source-build) on Linux platforms,
-- small customizations, in the form of [patches](https://github.com/dotnet/dotnet/tree/main/src/installer/src/SourceBuild/tarball/patches), applied on top of the original code to make the build possible,
+- small customizations, in the form of [patches](https://github.com/dotnet/dotnet/tree/main/src/installer/src/SourceBuild/patches), applied on top of the original code to make the build possible,
 - *[in future]* E2E tests for the whole .NET product.
 
 Just like the development repositories, the VMR will have a release branch for every feature band (e.g. `release/8.0.1xx-preview1`).
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt b/src/SourceBuild/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt
rename to src/SourceBuild/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
rename to src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
diff --git a/src/SourceBuild/tarball/content/eng/install-nuget-credprovider.sh b/src/SourceBuild/content/eng/install-nuget-credprovider.sh
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/install-nuget-credprovider.sh
rename to src/SourceBuild/content/eng/install-nuget-credprovider.sh
diff --git a/src/SourceBuild/tarball/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/pipelines/ci.yml
rename to src/SourceBuild/content/eng/pipelines/ci.yml
diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/content/eng/pipelines/security-partners-dotnet.yml
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml
rename to src/SourceBuild/content/eng/pipelines/security-partners-dotnet.yml
diff --git a/src/SourceBuild/tarball/content/eng/tools/Directory.Build.props b/src/SourceBuild/content/eng/tools/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/Directory.Build.props
rename to src/SourceBuild/content/eng/tools/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.props
rename to src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.props
diff --git a/src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.targets b/src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.targets
rename to src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.targets
diff --git a/src/SourceBuild/tarball/content/eng/tools/generate-graphviz/generate-graphviz.proj b/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/generate-graphviz/generate-graphviz.proj
rename to src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj
diff --git a/src/SourceBuild/tarball/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/init-build.proj
rename to src/SourceBuild/content/eng/tools/init-build.proj
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Directory.Build.props b/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Directory.Build.props
rename to src/SourceBuild/content/eng/tools/tasks/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._
rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
rename to src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs
rename to src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs
diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/content/global.json
similarity index 100%
rename from src/SourceBuild/tarball/content/global.json
rename to src/SourceBuild/content/global.json
diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/content/prep.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/SourceBuild/tarball/content/prep.sh
rename to src/SourceBuild/content/prep.sh
diff --git a/src/SourceBuild/tarball/content/prereqs/keys/Newtonsoft.Json.snk b/src/SourceBuild/content/prereqs/keys/Newtonsoft.Json.snk
similarity index 100%
rename from src/SourceBuild/tarball/content/prereqs/keys/Newtonsoft.Json.snk
rename to src/SourceBuild/content/prereqs/keys/Newtonsoft.Json.snk
diff --git a/src/SourceBuild/tarball/content/prereqs/keys/NuGet.Client.snk b/src/SourceBuild/content/prereqs/keys/NuGet.Client.snk
similarity index 100%
rename from src/SourceBuild/tarball/content/prereqs/keys/NuGet.Client.snk
rename to src/SourceBuild/content/prereqs/keys/NuGet.Client.snk
diff --git a/src/SourceBuild/tarball/content/prereqs/keys/README.md b/src/SourceBuild/content/prereqs/keys/README.md
similarity index 100%
rename from src/SourceBuild/tarball/content/prereqs/keys/README.md
rename to src/SourceBuild/content/prereqs/keys/README.md
diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/Directory.Build.props
rename to src/SourceBuild/content/repo-projects/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets
rename to src/SourceBuild/content/repo-projects/Directory.Build.targets
diff --git a/src/SourceBuild/tarball/content/repo-projects/arcade.proj b/src/SourceBuild/content/repo-projects/arcade.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/arcade.proj
rename to src/SourceBuild/content/repo-projects/arcade.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj
rename to src/SourceBuild/content/repo-projects/aspnetcore.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/command-line-api.proj
rename to src/SourceBuild/content/repo-projects/command-line-api.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj
rename to src/SourceBuild/content/repo-projects/deployment-tools.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/diagnostics.proj
rename to src/SourceBuild/content/repo-projects/diagnostics.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/format.proj
rename to src/SourceBuild/content/repo-projects/format.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/fsharp.proj
rename to src/SourceBuild/content/repo-projects/fsharp.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/installer.proj
rename to src/SourceBuild/content/repo-projects/installer.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj b/src/SourceBuild/content/repo-projects/known-good-tests.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj
rename to src/SourceBuild/content/repo-projects/known-good-tests.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/known-good.proj b/src/SourceBuild/content/repo-projects/known-good.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/known-good.proj
rename to src/SourceBuild/content/repo-projects/known-good.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/linker.proj b/src/SourceBuild/content/repo-projects/linker.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/linker.proj
rename to src/SourceBuild/content/repo-projects/linker.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/msbuild.proj
rename to src/SourceBuild/content/repo-projects/msbuild.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/nuget-client.proj
rename to src/SourceBuild/content/repo-projects/nuget-client.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/package-source-build.proj
rename to src/SourceBuild/content/repo-projects/package-source-build.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/razor.proj
rename to src/SourceBuild/content/repo-projects/razor.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj
rename to src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/roslyn.proj
rename to src/SourceBuild/content/repo-projects/roslyn.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/runtime.proj
rename to src/SourceBuild/content/repo-projects/runtime.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/sdk.proj
rename to src/SourceBuild/content/repo-projects/sdk.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj
rename to src/SourceBuild/content/repo-projects/source-build-externals.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj
rename to src/SourceBuild/content/repo-projects/source-build-reference-packages.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/sourcelink.proj
rename to src/SourceBuild/content/repo-projects/sourcelink.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/symreader.proj
rename to src/SourceBuild/content/repo-projects/symreader.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/templating.proj
rename to src/SourceBuild/content/repo-projects/templating.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/test-templates.proj
rename to src/SourceBuild/content/repo-projects/test-templates.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/vstest.proj
rename to src/SourceBuild/content/repo-projects/vstest.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/xdt.proj b/src/SourceBuild/content/repo-projects/xdt.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/xdt.proj
rename to src/SourceBuild/content/repo-projects/xdt.proj
diff --git a/src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj
similarity index 100%
rename from src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj
rename to src/SourceBuild/content/repo-projects/xliff-tasks.proj
diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.props b/src/SourceBuild/content/src/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/src/Directory.Build.props
rename to src/SourceBuild/content/src/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.targets b/src/SourceBuild/content/src/Directory.Build.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/src/Directory.Build.targets
rename to src/SourceBuild/content/src/Directory.Build.targets
diff --git a/src/SourceBuild/tarball/content/test/Directory.Build.props b/src/SourceBuild/content/test/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Directory.Build.props
rename to src/SourceBuild/content/test/Directory.Build.props
diff --git a/src/SourceBuild/tarball/content/test/Directory.Build.targets b/src/SourceBuild/content/test/Directory.Build.targets
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Directory.Build.targets
rename to src/SourceBuild/content/test/Directory.Build.targets
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config
similarity index 100%
rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch
similarity index 100%
rename from src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch
rename to src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch b/src/SourceBuild/patches/aspnetcore/0002-IDE0060-workaround.patch
similarity index 100%
rename from src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch
rename to src/SourceBuild/patches/aspnetcore/0002-IDE0060-workaround.patch
diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
similarity index 100%
rename from src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
rename to src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
diff --git a/src/SourceBuild/tarball/content/prereqs/packages/archive/_ b/src/SourceBuild/tarball/content/prereqs/packages/archive/_
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json
index 95e8f949c..6f81eabc2 100644
--- a/src/VirtualMonoRepo/source-mappings.json
+++ b/src/VirtualMonoRepo/source-mappings.json
@@ -10,13 +10,13 @@
 {
     // Location within the VMR where the source-build patches are stored
     // These patches are applied on top of the code synchronized into the VMR
-    "patchesPath": "src/installer/src/SourceBuild/tarball/patches",
+    "patchesPath": "src/installer/src/SourceBuild/patches",
 
     // Some files are copied outside of the src/ directory into other locations
     // When files in the source paths are changed, they are automatically synchronized too
     "additionalMappings": [
         {
-            "source": "src/installer/src/SourceBuild/tarball/content",
+            "source": "src/installer/src/SourceBuild/content",
             "destination": ""
         },
         {
@@ -82,7 +82,7 @@
             "defaultRemote": "https://github.com/dotnet/installer",
             "exclude": [
                 // We don't need the tarball content in the VMR again, it's already copied in the root
-                "src/SourceBuild/tarball/content/**/*"
+                "src/SourceBuild/content/**/*"
             ]
         },
         {