diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 39c393f0fef67..f847f894bef8a 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -16,6 +16,7 @@
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))
$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))
+ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))
$(NoWarn);nullable
$(NoWarn);nullable;CA1052
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj
similarity index 100%
rename from src/libraries/shims/ApiCompat.proj
rename to src/libraries/apicompat/ApiCompat.proj
diff --git a/src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt b/src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt
rename to src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt
diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt
diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets
index aa615fdd53597..d7674d22fd315 100644
--- a/src/libraries/shims/Directory.Build.targets
+++ b/src/libraries/shims/Directory.Build.targets
@@ -3,8 +3,7 @@
net48
- $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)\build\.NETFramework\v4.8\
- $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))
+ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)', '$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)', 'build', '.NETFramework', 'v4.8'))
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 5929fa37ff03b..f104c029c5514 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -40,7 +40,7 @@
@(_allSrc)"
Exclude="@(NonNetCoreAppProject)" />
-