diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj
index 6562df4029d70..cef1a73b4db03 100644
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj
@@ -6,15 +6,15 @@
     <Compile Include="..\..\Common\tests\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs">
       <Link>Common\tests\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs</Link>
     </Compile>
-    <Compile Include="..\..\System.Threading.Tasks\tests\System.Runtime.CompilerServices\ConfiguredCancelableAsyncEnumerableTests.cs">
-      <Link>System.Threading.Tasks\tests\System.Runtime.CompilerServices\ConfiguredCancelableAsyncEnumerableTests.cs</Link>
+    <Compile Include="..\..\System.Runtime\tests\System.Threading.Tasks.Tests\System.Runtime.CompilerServices\ConfiguredCancelableAsyncEnumerableTests.cs">
+      <Link>System.Runtime\tests\System.Threading.Tasks.Tests\System.Runtime.CompilerServices\ConfiguredCancelableAsyncEnumerableTests.cs</Link>
     </Compile>
-    <Compile Include="..\..\System.Threading.Tasks\tests\System.Runtime.CompilerServices\ConfiguredAsyncDisposable.cs">
-      <Link>System.Threading.Tasks\tests\System.Runtime.CompilerServices\ConfiguredAsyncDisposable.cs</Link>
+    <Compile Include="..\..\System.Runtime\tests\System.Threading.Tasks.Tests\System.Runtime.CompilerServices\ConfiguredAsyncDisposable.cs">
+      <Link>System.Runtime\tests\System.Threading.Tasks.Tests\System.Runtime.CompilerServices\ConfiguredAsyncDisposable.cs</Link>
     </Compile>
-    <Compile Include="..\..\System.Threading.Tasks.Extensions\tests\ManualResetValueTaskSourceTests.cs"
+    <Compile Include="..\..\System.Runtime\tests\System.Threading.Tasks.Extensions.Tests\ManualResetValueTaskSourceTests.cs"
              Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
-      <Link>System.Threading.Tasks.Extensions\tests\ManualResetValueTaskSourceTests.cs</Link>
+      <Link>System.Runtime\tests\System.Threading.Tasks.Extensions.Tests\ManualResetValueTaskSourceTests.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.AppContext/tests/AppContext.Switch.Validation.cs b/src/libraries/System.AppContext/tests/AppContext.Switch.Validation.cs
deleted file mode 100644
index e4403ada00b03..0000000000000
--- a/src/libraries/System.AppContext/tests/AppContext.Switch.Validation.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using Xunit;
-
-namespace System.Tests
-{
-    public partial class AppContextTests
-    {
-        [Fact]
-        public void NullSwitchName_EnableSwitch()
-        {
-            AssertExtensions.Throws<ArgumentNullException>("switchName", () => AppContext.SetSwitch(null, true));
-        }
-
-        [Fact]
-        public void NullSwitchName_DisableSwitch()
-        {
-            AssertExtensions.Throws<ArgumentNullException>("switchName", () => AppContext.SetSwitch(null, false));
-        }
-
-        [Fact]
-        public void NullSwitchName_TryGetSwitchValue()
-        {
-            AssertExtensions.Throws<ArgumentNullException>("switchName", () =>
-            {
-                bool output;
-                AppContext.TryGetSwitch(null, out output);
-            });
-        }
-
-        [Fact]
-        public void EmptySwitchName_EnableSwitch()
-        {
-            AssertExtensions.Throws<ArgumentException>("switchName", () => AppContext.SetSwitch(string.Empty, true));
-        }
-
-        [Fact]
-        public void EmptySwitchName_DisableSwitch()
-        {
-            AssertExtensions.Throws<ArgumentException>("switchName", () => AppContext.SetSwitch(string.Empty, false));
-        }
-
-        [Fact]
-        public void EmptySwitchName_TryGetSwitchValue()
-        {
-            bool output;
-            AssertExtensions.Throws<ArgumentException>("switchName", () => AppContext.TryGetSwitch(string.Empty, out output));
-        }
-    }
-}
diff --git a/src/libraries/System.AppContext/tests/AppContext.Switch.cs b/src/libraries/System.AppContext/tests/AppContext.Switch.cs
deleted file mode 100644
index 730f6482ad658..0000000000000
--- a/src/libraries/System.AppContext/tests/AppContext.Switch.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Xunit;
-
-namespace System.Tests
-{
-
-    public partial class AppContextTests
-    {
-        [Fact]
-        public void SwitchNotFound()
-        {
-            string switchName = GetSwitchName();
-            bool isEnabled;
-            Assert.False(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.False(isEnabled);
-        }
-
-
-        [Fact]
-        public void EnableSwitch()
-        {
-            string switchName = GetSwitchName();
-            AppContext.SetSwitch(switchName, true);
-
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.True(isEnabled);
-        }
-
-        [Fact]
-        public void EnableMultipleSwitches()
-        {
-            string switchName1 = GetSwitchName();
-            string switchName2 = GetSwitchName();
-
-            AppContext.SetSwitch(switchName1, true);
-            AppContext.SetSwitch(switchName2, true);
-
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName1, out isEnabled));
-            Assert.True(isEnabled);
-
-            isEnabled = false;
-            Assert.True(AppContext.TryGetSwitch(switchName2, out isEnabled));
-            Assert.True(isEnabled);
-        }
-
-        [Fact]
-        public void EnableSwitchMultipleTimes()
-        {
-            string switchName = GetSwitchName();
-
-            AppContext.SetSwitch(switchName, true);
-            AppContext.SetSwitch(switchName, true);
-
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.True(isEnabled);
-        }
-
-        [Fact]
-        public void DisableSwitch()
-        {
-            string switchName = GetSwitchName();
-
-            AppContext.SetSwitch(switchName, true);
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.True(isEnabled);
-
-            // Ensure we can keep the value around
-            AppContext.SetSwitch(switchName, false);
-            Assert.True(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.False(isEnabled);
-        }
-
-        [Fact]
-        public void DisableMultipleSwitches()
-        {
-            string switchName1 = GetSwitchName();
-            string switchName2 = GetSwitchName();
-
-            AppContext.SetSwitch(switchName1, false);
-            AppContext.SetSwitch(switchName2, false);
-
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName1, out isEnabled));
-            Assert.False(isEnabled);
-            Assert.True(AppContext.TryGetSwitch(switchName2, out isEnabled));
-            Assert.False(isEnabled);
-        }
-
-        [Fact]
-        public void DisableSwitchMultipleTimes()
-        {
-            string switchName = GetSwitchName();
-
-            AppContext.SetSwitch(switchName, false);
-            AppContext.SetSwitch(switchName, false);
-
-            bool isEnabled;
-            Assert.True(AppContext.TryGetSwitch(switchName, out isEnabled));
-            Assert.False(isEnabled);
-        }
-
-        [Fact]
-        public void TryGetSwitch_SwitchNotDefined()
-        {
-            string switchName = GetSwitchName();
-
-            bool isEnabled;
-            var exists = AppContext.TryGetSwitch(switchName, out isEnabled);
-            Assert.False(exists);
-        }
-
-        [Fact]
-        public void TryGetSwitch_SwitchDefined()
-        {
-            bool isEnabled, exists;
-            string randomSwitchName = GetSwitchName();
-
-            // Enable switch
-            AppContext.SetSwitch(randomSwitchName, true);
-
-            // Get value
-            exists = AppContext.TryGetSwitch(randomSwitchName, out isEnabled);
-            Assert.True(exists);
-            Assert.True(isEnabled);
-
-            Assert.True(AppContext.TryGetSwitch(randomSwitchName, out isEnabled));
-            Assert.True(isEnabled);
-
-            // Disable switch
-            AppContext.SetSwitch(randomSwitchName, false);
-
-            // Get value
-            exists = AppContext.TryGetSwitch(randomSwitchName, out isEnabled);
-            Assert.True(exists);
-            Assert.False(isEnabled);
-            Assert.True(AppContext.TryGetSwitch(randomSwitchName, out isEnabled));
-            Assert.False(isEnabled);
-        }
-
-        private static string GetSwitchName([Runtime.CompilerServices.CallerLineNumber] int sourceLine = -1)
-        {
-            Assert.True(sourceLine != -1, "The 'sourceLine' should have retrieved from its caller");
-            return "Switch.Line" + sourceLine;
-        }
-    }
-}
diff --git a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
deleted file mode 100644
index e6255639d1d66..0000000000000
--- a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <TestRuntime>true</TestRuntime>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AppContext.Switch.cs" />
-    <Compile Include="AppContext.Switch.Validation.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/README.md b/src/libraries/System.Buffers/README.md
deleted file mode 100644
index eefd8ffb92e4f..0000000000000
--- a/src/libraries/System.Buffers/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# System.Buffers
-Contains types used in creating and managing memory buffers, such as those represented by `Span<T>` and `Memory<T>`.
-
-Documentation can be found here: https://learn.microsoft.com/en-us/dotnet/api/system.buffers.
-
-## Contribution Bar
-- [x] [We consider new features, new APIs and performance changes](../../libraries/README.md#primary-bar)
-
-See the [Help Wanted](https://github.com/dotnet/runtime/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-System.Buffers+label%3A%22help+wanted%22+) issues.
-
-## Source
-[../System.Private.CoreLib/src/System/Buffers](../System.Private.CoreLib/src/System/Buffers)
-
-## Tests
-[./tests](./tests)
-
-## Deployment
-[System.Buffers](https://www.nuget.org/packages/System.Buffers) is included in the shared framework. The package does not need to be installed into any project compatible with .NET Standard 2.1; it only needs to be installed when targeting .NET Standard 2.0.
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln
index 15583c0cd0157..518977d6e617b 100644
--- a/src/libraries/System.Data.Common/System.Data.Common.sln
+++ b/src/libraries/System.Data.Common/System.Data.Common.sln
@@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common", "src\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common.Tests", "tests\System.Data.Common.Tests.csproj", "{BEBD7B5B-9544-42EB-B878-F009560CAAF4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions.Tests", "tests\System.Data.DataSetExtensions.Tests\System.Data.DataSetExtensions.Tests.csproj", "{23C88520-DA42-4015-9238-D3B211B00F8E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "..\System.Net.Primitives\ref\System.Net.Primitives.csproj", "{88B5FB49-4E8D-4EF9-8DE7-1E35CA10338A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "..\System.ObjectModel\ref\System.ObjectModel.csproj", "{48C26AB9-318C-4425-85F2-7358FC19FEC3}"
@@ -407,6 +409,27 @@ Global
 		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|x64.Build.0 = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Debug|x86.Build.0 = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|arm.ActiveCfg = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|x64.Build.0 = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|x86.ActiveCfg = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Release|x86.Build.0 = Release|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{23C88520-DA42-4015-9238-D3B211B00F8E}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{88B5FB49-4E8D-4EF9-8DE7-1E35CA10338A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88B5FB49-4E8D-4EF9-8DE7-1E35CA10338A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88B5FB49-4E8D-4EF9-8DE7-1E35CA10338A}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -835,6 +858,7 @@ Global
 		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {83E4FB59-E8AB-41DD-9770-7ACC71364E6A}
 		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
 		{BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
+		{23C88520-DA42-4015-9238-D3B211B00F8E} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
 		{055E51B6-ACE0-4EE9-97C7-DC37D0FAF5E8} = {79588763-C99B-4C1B-88D3-181A92A98364}
 		{FB0CD622-EA22-4E27-892C-FE2E0BC962AF} = {79588763-C99B-4C1B-88D3-181A92A98364}
 		{5A54B7B6-6396-4F08-BA9C-5A1DA119A61F} = {79588763-C99B-4C1B-88D3-181A92A98364}
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Mono/DataRowComparerTest.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataRowComparerTest.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/Mono/DataRowComparerTest.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataRowComparerTest.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Mono/DataRowExtensionsTest.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataRowExtensionsTest.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/Mono/DataRowExtensionsTest.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataRowExtensionsTest.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Mono/DataTableExtensionsTest.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataTableExtensionsTest.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/Mono/DataTableExtensionsTest.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/DataTableExtensionsTest.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Mono/EnumerableRowCollectionTest.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/EnumerableRowCollectionTest.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/Mono/EnumerableRowCollectionTest.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/EnumerableRowCollectionTest.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/Mono/testdataset1.xml b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/testdataset1.xml
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/Mono/testdataset1.xml
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/Mono/testdataset1.xml
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System.Data.DataSetExtensions.Tests.csproj
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System.Data.DataSetExtensions.Tests.csproj
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataRowComparerTests.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataRowComparerTests.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataRowComparerTests.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataRowComparerTests.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataRowExtensionsTests.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataRowExtensionsTests.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataRowExtensionsTests.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataRowExtensionsTests.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataTableExtensionsTests.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataTableExtensionsTests.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataTableExtensionsTests.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/DataTableExtensionsTests.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System/Data/EnumerableRowCollectionExtensionsTests.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/EnumerableRowCollectionExtensionsTests.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System/Data/EnumerableRowCollectionExtensionsTests.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/EnumerableRowCollectionExtensionsTests.cs
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System/Data/TypedTableBaseExtensionsTests.cs b/src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/TypedTableBaseExtensionsTests.cs
similarity index 100%
rename from src/libraries/System.Data.DataSetExtensions/tests/System/Data/TypedTableBaseExtensionsTests.cs
rename to src/libraries/System.Data.Common/tests/System.Data.DataSetExtensions.Tests/System/Data/TypedTableBaseExtensionsTests.cs
diff --git a/src/libraries/System.Dynamic.Runtime/README.md b/src/libraries/System.Dynamic.Runtime/README.md
deleted file mode 100644
index 2c47415d92f2a..0000000000000
--- a/src/libraries/System.Dynamic.Runtime/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# System.Dynamic.Runtime library
-
-We are not accepting feature contributions to System.Dynamic.Runtime.
-The library is effectively archived.
-
-The library and supporting language features are mature and no longer evolving, and the risk of code change likely exceeds the benefit.
-We will consider changes that address significant bugs or regressions, or changes that are necessary to continue shipping the binaries.
-Other changes will be rejected.
diff --git a/src/libraries/System.Globalization.Calendars/README.md b/src/libraries/System.Globalization.Calendars/README.md
deleted file mode 100644
index 02ea87c9a29d5..0000000000000
--- a/src/libraries/System.Globalization.Calendars/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# System.Globalization.Calendars
-
-This library originally intended to include interfaces to the calendars globalization APIs. Later for simplicity all these APIs moved to [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization) library.
-The Moved APIs mostly a concrete implementation for [Calendar](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.calendar?view=net-7.0) APIs.
-
-Any future contribution to the globalization calendar APIs should be considered to be done in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization) library. The API contracts should be exposed in [System.Runtime](https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/System.Runtime/ref/System.Runtime.cs). Any globalization calendar tests should be added to [tests](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Globalization/tests) folder under the [System.Globalization](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Globalization) project.
-
-Nothing should be added here except if there is a good reason to do so.
-
-Globalization calendars documentation can be found at https://learn.microsoft.com/en-us/dotnet/api/system.globalization.calendar?view=net-7.0.
-
-## Contribution Bar
-- [x] [We consider new features, bug fixes, new calendar APIs and performance changes](../../libraries/README.md#primary-bar). The development should be done in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization).
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Source
-
-https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization
-
-## Deployment
-
-All Globalization calendar APIs are included in the shared framework.
diff --git a/src/libraries/System.Globalization.Extensions/README.md b/src/libraries/System.Globalization.Extensions/README.md
deleted file mode 100644
index 71974d798b963..0000000000000
--- a/src/libraries/System.Globalization.Extensions/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# System.Globalization.Extensions
-
-This library originally intended to include extension interfaces to the globalization APIs. Later for simplicity all these extensions moved to [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization) library.
-The Moved extensions mostly are [GlobalizationExtensions.GetStringComparer](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.globalizationextensions.getstringcomparer?view=net-7.0#system-globalization-globalizationextensions-getstringcomparer(system-globalization-compareinfo-system-globalization-compareoptions)), [StringNormalizationExtensions](https://learn.microsoft.com/en-us/dotnet/api/system.stringnormalizationextensions?view=net-7.0), and [IdnMapping](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.idnmapping?view=net-7.0).
-
-Any future contribution to the globalization APIs should be considered to be done in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization) library. The API contracts should be exposed in [System.Runtime](https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/System.Runtime/ref/System.Runtime.cs). Any globalization tests should be added to [tests](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Globalization/tests) folder under the [System.Globalization](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Globalization) project.
-
-Nothing should be added here except if there is a good reason to do so.
-
-Globalization documentation can be found at https://learn.microsoft.com/en-us/dotnet/api/system.globalization?view=net-7.0.
-
-## Contribution Bar
-- [x] [We consider new features, bug fixes, new APIs and performance changes](../../libraries/README.md#primary-bar). The development should be done in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization).
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Source
-
-https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization
-
-## Deployment
-
-All Globalization APIs are included in the shared framework.
diff --git a/src/libraries/System.Globalization/README.md b/src/libraries/System.Globalization/README.md
deleted file mode 100644
index 9db5d5561c5b8..0000000000000
--- a/src/libraries/System.Globalization/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# System.Globalization
-This mainly include the contracts of the Globalization interfaces and types e.g. [CultureInfo](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.cultureinfo?view=net-7.0), [DateTimeFormatInfo](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.datetimeformatinfo?view=net-7.0), [NumberFormatInfo](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.numberformatinfo?view=net-7.0), [calenders](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.calendar?view=net-7.0)...etc. Most of these interfaces already exposed from [System.Runtime](https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/System.Runtime/ref/System.Runtime.cs) too. The implementation of the Globalization APIs exists in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization) library. Any Globalization product code changes should go to [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization). Any new API contracts should be exposed from [System.Runtime](https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/System.Runtime/ref/System.Runtime.cs). **All Globalization tests should be included here under the [tests](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Globalization/tests) folder**.
-
-Documentation can be found at https://learn.microsoft.com/en-us/dotnet/api/system.globalization?view=net-7.0.
-
-## Contribution Bar
-- [x] [We consider new features, bug fixes, new APIs and performance changes](../../libraries/README.md#primary-bar). The development should be done in [System.Private.Corelib](https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization).
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Source
-
-https://github.com/dotnet/runtime/tree/main/src/libraries/System.Private.CoreLib/src/System/Globalization
-
-## Deployment
-
-All Globalization APIs are included in the shared framework.
diff --git a/src/libraries/System.IO.FileSystem.Primitives/README.md b/src/libraries/System.IO.FileSystem.Primitives/README.md
deleted file mode 100644
index c3d9a97a2fde5..0000000000000
--- a/src/libraries/System.IO.FileSystem.Primitives/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# System.IO.FileSystem.Primitives
-This assembly no longer contains any code. It is provided only to permit type unification for libraries built against previous versions of .NET.
-
-## Source
-* All types previously part of this assembly (`FileAccess`, `FileAttributes`, `FileMode`, `FileShare`) are now part of [System.Private.CoreLib](../System.Private.CoreLib/), exposed via [System.Runtime](../System.Runtime/).
-
-* Some tests for types previously in this library are still in the [tests](tests/) subdirectory.
-
-## Contribution Bar
-- [x] We consider changes that move tests from the [tests](tests/) subdirectory into [System.IO.Tests](../System.IO/tests/) project.
-
-## Deployment
-The System.IO.FileSystem.Primitives assembly is part of the shared framework, and ships with every new release of .NET.
diff --git a/src/libraries/System.IO.FileSystem/README.md b/src/libraries/System.IO.FileSystem/README.md
deleted file mode 100644
index 4f7b786c38263..0000000000000
--- a/src/libraries/System.IO.FileSystem/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# System.IO.FileSystem
-This assembly no longer contains any code. It is provided only to permit type unification for libraries built against previous versions of .NET.
-
-## Source
-* All types previously part of this assembly (`FileStream`, `FileSystemInfo`, `FileSystemEnumerable`, etc.) are now part of [System.Private.CoreLib](../System.Private.CoreLib/), exposed via [System.Runtime](../System.Runtime/).
-
-* All of the tests for types previously in this library are still in the [tests](tests/) subdirectory.
-
-## Contribution Bar
-- [x] We consider changes that add value to the tests.
-
-## Deployment
-The System.IO.FileSystem assembly is part of the shared framework, and ships with every new release of .NET.
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/README.md b/src/libraries/System.IO.UnmanagedMemoryStream/README.md
deleted file mode 100644
index c0f326bcaff8d..0000000000000
--- a/src/libraries/System.IO.UnmanagedMemoryStream/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# System.IO.UnmanagedMemoryStream
-This assembly no longer contains any code.  It is provided only to permit type unification for libraries built against previous versions of .NET.
-
-## Source
-* All types previously part of this library are now part of [System.Private.CoreLib](../System.Private.CoreLib/), `UnmanagedMemoryAccessor` is exposed via [System.Runtime.InteropServices](../System.Runtime.InteropServices/) and `UnmanagedMemoryStream` is exposed via [System.Runtime](../System.Runtime/).
-
-* Some of the tests for types previously in this library are still in the [tests](tests/) subdirectory.
-
-## Contribution Bar
-- [x] We consider changes that move tests from the [tests](tests/) subdirectory into [System.IO.Tests](../System.IO/tests/) project.
-
-## Deployment
-The System.IO.UnmanagedMemoryStream assembly is part of the shared framework, and ships with every new release of .NET.
diff --git a/src/libraries/System.IO/README.md b/src/libraries/System.IO/README.md
deleted file mode 100644
index dcd46028be1d3..0000000000000
--- a/src/libraries/System.IO/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# System.IO
-This assembly no longer contains any code. It is provided only to permit type unification for libraries built against previous versions of .NET.
-
-## Source
-* All types previously part of this assembly (`Stream`, `BinaryReader`, `MemoryStream`, `StreamReader`, `TextWriter`, etc.) are now part of [System.Private.CoreLib](../System.Private.CoreLib/), exposed via [System.Runtime](../System.Runtime/).
-
-* Most of the tests for types previously in this library are still in the [tests](tests/) subdirectory.
-
-## Contribution Bar
-- [x] We consider changes that add value to the tests.
-
-## Deployment
-The System.IO assembly is part of the shared framework, and ships with every new release of .NET.
diff --git a/src/libraries/System.Reflection/README.md b/src/libraries/System.Reflection/README.md
deleted file mode 100644
index e0f32c00d40a6..0000000000000
--- a/src/libraries/System.Reflection/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# System.Reflection
-This is the primary reflection assembly. It is used for late-bound introspection and invocation of types that are loaded into the currently executing "runtime context". This introspection is exposed by various reflection types including [`Assembly`](https://learn.microsoft.com/dotnet/api/system.reflection.assembly), [`Type`](https://learn.microsoft.com/dotnet/api/system.type), [`ConstructorInfo`](https://learn.microsoft.com/dotnet/api/system.reflection.constructorinfo), [`MethodInfo`](https://learn.microsoft.com/dotnet/api/system.reflection.methodinfo) and [`FieldInfo`](https://learn.microsoft.com/dotnet/api/system.reflection.fieldinfo). The primary mechanism to invoking members in a late-bound manner is through [`MethodBase.Invoke`](https://learn.microsoft.com/dotnet/api/system.reflection.methodbase.invoke).
-
-Documentation can be found at https://learn.microsoft.com/dotnet/api/system.reflection.
-
-## Contribution Bar
-- [x] [We consider new features, new APIs and performance changes](../../libraries/README.md#primary-bar)
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-Although the types are mature, the code base continues to evolve for better performance and to keep up with language and runtime enhancements such as byref-like types.
-
-See the [Help Wanted](https://github.com/dotnet/runtime/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-System.Reflection+label%3A%22help+wanted%22) issues.
-
-## Source
-
-* CoreClr-specific: [../../coreclr/System.Private.CoreLib/src/System/Reflection](../../coreclr/System.Private.CoreLib/src/System/Reflection)
-* Mono-specific: [../../mono/System.Private.CoreLib/src/System/Reflection](../../mono/System.Private.CoreLib/src/System/Reflection)
-* Shared between CoreClr and Mono: [../System.Private.CoreLib/src/System/Reflection](../System.Private.CoreLib/src/System/Reflection)
-
-## Deployment
-[System.Relection](https://www.nuget.org/packages/System.Reflection) is included in the shared framework.
diff --git a/src/libraries/System.Resources.Reader/README.md b/src/libraries/System.Resources.Reader/README.md
deleted file mode 100644
index 648779a7ec58f..0000000000000
--- a/src/libraries/System.Resources.Reader/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# System.Resources.ResourceReader
-
-Enumerates the resources in a binary resources (.resources) file by reading sequential resource name/value pairs.
-This is part of [System.Resources assembly](../System.Resources.ResourceManager/Readme.md)
-
-Documentation can be found at https://learn.microsoft.com/dotnet/api/system.resources.resourcereader.
-
-## Contribution Bar
-- [x] [We only consider fixes to maintain or improve quality](../../libraries/README.md#primary-bar)
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Source
-
-* The source of this project can found in [../System.Private.CoreLib/src/System/Resources](../System.Private.CoreLib/src/System/Resources)
-
-## Deployment
-[System.Resources.Reader](https://www.nuget.org/packages/System.Resources.Reader) is included in the shared framework. The package does not need to be installed into any project compatible with .NET Standard 2.0.
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/README.md b/src/libraries/System.Resources.ResourceManager/README.md
deleted file mode 100644
index d57c5e80e295d..0000000000000
--- a/src/libraries/System.Resources.ResourceManager/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# System.Resources.ResourceManager
-Provides classes and interfaces that allow developers to create, store, and manage various culture-specific resources used in an application. One of the most important classes of this namespace is the [`ResourceManager`](https://learn.microsoft.com/dotnet/api/system.resources.resourcemanager) class, It allows the user to access and control resources stored in the main assembly or in resource satellite assemblies. In .NET core a resource file is compiled and embedded automatically with MSBuild.
-
-Documentation can be found at https://learn.microsoft.com/dotnet/api/system.resources.
-
-## Contribution Bar
-- [x] [We only consider fixes to maintain or improve quality](../../libraries/README.md#primary-bar)
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-This is the primary assembly for resources in .NET hasn't changed much in the past years.
-
-See the [Help Wanted](https://github.com/dotnet/runtime/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+label%3Aarea-System.Resources) issues.
-
-## Source
-
-* CoreClr-specific: [../../coreclr/System.Private.CoreLib/src/System/Resources](../../coreclr/System.Private.CoreLib/src/System/Resources)
-* Mono-specific: [../../mono/System.Private.CoreLib/src/System/Resources](../../mono/System.Private.CoreLib/src/System/Resources)
-* Shared between CoreClr and Mono: [../System.Private.CoreLib/src/System/Resources](../System.Private.CoreLib/src/System/Resources)
-
-## Deployment
-[System.Resources.ResourceManager](https://www.nuget.org/packages/System.Resources.ResourceManager) is included in the shared framework. The package does not need to be installed into any project compatible with .NET Standard 2.0.
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/README.md b/src/libraries/System.Runtime.CompilerServices.Unsafe/README.md
deleted file mode 100644
index 1fe508b2139b8..0000000000000
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# System.Runtime.CompilerServices.Unsafe
-Contains generic, low-level functionality for manipulating managed and unmanaged pointers.
-
-Documentation can be found at https://learn.microsoft.com/dotnet/api/system.runtime.compilerservices.unsafe
-
-## Contribution Bar
-- [x] [We only consider fixes to maintain or improve quality](../../libraries/README.md#primary-bar)
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Deployment
-[System.Runtime.CompilerServices.Unsafe](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe) is included in the shared framework.  The package does not need to be installed into any project compatible with .NET Core or .NET; it only needs to be installed when targeting .NET Standard or .NET Framework, and it stopped being updated in .NET 7.
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index 62431149c3fb7..7652469a8f609 100644
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", "..\Common\tests\StreamConformanceTests\StreamConformanceTests.csproj", "{F86D6534-1A96-489E-A807-C14E616686D6}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestILAssembly", "..\Common\tests\System\TestILAssembly\TestILAssembly.ilproj", "{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}"
@@ -9,12 +11,38 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{21791340-49C4-4C07-97FD-CAA1B72D3256}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{86CF47B3-D607-4F59-896F-982FEA116086}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{484B12B8-F027-4960-BAA9-14D646C80A28}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{D16B3A49-5709-44CB-B6F8-8E3D585D236F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{F0BB4F76-7697-49A8-8204-FD4516EB325C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog.Messages", "..\System.Diagnostics.EventLog\src\Messages\System.Diagnostics.EventLog.Messages.csproj", "{B876CC90-CB87-4B1B-B6F5-247990192578}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{999B1A08-2C7F-43AD-BC50-5F950320BBFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{019A13D1-3493-4024-8223-FCB6763F80B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{9ECF9E5C-860F-49C3-95D0-501147F19548}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\ref\System.IO.Pipelines.csproj", "{8F97C1DE-07F7-449F-AA22-84A6D6836D82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\src\System.IO.Pipelines.csproj", "{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{E64D31D0-8F38-4FDF-B60D-F955D2475566}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "..\System.Resources.Extensions\ref\System.Resources.Extensions.csproj", "{4367BB9C-7EC2-4238-82E2-643DE24CC23E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "..\System.Resources.Extensions\src\System.Resources.Extensions.csproj", "{F977B04F-675C-4B78-8FCE-19D70504166D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{379BC6E6-1900-44F8-8D8C-AA2968A70008}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}"
@@ -23,32 +51,164 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "ref\Syste
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "src\System.Runtime.csproj", "{A83A8520-F5E2-49B4-83BC-0F82A412951D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.IOS.Tests", "tests\Hybrid\System.Runtime.IOS.Tests.csproj", "{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Tests", "tests\System.Buffers.Tests\System.Buffers.Tests.csproj", "{A3873DDB-47E7-4DB6-872C-4B46A779913A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests\System.Diagnostics.Debug.Tests.csproj", "{23D41678-453F-4F2A-85F1-167E63DA6D67}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools.Tests", "tests\System.Diagnostics.Tools.Tests\System.Diagnostics.Tools.Tests.csproj", "{6790611D-ACE0-47C6-83E0-E404364B5210}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests\System.Dynamic.Runtime.Tests.csproj", "{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.CalendarsWithConfigSwitch.Tests", "tests\System.Globalization.Calendars.Tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj", "{B73090B8-20CB-4586-A586-B7F37C1A06FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars.Hybrid.WASM.Tests", "tests\System.Globalization.Calendars.Tests\Hybrid\System.Globalization.Calendars.Hybrid.WASM.Tests.csproj", "{4C1F2761-857C-40A4-8CDD-7139380DA4D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars.IOS.Tests", "tests\System.Globalization.Calendars.Tests\Hybrid\System.Globalization.Calendars.IOS.Tests.csproj", "{70441C80-1F14-42F9-8225-A891E3C9A82A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars.Tests", "tests\System.Globalization.Calendars.Tests\System.Globalization.Calendars.Tests.csproj", "{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.iOS.Tests", "tests\System.Globalization.Extensions.Tests\Hybrid\System.Globalization.Extensions.iOS.Tests.csproj", "{1C44735B-C77E-479A-ABBB-8B6EB83299CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Nls.Tests", "tests\System.Globalization.Extensions.Tests\NlsTests\System.Globalization.Extensions.Nls.Tests.csproj", "{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests\System.Globalization.Extensions.Tests.csproj", "{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Hybrid.WASM.Tests", "tests\System.Globalization.Tests\Hybrid\System.Globalization.Hybrid.WASM.Tests.csproj", "{C5F86889-E147-4424-9165-D2DF453741F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.IOS.Tests", "tests\System.Globalization.Tests\Hybrid\System.Globalization.IOS.Tests.csproj", "{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IcuAppLocal.Tests", "tests\System.Globalization.Tests\IcuAppLocal\IcuAppLocal.Tests.csproj", "{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Invariant.Tests", "tests\System.Globalization.Tests\Invariant\Invariant.Tests.csproj", "{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Nls.Tests", "tests\System.Globalization.Tests\NlsTests\System.Globalization.Nls.Tests.csproj", "{32247916-74DE-4A62-AE68-04976D2B0149}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Tests", "tests\System.Globalization.Tests\System.Globalization.Tests.csproj", "{5090E2BE-4BC9-4027-BF67-452049996F43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests\System.IO.FileSystem.Primitives.Tests.csproj", "{61164A2A-D90F-4122-AF5D-9704564E80E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DisabledFileLocking.Tests", "tests\System.IO.FileSystem.Tests\DisabledFileLockingTests\System.IO.FileSystem.DisabledFileLocking.Tests.csproj", "{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Manual.Tests", "tests\System.IO.FileSystem.Tests\ManualTests\System.IO.FileSystem.Manual.Tests.csproj", "{652F0921-C134-4882-A9D0-0CBB2F8D75B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests\System.IO.FileSystem.Tests.csproj", "{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Tests", "tests\System.IO.Tests\System.IO.Tests.csproj", "{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream.Tests", "tests\System.IO.UnmanagedMemoryStream.Tests\System.IO.UnmanagedMemoryStream.Tests.csproj", "{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_0_0_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_0_0_0_0.csproj", "{E73952E5-C929-4566-962A-B9AF65289871}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_0_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_0_0_0.csproj", "{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_0_0.csproj", "{A6D86695-D570-43F9-99A3-6C7445362D53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_0.csproj", "{852EA6A6-CED9-467C-9B58-9983ADBEA89A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_2", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_2.csproj", "{259CC89C-F5E0-4CF0-92FA-3075E0142589}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_3", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_3.csproj", "{E884B43D-FD9D-41C6-9C1D-5F49C472032D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_2_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_2_0.csproj", "{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_3_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_3_0.csproj", "{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_2_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_2_0_0.csproj", "{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_3_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_3_0_0.csproj", "{A5260207-E621-4792-A09D-9DF5DA16FFE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tests\System.Runtime.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_3_0_0_0", "tests\System.Reflection.Tests\AssemblyVersion\System.Reflection.Tests.Assembly_3_0_0_0.csproj", "{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.ReflectionInvokeEmit.Tests", "tests\System\Reflection\InvokeEmit\System.Runtime.ReflectionInvokeEmit.Tests.csproj", "{C3F25EEF-04B4-407A-960B-0C1CE9C04430}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.CoreCLR.Tests", "tests\System.Reflection.Tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj", "{D592CC73-099B-499C-80E6-FFBE5E4FA14A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.ReflectionInvokeInterpreted.Tests", "tests\System\Reflection\InvokeInterpreted\System.Runtime.ReflectionInvokeInterpreted.Tests.csproj", "{47E26787-7C27-4572-AD8B-868DE44E2C48}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForwardedTypesAssembly", "tests\System.Reflection.Tests\ForwardedTypesAssembly\ForwardedTypesAssembly.csproj", "{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCollectibleAssembly", "tests\TestCollectibleAssembly\TestCollectibleAssembly.csproj", "{C230AC88-A377-4BEB-824F-AB174C14DC86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.InvokeEmit.Tests", "tests\System.Reflection.Tests\InvokeEmit\System.Reflection.InvokeEmit.Tests.csproj", "{673597FC-FDC9-46A8-B503-D670FC9BD22E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLoadAssembly", "tests\TestLoadAssembly\TestLoadAssembly.csproj", "{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.InvokeInterpreted.Tests", "tests\System.Reflection.Tests\InvokeInterpreted\System.Reflection.InvokeInterpreted.Tests.csproj", "{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestModule", "tests\TestModule\System.Reflection.TestModule.ilproj", "{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests", "tests\System.Reflection.Tests\System.Reflection.Tests.csproj", "{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.TestStructs", "tests\TestStructs\System.TestStructs.ilproj", "{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly", "tests\System.Reflection.Tests\TestAssembly\TestAssembly.csproj", "{049319F0-D438-404C-A6D4-4D1E99DAE647}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestExe", "tests\System.Reflection.Tests\TestExe\System.Reflection.TestExe.csproj", "{691D460F-764F-48E7-9A3F-7D1A32388542}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssembly", "tests\System.Reflection.Tests\UnloadableAssembly\UnloadableAssembly.csproj", "{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests\System.Resources.Reader.Tests.csproj", "{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests\System.Resources.ResourceManager.Tests.csproj", "{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests\System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveTestApp", "tests\System.Runtime.Extensions.Tests\AssemblyResolveTestApp\AssemblyResolveTestApp.csproj", "{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.Tests", "tests\System.Runtime.Extensions.Tests\System.Runtime.Extensions.Tests.csproj", "{E1847313-0072-49CA-A1E6-6C05CECAB77A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TargetFrameworkNameTestApp", "tests\System.Runtime.Extensions.Tests\TargetFrameworkNameTestApp\TargetFrameworkNameTestApp.csproj", "{D86CC877-79A0-4AFA-9A76-7263B414614D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "tests\System.Runtime.Extensions.Tests\TestApp\TestApp.csproj", "{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAppOutsideOfTPA", "tests\System.Runtime.Extensions.Tests\TestAppOutsideOfTPA\TestAppOutsideOfTPA.csproj", "{59CD73F2-1310-46EE-B99A-594859FD8A37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoidMainWithExitCodeApp", "tests\System.Runtime.Extensions.Tests\VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj", "{3D58505D-F17F-49E0-9131-42F273E3F5B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests\System.Runtime.Handles.Tests.csproj", "{0BF9F165-888D-486A-B6FD-6F3029913D70}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests\System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{C485C170-2B88-4EA9-8826-7BC4C9BA2324}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.IOS.Tests", "tests\System.Runtime.Tests\Hybrid\System.Runtime.IOS.Tests.csproj", "{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\System.Runtime.Tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tests\System.Runtime.Tests\System.Runtime.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.ReflectionInvokeEmit.Tests", "tests\System.Runtime.Tests\System\Reflection\InvokeEmit\System.Runtime.ReflectionInvokeEmit.Tests.csproj", "{C3F25EEF-04B4-407A-960B-0C1CE9C04430}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.ReflectionInvokeInterpreted.Tests", "tests\System.Runtime.Tests\System\Reflection\InvokeInterpreted\System.Runtime.ReflectionInvokeInterpreted.Tests.csproj", "{47E26787-7C27-4572-AD8B-868DE44E2C48}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCollectibleAssembly", "tests\System.Runtime.Tests\TestCollectibleAssembly\TestCollectibleAssembly.csproj", "{C230AC88-A377-4BEB-824F-AB174C14DC86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLoadAssembly", "tests\System.Runtime.Tests\TestLoadAssembly\TestLoadAssembly.csproj", "{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestModule", "tests\System.Runtime.Tests\TestModule\System.Reflection.TestModule.ilproj", "{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.TestStructs", "tests\System.Runtime.Tests\TestStructs\System.TestStructs.ilproj", "{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests\System.Security.SecureString.Tests.csproj", "{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Tests", "tests\System.Text.Encoding.Tests\System.Text.Encoding.Tests.csproj", "{697C63A2-2517-4F85-8B88-C94E538BE407}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions.Tests", "tests\System.Threading.Tasks.Extensions.Tests\System.Threading.Tasks.Extensions.Tests.csproj", "{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests\System.Threading.Tasks.Tests.csproj", "{172F6EB9-6001-4657-8AE2-83DB23B371CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer.Tests", "tests\System.Threading.Timer.Tests\System.Threading.Timer.Tests.csproj", "{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple.Tests", "tests\System.ValueTuple.Tests\System.ValueTuple.Tests.csproj", "{BBC59E42-DC0B-4847-B336-13ACF4279F17}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{78C45C87-93B6-4FCE-B174-520756DE4E74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "..\System.Security.Claims\ref\System.Security.Claims.csproj", "{07197CBF-7C41-47B6-9E52-88A6D4485219}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{F6A8185B-07C6-401D-9B40-3C560239E05F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "..\System.ServiceProcess.ServiceController\ref\System.ServiceProcess.ServiceController.csproj", "{12E1EFEA-60DE-41D7-B148-AB0182594C1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "..\System.ServiceProcess.ServiceController\src\System.ServiceProcess.ServiceController.csproj", "{8C0E3201-1F0E-45A0-9897-A679C0C4F684}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{25E8AB9D-2D10-44F5-9F83-5A5134526771}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{50F1165C-5F71-472C-B317-35FFC14665EA}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{82728202-1098-4E16-B598-5762EAF67D08}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}"
@@ -69,10 +229,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD72C125
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F362E63A-2B1A-445B-B198-3071D7DDE8CF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B2B5E7E-A2FB-4095-9E79-404BF53E0133}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F362E63A-2B1A-445B-B198-3071D7DDE8CF}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{13818769-DC01-4715-9590-E000D03E42A9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{04D0E381-5B43-42C0-8E08-FADBFCECB353}"
@@ -130,6 +290,27 @@ Global
 		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.Build.0 = Checked|x64
 		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.ActiveCfg = Checked|x86
 		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.Build.0 = Checked|x86
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Debug|x86.Build.0 = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|arm.ActiveCfg = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|x64.Build.0 = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Release|x86.Build.0 = Release|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F86D6534-1A96-489E-A807-C14E616686D6}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -214,6 +395,216 @@ Global
 		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|x64.Build.0 = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Debug|x86.Build.0 = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|arm.ActiveCfg = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|arm64.ActiveCfg = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|x64.ActiveCfg = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|x64.Build.0 = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|x86.ActiveCfg = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Release|x86.Build.0 = Release|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{86CF47B3-D607-4F59-896F-982FEA116086}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|x64.Build.0 = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Debug|x86.Build.0 = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|arm.ActiveCfg = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|arm64.ActiveCfg = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|x64.ActiveCfg = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|x64.Build.0 = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|x86.ActiveCfg = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Release|x86.Build.0 = Release|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{484B12B8-F027-4960-BAA9-14D646C80A28}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|x64.Build.0 = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Debug|x86.Build.0 = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|arm.ActiveCfg = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|x64.ActiveCfg = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|x64.Build.0 = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|x86.ActiveCfg = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Release|x86.Build.0 = Release|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|arm.ActiveCfg = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|x64.Build.0 = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Release|x86.Build.0 = Release|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|x64.Build.0 = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Debug|x86.Build.0 = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|arm.ActiveCfg = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|x64.ActiveCfg = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|x64.Build.0 = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|x86.ActiveCfg = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Release|x86.Build.0 = Release|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B876CC90-CB87-4B1B-B6F5-247990192578}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|arm.ActiveCfg = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|x64.Build.0 = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Release|x86.Build.0 = Release|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|arm.ActiveCfg = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|x64.Build.0 = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Release|x86.Build.0 = Release|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{019A13D1-3493-4024-8223-FCB6763F80B4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|x64.Build.0 = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Debug|x86.Build.0 = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|arm.ActiveCfg = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|x64.ActiveCfg = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|x64.Build.0 = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|x86.ActiveCfg = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Release|x86.Build.0 = Release|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9ECF9E5C-860F-49C3-95D0-501147F19548}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|arm.ActiveCfg = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|x64.Build.0 = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Release|x86.Build.0 = Release|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|x64.Build.0 = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Debug|x86.Build.0 = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|arm.ActiveCfg = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|x64.ActiveCfg = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|x64.Build.0 = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|x86.ActiveCfg = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Release|x86.Build.0 = Release|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -277,6 +668,69 @@ Global
 		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|x64.Build.0 = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Debug|x86.Build.0 = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|arm.ActiveCfg = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|x64.ActiveCfg = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|x64.Build.0 = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|x86.ActiveCfg = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Release|x86.Build.0 = Release|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|x64.Build.0 = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|arm.ActiveCfg = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|x64.ActiveCfg = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|x64.Build.0 = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Release|x86.Build.0 = Release|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F977B04F-675C-4B78-8FCE-19D70504166D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|x64.Build.0 = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Debug|x86.Build.0 = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|Any CPU.Build.0 = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|arm.ActiveCfg = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|arm64.ActiveCfg = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|x64.ActiveCfg = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|x64.Build.0 = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|x86.ActiveCfg = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Release|x86.Build.0 = Release|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -361,6 +815,1119 @@ Global
 		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|arm.ActiveCfg = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|x64.Build.0 = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Release|x86.Build.0 = Release|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|x64.Build.0 = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Debug|x86.Build.0 = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|arm.ActiveCfg = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|arm64.ActiveCfg = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|x64.ActiveCfg = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|x64.Build.0 = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|x86.ActiveCfg = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Release|x86.Build.0 = Release|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{23D41678-453F-4F2A-85F1-167E63DA6D67}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|x64.Build.0 = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Debug|x86.Build.0 = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|arm.ActiveCfg = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|x64.ActiveCfg = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|x64.Build.0 = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|x86.ActiveCfg = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Release|x86.Build.0 = Release|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6790611D-ACE0-47C6-83E0-E404364B5210}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|arm.ActiveCfg = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|x64.Build.0 = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Release|x86.Build.0 = Release|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|arm.ActiveCfg = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|x64.Build.0 = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Release|x86.Build.0 = Release|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|arm.ActiveCfg = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|x64.Build.0 = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Release|x86.Build.0 = Release|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|x64.Build.0 = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Debug|x86.Build.0 = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|arm.ActiveCfg = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|x64.ActiveCfg = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|x64.Build.0 = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|x86.ActiveCfg = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Release|x86.Build.0 = Release|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{70441C80-1F14-42F9-8225-A891E3C9A82A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|arm.ActiveCfg = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|x64.Build.0 = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Release|x86.Build.0 = Release|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|arm.ActiveCfg = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|x64.Build.0 = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Release|x86.Build.0 = Release|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|x64.Build.0 = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Debug|x86.Build.0 = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|arm.ActiveCfg = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|x64.ActiveCfg = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|x64.Build.0 = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Release|x86.Build.0 = Release|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|arm.ActiveCfg = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|x64.Build.0 = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Release|x86.Build.0 = Release|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|arm.ActiveCfg = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|x64.Build.0 = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Release|x86.Build.0 = Release|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C5F86889-E147-4424-9165-D2DF453741F2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|x64.Build.0 = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Debug|x86.Build.0 = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|arm.ActiveCfg = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|x64.ActiveCfg = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|x64.Build.0 = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Release|x86.Build.0 = Release|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Debug|x86.Build.0 = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|arm.ActiveCfg = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|x64.Build.0 = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Release|x86.Build.0 = Release|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|arm.ActiveCfg = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|x64.Build.0 = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Release|x86.Build.0 = Release|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|x64.Build.0 = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Debug|x86.Build.0 = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|arm.ActiveCfg = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|arm64.ActiveCfg = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|x64.ActiveCfg = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|x64.Build.0 = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|x86.ActiveCfg = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Release|x86.Build.0 = Release|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{32247916-74DE-4A62-AE68-04976D2B0149}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|x64.Build.0 = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Debug|x86.Build.0 = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|arm.ActiveCfg = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|x64.ActiveCfg = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|x64.Build.0 = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|x86.ActiveCfg = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Release|x86.Build.0 = Release|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5090E2BE-4BC9-4027-BF67-452049996F43}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|arm.ActiveCfg = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|x64.Build.0 = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Release|x86.Build.0 = Release|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{61164A2A-D90F-4122-AF5D-9704564E80E0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Debug|x86.Build.0 = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|arm.ActiveCfg = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|x64.Build.0 = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Release|x86.Build.0 = Release|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|arm.ActiveCfg = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|x64.Build.0 = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Release|x86.Build.0 = Release|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|x64.Build.0 = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Debug|x86.Build.0 = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|arm.ActiveCfg = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|x64.ActiveCfg = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|x64.Build.0 = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|x86.ActiveCfg = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Release|x86.Build.0 = Release|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Debug|x86.Build.0 = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|arm.ActiveCfg = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|x64.Build.0 = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Release|x86.Build.0 = Release|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|arm.ActiveCfg = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|x64.Build.0 = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Release|x86.Build.0 = Release|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|x64.Build.0 = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Debug|x86.Build.0 = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|arm.ActiveCfg = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|x64.ActiveCfg = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|x64.Build.0 = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|x86.ActiveCfg = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Release|x86.Build.0 = Release|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E73952E5-C929-4566-962A-B9AF65289871}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|x64.Build.0 = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Debug|x86.Build.0 = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|arm.ActiveCfg = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|x64.ActiveCfg = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|x64.Build.0 = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|x86.ActiveCfg = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Release|x86.Build.0 = Release|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Debug|x86.Build.0 = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|arm.ActiveCfg = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|x64.Build.0 = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Release|x86.Build.0 = Release|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A6D86695-D570-43F9-99A3-6C7445362D53}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|x64.Build.0 = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Debug|x86.Build.0 = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|arm.ActiveCfg = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|x64.ActiveCfg = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|x64.Build.0 = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|x86.ActiveCfg = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Release|x86.Build.0 = Release|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|x64.Build.0 = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Debug|x86.Build.0 = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|Any CPU.Build.0 = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|arm.ActiveCfg = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|arm64.ActiveCfg = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|x64.ActiveCfg = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|x64.Build.0 = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|x86.ActiveCfg = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Release|x86.Build.0 = Release|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|arm.ActiveCfg = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|x64.Build.0 = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Release|x86.Build.0 = Release|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|arm.ActiveCfg = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|x64.Build.0 = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Release|x86.Build.0 = Release|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|x64.Build.0 = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|arm.ActiveCfg = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|x64.ActiveCfg = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|x64.Build.0 = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Release|x86.Build.0 = Release|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|x64.Build.0 = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Debug|x86.Build.0 = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|arm.ActiveCfg = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|x64.ActiveCfg = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|x64.Build.0 = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|x86.ActiveCfg = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Release|x86.Build.0 = Release|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|arm.ActiveCfg = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|x64.Build.0 = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Release|x86.Build.0 = Release|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|x64.Build.0 = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Debug|x86.Build.0 = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|arm.ActiveCfg = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|x64.ActiveCfg = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|x64.Build.0 = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|x86.ActiveCfg = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Release|x86.Build.0 = Release|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|x64.Build.0 = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Debug|x86.Build.0 = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|arm.ActiveCfg = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|x64.ActiveCfg = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|x64.Build.0 = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|x86.ActiveCfg = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Release|x86.Build.0 = Release|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|arm.ActiveCfg = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|x64.Build.0 = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Release|x86.Build.0 = Release|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|x64.Build.0 = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Debug|x86.Build.0 = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|arm.ActiveCfg = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|x64.ActiveCfg = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|x64.Build.0 = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|x86.ActiveCfg = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Release|x86.Build.0 = Release|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|x64.Build.0 = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Debug|x86.Build.0 = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|arm.ActiveCfg = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|x64.ActiveCfg = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|x64.Build.0 = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Release|x86.Build.0 = Release|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Debug|x86.Build.0 = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|arm.ActiveCfg = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|x64.Build.0 = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Release|x86.Build.0 = Release|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|x64.Build.0 = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Debug|x86.Build.0 = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|Any CPU.Build.0 = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|arm.ActiveCfg = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|arm64.ActiveCfg = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|x64.ActiveCfg = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|x64.Build.0 = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|x86.ActiveCfg = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Release|x86.Build.0 = Release|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{049319F0-D438-404C-A6D4-4D1E99DAE647}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|x64.Build.0 = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Debug|x86.Build.0 = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|Any CPU.Build.0 = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|arm.ActiveCfg = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|arm64.ActiveCfg = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|x64.ActiveCfg = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|x64.Build.0 = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|x86.ActiveCfg = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Release|x86.Build.0 = Release|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{691D460F-764F-48E7-9A3F-7D1A32388542}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|x64.Build.0 = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Debug|x86.Build.0 = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|arm.ActiveCfg = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|x64.ActiveCfg = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|x64.Build.0 = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Release|x86.Build.0 = Release|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|arm.ActiveCfg = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|x64.Build.0 = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Release|x86.Build.0 = Release|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|arm.ActiveCfg = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|x64.Build.0 = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Release|x86.Build.0 = Release|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|x64.Build.0 = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Debug|x86.Build.0 = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|arm.ActiveCfg = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|x64.ActiveCfg = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|x64.Build.0 = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|x86.ActiveCfg = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Release|x86.Build.0 = Release|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Debug|x86.Build.0 = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|arm.ActiveCfg = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|x64.Build.0 = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Release|x86.Build.0 = Release|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|arm.ActiveCfg = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|x64.Build.0 = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Release|x86.Build.0 = Release|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Debug|x86.Build.0 = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|arm.ActiveCfg = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|x64.Build.0 = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|x86.ActiveCfg = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Release|x86.Build.0 = Release|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D86CC877-79A0-4AFA-9A76-7263B414614D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|arm.ActiveCfg = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|x64.Build.0 = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Release|x86.Build.0 = Release|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|x64.Build.0 = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Debug|x86.Build.0 = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|arm.ActiveCfg = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|arm64.ActiveCfg = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|x64.ActiveCfg = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|x64.Build.0 = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|x86.ActiveCfg = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Release|x86.Build.0 = Release|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{59CD73F2-1310-46EE-B99A-594859FD8A37}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|arm.ActiveCfg = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|x64.Build.0 = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Release|x86.Build.0 = Release|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|x64.Build.0 = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Debug|x86.Build.0 = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|arm.ActiveCfg = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|x64.ActiveCfg = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|x64.Build.0 = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Release|x86.Build.0 = Release|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0BF9F165-888D-486A-B6FD-6F3029913D70}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|x64.Build.0 = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Debug|x86.Build.0 = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|arm.ActiveCfg = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|x64.ActiveCfg = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|x64.Build.0 = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|x86.ActiveCfg = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Release|x86.Build.0 = Release|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -550,6 +2117,174 @@ Global
 		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|x64.Build.0 = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Debug|x86.Build.0 = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|arm.ActiveCfg = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|x64.ActiveCfg = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|x64.Build.0 = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|x86.ActiveCfg = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Release|x86.Build.0 = Release|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|x64.Build.0 = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Debug|x86.Build.0 = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|arm.ActiveCfg = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|arm64.ActiveCfg = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|x64.ActiveCfg = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|x64.Build.0 = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|x86.ActiveCfg = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Release|x86.Build.0 = Release|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{697C63A2-2517-4F85-8B88-C94E538BE407}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|x64.Build.0 = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Debug|x86.Build.0 = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|arm.ActiveCfg = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|arm64.ActiveCfg = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|x64.ActiveCfg = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|x64.Build.0 = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|x86.ActiveCfg = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Release|x86.Build.0 = Release|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Debug|x86.Build.0 = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|arm.ActiveCfg = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|x64.ActiveCfg = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|x64.Build.0 = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|x86.ActiveCfg = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Release|x86.Build.0 = Release|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|arm.ActiveCfg = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|x64.Build.0 = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Release|x86.Build.0 = Release|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|x64.Build.0 = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Debug|x86.Build.0 = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|arm.ActiveCfg = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|x64.ActiveCfg = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|x64.Build.0 = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|x86.ActiveCfg = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Release|x86.Build.0 = Release|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|x64.Build.0 = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Debug|x86.Build.0 = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|arm.ActiveCfg = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|arm64.ActiveCfg = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|x64.ActiveCfg = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|x64.Build.0 = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|x86.ActiveCfg = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Release|x86.Build.0 = Release|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{78C45C87-93B6-4FCE-B174-520756DE4E74}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|x64.Build.0 = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Debug|x86.Build.0 = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|arm.ActiveCfg = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|arm64.ActiveCfg = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|x64.ActiveCfg = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|x64.Build.0 = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|x86.ActiveCfg = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Release|x86.Build.0 = Release|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{07197CBF-7C41-47B6-9E52-88A6D4485219}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -592,6 +2327,69 @@ Global
 		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|arm.ActiveCfg = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|x64.Build.0 = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Release|x86.Build.0 = Release|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|x64.Build.0 = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Debug|x86.Build.0 = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|arm.ActiveCfg = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|x64.ActiveCfg = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|x64.Build.0 = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Release|x86.Build.0 = Release|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|arm.ActiveCfg = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|x64.Build.0 = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Release|x86.Build.0 = Release|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -634,6 +2432,48 @@ Global
 		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|arm.ActiveCfg = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|x64.Build.0 = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Release|x86.Build.0 = Release|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Debug|x86.Build.0 = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|arm.ActiveCfg = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|x64.Build.0 = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Release|x86.Build.0 = Release|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{50F1165C-5F71-472C-B317-35FFC14665EA}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -787,9 +2627,63 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {5B542214-BAF3-4FA7-8424-D0E9C631A2E9}
+		{F86D6534-1A96-489E-A807-C14E616686D6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{FB17AC52-1633-4845-932B-9218DF895957} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{A3873DDB-47E7-4DB6-872C-4B46A779913A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{23D41678-453F-4F2A-85F1-167E63DA6D67} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{6790611D-ACE0-47C6-83E0-E404364B5210} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{B73090B8-20CB-4586-A586-B7F37C1A06FF} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{4C1F2761-857C-40A4-8CDD-7139380DA4D7} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{70441C80-1F14-42F9-8225-A891E3C9A82A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{1C44735B-C77E-479A-ABBB-8B6EB83299CF} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{CA97D5F2-4D71-4448-8DEB-E18C237C76B3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{C5F86889-E147-4424-9165-D2DF453741F2} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{67D9B289-AA6D-4FD8-A99D-F8651A51BE7E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{32247916-74DE-4A62-AE68-04976D2B0149} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{5090E2BE-4BC9-4027-BF67-452049996F43} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{61164A2A-D90F-4122-AF5D-9704564E80E0} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{FDAB957F-5C83-4946-ACF5-825B2B6DAFE6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{652F0921-C134-4882-A9D0-0CBB2F8D75B2} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{CFC724F4-18A2-401F-AED4-7D7A779CE3EA} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{9AA6AAD7-E09B-4F9E-B398-1734A5815B6B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{E73952E5-C929-4566-962A-B9AF65289871} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{9299BE78-5A00-425A-A38F-7F1DC9C3F63E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{A6D86695-D570-43F9-99A3-6C7445362D53} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{852EA6A6-CED9-467C-9B58-9983ADBEA89A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{259CC89C-F5E0-4CF0-92FA-3075E0142589} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{E884B43D-FD9D-41C6-9C1D-5F49C472032D} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{A5260207-E621-4792-A09D-9DF5DA16FFE6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{55C65AC8-0FC0-4A3B-B342-61D4686ABB9A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{D592CC73-099B-499C-80E6-FFBE5E4FA14A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{673597FC-FDC9-46A8-B503-D670FC9BD22E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{CC8D4A15-9101-4041-B992-B6AA4D5F3C64} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{049319F0-D438-404C-A6D4-4D1E99DAE647} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{691D460F-764F-48E7-9A3F-7D1A32388542} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{9F1AC402-BFAD-4EA2-AD31-BBCA73375953} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{DBDA55A9-4BB9-4FF8-9066-EE7157E627C1} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{00807FA3-A9B3-4AF4-86CD-CF10255E6E8C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{E88FDBA9-3D1D-480D-8AB3-341C9E442D03} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{AD4767E9-57F6-47DD-ABD3-D3AFDF384703} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{E1847313-0072-49CA-A1E6-6C05CECAB77A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{D86CC877-79A0-4AFA-9A76-7263B414614D} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{E5E5C278-EBB9-4704-B7BA-56D39A5A343C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{59CD73F2-1310-46EE-B99A-594859FD8A37} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{3D58505D-F17F-49E0-9131-42F273E3F5B9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{0BF9F165-888D-486A-B6FD-6F3029913D70} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{C485C170-2B88-4EA9-8826-7BC4C9BA2324} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{4EE36055-AD7C-4779-B3F6-08687960DCC3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
@@ -799,20 +2693,46 @@ Global
 		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{697C63A2-2517-4F85-8B88-C94E538BE407} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{90F8C08F-A6D0-4AA0-8615-9279E5E4FC19} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{172F6EB9-6001-4657-8AE2-83DB23B371CA} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{7E3B4C81-9010-4473-BD3C-5B90F9533CD7} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{BBC59E42-DC0B-4847-B336-13ACF4279F17} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{21791340-49C4-4C07-97FD-CAA1B72D3256} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{D16B3A49-5709-44CB-B6F8-8E3D585D236F} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{B876CC90-CB87-4B1B-B6F5-247990192578} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{999B1A08-2C7F-43AD-BC50-5F950320BBFF} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{9ECF9E5C-860F-49C3-95D0-501147F19548} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{B11DD674-FFF7-4343-BA1B-F4C788B16DDA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{F977B04F-675C-4B78-8FCE-19D70504166D} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{8C0E3201-1F0E-45A0-9897-A679C0C4F684} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{50F1165C-5F71-472C-B317-35FFC14665EA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
-		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
-		{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
+		{86CF47B3-D607-4F59-896F-982FEA116086} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{484B12B8-F027-4960-BAA9-14D646C80A28} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{F0BB4F76-7697-49A8-8204-FD4516EB325C} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{019A13D1-3493-4024-8223-FCB6763F80B4} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{8F97C1DE-07F7-449F-AA22-84A6D6836D82} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{E64D31D0-8F38-4FDF-B60D-F955D2475566} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{4367BB9C-7EC2-4238-82E2-643DE24CC23E} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{78C45C87-93B6-4FCE-B174-520756DE4E74} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{07197CBF-7C41-47B6-9E52-88A6D4485219} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{1E6C7D88-7584-444C-97CD-2FAAB5BEF465} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{12E1EFEA-60DE-41D7-B148-AB0182594C1B} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{17D73C46-97FF-40EE-B0D9-FB0EBA14B8D8} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{82728202-1098-4E16-B598-5762EAF67D08} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
+		{379BC6E6-1900-44F8-8D8C-AA2968A70008} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
+		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
+		{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
 		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE} = {13818769-DC01-4715-9590-E000D03E42A9}
 		{4CBDF585-FD15-44E9-9795-1BED79BC4960} = {13818769-DC01-4715-9590-E000D03E42A9}
 		{13818769-DC01-4715-9590-E000D03E42A9} = {67DCB1C2-0B95-40B6-ACE8-9812BF57EB19}
diff --git a/src/libraries/System.Buffers/tests/ArrayPool/ArrayPoolTest.cs b/src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/ArrayPoolTest.cs
similarity index 100%
rename from src/libraries/System.Buffers/tests/ArrayPool/ArrayPoolTest.cs
rename to src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/ArrayPoolTest.cs
diff --git a/src/libraries/System.Buffers/tests/ArrayPool/CollectionTests.cs b/src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/CollectionTests.cs
similarity index 100%
rename from src/libraries/System.Buffers/tests/ArrayPool/CollectionTests.cs
rename to src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/CollectionTests.cs
diff --git a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs b/src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/UnitTests.cs
similarity index 100%
rename from src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs
rename to src/libraries/System.Runtime/tests/System.Buffers.Tests/ArrayPool/UnitTests.cs
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj
similarity index 100%
rename from src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebugTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebugTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebugTestsNoListeners.Interpolation.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsNoListeners.Interpolation.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebugTestsNoListeners.Interpolation.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsNoListeners.Interpolation.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebugTestsNoListeners.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsNoListeners.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebugTestsNoListeners.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsNoListeners.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebugTestsUsingListeners.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsUsingListeners.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebugTestsUsingListeners.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebugTestsUsingListeners.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebuggerBrowsableAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerBrowsableAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebuggerBrowsableAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerBrowsableAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebuggerDisplayAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerDisplayAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebuggerDisplayAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerDisplayAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebuggerTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebuggerTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebuggerTypeProxyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerTypeProxyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebuggerTypeProxyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerTypeProxyAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/DebuggerVisualizerAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerVisualizerAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/DebuggerVisualizerAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/DebuggerVisualizerAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/EmptyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/EmptyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/EmptyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/EmptyAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/System.Diagnostics.Debug.Tests.csproj
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/System.Diagnostics.Debug.Tests.csproj
diff --git a/src/libraries/System.Diagnostics.Debug/tests/XunitAssemblyAttributes.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/XunitAssemblyAttributes.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Debug/tests/XunitAssemblyAttributes.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Debug.Tests/XunitAssemblyAttributes.cs
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj b/src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System.Diagnostics.Tools.Tests.csproj
similarity index 100%
rename from src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System.Diagnostics.Tools.Tests.csproj
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System/CodeDom/Compiler/GeneratedCodeAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/CodeDom/Compiler/GeneratedCodeAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Tools/tests/System/CodeDom/Compiler/GeneratedCodeAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/CodeDom/Compiler/GeneratedCodeAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Tools/tests/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttributeTests.cs
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System/Diagnostics/CodeAnalysis/SuppressMessageAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/Diagnostics/CodeAnalysis/SuppressMessageAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Diagnostics.Tools/tests/System/Diagnostics/CodeAnalysis/SuppressMessageAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Diagnostics.Tools.Tests/System/Diagnostics/CodeAnalysis/SuppressMessageAttributeTests.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/CallInfoTests.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/CallInfoTests.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/CallInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/CallInfoTests.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Common.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Common.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Common.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Common.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Common.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Common.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Common.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Common.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Generic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Generic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Generic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Generic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Inheritance.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Inheritance.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Inheritance.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.Inheritance.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.ExplicitImple.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.delegateEvent.delegate.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.delegateEvent.delegate.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.delegateEvent.delegate.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.delegateEvent.delegate.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.genmethod.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.method.regmethod.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.conversion.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.conversion.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.conversion.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.conversion.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.negative.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.negative.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.negative.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.negative.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.AndEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.AndEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.AndEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.AndEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.DivideEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.DivideEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.DivideEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.DivideEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ModEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ModEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ModEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ModEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.MultiEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.MultiEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.MultiEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.MultiEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.OrEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.OrEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.OrEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.OrEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.PlusEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.PlusEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.PlusEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.PlusEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftLeftEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftLeftEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftLeftEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftLeftEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftRightEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftRightEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftRightEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.ShiftRightEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.SubEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.SubEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.SubEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.SubEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.XOREqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.XOREqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.XOREqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.lift.XOREqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.negative.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.negative.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.negative.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.negative.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.AndEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.AndEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.AndEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.AndEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.DivideEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.DivideEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.DivideEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.DivideEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ModEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ModEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ModEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ModEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.MultiEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.MultiEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.MultiEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.MultiEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.OrEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.OrEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.OrEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.OrEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.PlusEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.PlusEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.PlusEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.PlusEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftLeftEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftLeftEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftLeftEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftLeftEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftRightEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftRightEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftRightEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.ShiftRightEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.SubEqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.SubEqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.SubEqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.SubEqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.XOREqual.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.XOREqual.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.XOREqual.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.type.XOREqual.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.autoproperty.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.genclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.genclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.genclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.regclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.regclass.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.regclass.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.property.regproperty.regclass.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.backwardscompatible.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.backwardscompatible.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.backwardscompatible.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.backwardscompatible.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Indexers.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Indexers.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Indexers.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Indexers.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Methods.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Methods.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Methods.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Methods.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Operators.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Operators.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Operators.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.formalParameter.Operators.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.blockVariable.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.blockVariable.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.blockVariable.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.blockVariable.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.simple.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.simple.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.simple.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.localVariable.simple.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.indexers.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.indexers.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.indexers.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.indexers.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.methods.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.methods.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.methods.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.methods.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.operator.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.operator.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.operator.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.operator.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.properties.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.properties.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.properties.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Declarations/Conformance.dynamic.declarations.returnType.properties.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.classes.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.classes.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.classes.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.classes.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.conversions.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.conversions.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.conversions.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.conversions.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.formalParameter.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.formalParameter.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.formalParameter.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.formalParameter.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.constraints.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.constraints.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.constraints.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.constraints.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.derived.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.derived.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.derived.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.derived.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.extractDynamic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.extractDynamic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.extractDynamic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.extractDynamic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.nested.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.nested.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.nested.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.generics.nested.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.interfaces.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.interfaces.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.interfaces.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.interfaces.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.invoke.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.invoke.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.invoke.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.invoke.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.nullable.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.nullable.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.nullable.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.nullable.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.1param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.1param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.1param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.1param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.2param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.2param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.2param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.1class.2param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.2class.overload.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.2class.overload.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.2class.overload.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.getter.2class.overload.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.1param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.1param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.1param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.1param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.2param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.2param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.2param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.1class.2param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.2class.overload.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.2class.overload.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.2class.overload.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.indexer.setter.2class.overload.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.1param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.1param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.1param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.1param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.2param.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.2param.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.2param.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.1class.2param.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.2class.overload.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.2class.overload.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.2class.overload.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.overloadResolution.method.2class.overload.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.covariant.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.covariant.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.covariant.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.returnType.covariant.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.statements.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.statements.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.statements.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.statements.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.structs.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.structs.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.structs.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.structs.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.defaultParameter.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.defaultParameter.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.defaultParameter.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.defaultParameter.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.optionalParameter.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.optionalParameter.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.optionalParameter.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.attributes.optionalParameter.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.declaration.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.declaration.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.declaration.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.declaration.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.delegate.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.delegate.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.delegate.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.delegate.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.inheritance.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.inheritance.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.inheritance.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.inheritance.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.interface.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.interface.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.interface.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.interface.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.opOverload.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.opOverload.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.opOverload.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.opOverload.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.other.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.other.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.other.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.other.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.struct.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.struct.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.struct.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.struct.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.types.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.types.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.types.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.decl.types.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.delegate.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.delegate.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.delegate.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.delegate.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.executeOrder.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.executeOrder.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.executeOrder.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.executeOrder.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.extension.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.extension.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.extension.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.extension.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.inheritance.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.inheritance.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.inheritance.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.inheritance.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.other.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.other.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.other.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.other.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.overload.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.overload.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.overload.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.overload.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.params.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.params.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.params.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.NamedAndOptional/Conformance.dynamic.namedandoptional.usage.params.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.ClsCompliance.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.ClsCompliance.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.ClsCompliance.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.ClsCompliance.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.IDynamicObject.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.IDynamicObject.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.IDynamicObject.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.IDynamicObject.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.SpecialNames.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.SpecialNames.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.SpecialNames.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.SpecialNames.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.interaction.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.interaction.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Other/Conformance.dynamic.interaction.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Other/Conformance.dynamic.interaction.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.1class2indexers.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.1class2indexers.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.1class2indexers.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.1class2indexers.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.2class2indexers.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.2class2indexers.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.2class2indexers.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Indexers.2class2indexers.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.1class2methods.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.1class2methods.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.1class2methods.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.1class2methods.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.2class2methods.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.2class2methods.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.2class2methods.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.2class2methods.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.literals.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.literals.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.literals.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Methods.literals.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.binary.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.binary.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.binary.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.binary.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.conversion.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.conversion.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.conversion.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.1class2operators.conversion.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.binary.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.binary.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.binary.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.binary.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.conversion.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.conversion.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.conversion.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.conversion.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.unary.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.unary.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.unary.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.2class2operators.unary.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Operators.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Properties.2class2props.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Properties.2class2props.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Properties.2class2props.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.Properties.2class2props.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.interactionDynamicObject.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.interactionDynamicObject.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.interactionDynamicObject.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.OverloadResolution/Conformance.dynamic.overloadResolution.interactionDynamicObject.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/DelegateTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/DelegateTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/DelegateTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/DelegateTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/EventsTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/EventsTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/EventsTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/EventsTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/ForEachTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/ForEachTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/ForEachTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/ForEachTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/IndexerTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/IndexerTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/IndexerTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/IndexerTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/NamedParametersTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/NamedParametersTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/NamedParametersTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/NamedParametersTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OperatorTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OperatorTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OperatorTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OperatorTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OptionalParametersTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OptionalParametersTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OptionalParametersTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OptionalParametersTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OverloadTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OverloadTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/OverloadTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/OverloadTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/SpecialNamesTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/SpecialNamesTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/SpecialNamesTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/SpecialNamesTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/VarianceTest.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/VarianceTest.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Simple/VarianceTest.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Simple/VarianceTest.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Binary.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Binary.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Binary.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Binary.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Unary.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Unary.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Unary.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.IndexerOperator.Unary.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.Null.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.Null.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.Null.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.Null.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.const.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.const.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.const.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.const.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.foreach.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.foreach.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.foreach.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.foreach.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.invokeDynamic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.invokeDynamic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.invokeDynamic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.invokeDynamic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.unaryOperators.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.unaryOperators.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Statements/Conformance.dynamic.statements.unaryOperators.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Statements/Conformance.dynamic.statements.unaryOperators.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.PointerOperator.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.PointerOperator.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.PointerOperator.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.PointerOperator.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/Conformance.dynamic.unsafe.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/conformance.dynamic.unsafe.context.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/conformance.dynamic.unsafe.context.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Unsafe/conformance.dynamic.unsafe.context.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Unsafe/conformance.dynamic.unsafe.context.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.assign.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.assign.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.assign.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.assign.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.basic.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.basic.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.basic.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.basic.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.complex.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.complex.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.complex.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.complex.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.decl.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.decl.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.decl.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.decl.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.expr.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.expr.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.expr.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.expr.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.implem.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.implem.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/Dynamic.Variance/Conformance.dynamic.Variance.implem.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Variance/Conformance.dynamic.Variance.implem.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/ErrorVerifier.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/ErrorVerifier.cs
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/ErrorVerifier.cs
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/ErrorVerifier.cs
diff --git a/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/System.Dynamic.Runtime.Tests.csproj
similarity index 100%
rename from src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/System.Dynamic.Runtime.Tests.csproj
diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/CalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/CalendarTestWithConfigSwitch/CalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/CalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/CalendarTestWithConfigSwitch/CalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarAddMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarAddMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarAddMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarAddMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarAddYears.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarAddYears.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarAddYears.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarAddYears.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfWeek.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfWeek.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfWeek.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfWeek.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDayOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDayOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDaysInMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDaysInMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDaysInMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDaysInMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDaysInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDaysInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetDaysInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetDaysInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetEra.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetEra.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetEra.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetEra.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetLeapMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetLeapMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetLeapMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetLeapMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetMonthsInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetMonthsInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetMonthsInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetMonthsInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetWeekOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetWeekOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetWeekOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetWeekOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarGetYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarGetYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapDay.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapDay.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapDay.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapDay.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarIsLeapYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarIsLeapYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTests.Utilities.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarTests.Utilities.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTests.Utilities.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarTests.Utilities.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarToDateTime.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarToDateTime.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarToDateTime.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarToDateTime.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarToFourDigitYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarToFourDigitYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarToFourDigitYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarToFourDigitYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.Hybrid.WASM.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Hybrid/System.Globalization.Calendars.Hybrid.WASM.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.Hybrid.WASM.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Hybrid/System.Globalization.Calendars.Hybrid.WASM.Tests.csproj
diff --git a/src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj
diff --git a/src/libraries/System.Globalization.Calendars/tests/ISOWeek/ISOWeekTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ISOWeek/ISOWeekTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ISOWeek/ISOWeekTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ISOWeek/ISOWeekTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarAddMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarAddMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarAddMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarAddMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarToFourDigitYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarToFourDigitYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarToFourDigitYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarToFourDigitYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarTwoDigitYearMax.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarTwoDigitYearMax.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/JapaneseCalendar/JapaneseCalendarTwoDigitYearMax.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/JapaneseCalendar/JapaneseCalendarTwoDigitYearMax.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarAddMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarAddMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarAddMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarAddMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarAddYears.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarAddYears.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarAddYears.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarAddYears.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfWeek.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfWeek.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfWeek.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfWeek.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDayOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDayOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDaysInMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDaysInMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDaysInMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDaysInMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDaysInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDaysInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetDaysInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetDaysInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetEra.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetEra.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetEra.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetEra.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetMonthsInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetMonthsInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetMonthsInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetMonthsInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetWeekOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetWeekOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetWeekOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetWeekOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarGetYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarGetYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapDay.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapDay.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapDay.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapDay.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarIsLeapYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarIsLeapYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarToDateTime.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarToDateTime.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarToDateTime.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarToDateTime.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarToFourDigitYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarToFourDigitYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarToFourDigitYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarToFourDigitYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Misc/Calendars.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Misc/Calendars.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Misc/MiscCalendars.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/Misc/MiscCalendars.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/Misc/MiscCalendars.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System.Globalization.Calendars.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System.Globalization.Calendars.Tests.csproj
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/CalendarTestBase.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/CalendarTestBase.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/ChineseLunisolarCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/ChineseLunisolarCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/ChineseLunisolarCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/ChineseLunisolarCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/EastAsianLunisolarCalendarTestBase.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/EastAsianLunisolarCalendarTestBase.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/EastAsianLunisolarCalendarTestBase.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/EastAsianLunisolarCalendarTestBase.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/GregorianCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/GregorianCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/GregorianCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/GregorianCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/HebrewCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/HebrewCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/HebrewCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/HebrewCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/HijriCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/HijriCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/HijriCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/HijriCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/JapaneseCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JapaneseCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/JapaneseCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JapaneseCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/JapaneseLunisolarCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JapaneseLunisolarCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/JapaneseLunisolarCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JapaneseLunisolarCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/JulianCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JulianCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/JulianCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/JulianCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/KoreanCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/KoreanCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/KoreanCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/KoreanCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/KoreanLunisolarCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/KoreanLunisolarCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/KoreanLunisolarCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/KoreanLunisolarCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/PersianCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/PersianCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/PersianCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/PersianCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/TaiwanCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/TaiwanCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/TaiwanCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/TaiwanCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/TaiwanLunisolarCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/TaiwanLunisolarCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/TaiwanLunisolarCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/TaiwanLunisolarCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/ThaiBuddhistCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/ThaiBuddhistCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/ThaiBuddhistCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/ThaiBuddhistCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/UmAlQuraCalendarTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/UmAlQuraCalendarTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/System/Globalization/UmAlQuraCalendarTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/System/Globalization/UmAlQuraCalendarTests.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiWanCalendarIsLeapYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiWanCalendarIsLeapYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiWanCalendarIsLeapYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiWanCalendarIsLeapYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarAddMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarAddMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarAddMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarAddMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarAddYears.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarAddYears.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarAddYears.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarAddYears.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarDaysAndMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarDaysAndMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarDaysAndMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarDaysAndMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfWeek.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfWeek.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfWeek.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfWeek.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDayOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDayOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDaysInMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDaysInMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDaysInMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDaysInMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDaysInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDaysInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetDaysInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetDaysInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetEra.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetEra.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetEra.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetEra.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetMonthsInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetMonthsInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetMonthsInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetMonthsInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetWeekOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetWeekOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetWeekOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetWeekOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarGetYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarGetYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarIsLeapDay.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarIsLeapDay.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarIsLeapDay.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarIsLeapDay.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarIsLeapMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarIsLeapMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarIsLeapMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarIsLeapMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarToDateTime.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarToDateTime.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarToDateTime.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarToDateTime.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarToFourDigitYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarToFourDigitYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarToFourDigitYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarToFourDigitYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarTwoDigitYearMax.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarTwoDigitYearMax.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarTwoDigitYearMax.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarTwoDigitYearMax.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarUtilities.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarUtilities.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/TaiwanCalendar/TaiwanCalendarUtilities.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/TaiwanCalendar/TaiwanCalendarUtilities.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddMonths.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddMonths.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddMonths.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddMonths.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddYears.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddYears.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddYears.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarAddYears.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfWeek.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfWeek.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfWeek.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfWeek.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDayOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetDaysInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetEra.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetEra.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetEra.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetEra.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonthsInYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonthsInYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonthsInYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetMonthsInYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetWeekOfYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetWeekOfYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetWeekOfYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetWeekOfYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarGetYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapDay.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapDay.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapDay.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapDay.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapMonth.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapMonth.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapMonth.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapMonth.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarIsLeapYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToDateTime.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToDateTime.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToDateTime.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToDateTime.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs
diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs b/src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs
similarity index 100%
rename from src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Calendars.Tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/GetStringComparerTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/GetStringComparerTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/GetStringComparerTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/GetStringComparerTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/Hybrid/System.Globalization.Extensions.iOS.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Hybrid/System.Globalization.Extensions.iOS.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/Hybrid/System.Globalization.Extensions.iOS.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Hybrid/System.Globalization.Extensions.iOS.Tests.csproj
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/ConformanceIdnaTestResult.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/ConformanceIdnaTestResult.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/ConformanceIdnaTestResult.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/ConformanceIdnaTestResult.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/ConformanceIdnaUnicodeTestResult.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/ConformanceIdnaUnicodeTestResult.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/ConformanceIdnaUnicodeTestResult.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/ConformanceIdnaUnicodeTestResult.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Factory.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Factory.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Factory.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Factory.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/IConformanceIdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/IConformanceIdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/IConformanceIdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/IConformanceIdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/IdnaTest_11.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/IdnaTest_11.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/IdnaTest_11.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/IdnaTest_11.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/ReadMe.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/ReadMe.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/ReadMe.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/ReadMe.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/Unicode_11_0_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/Unicode_11_0_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_11_0/Unicode_11_0_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_11_0/Unicode_11_0_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/IdnaTest_13.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/IdnaTest_13.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/IdnaTest_13.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/IdnaTest_13.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/ReadMe.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/ReadMe.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/ReadMe.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/ReadMe.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/Unicode_13_0_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/Unicode_13_0_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_13_0/Unicode_13_0_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_13_0/Unicode_13_0_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/IdnaTest_6.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/IdnaTest_6.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/IdnaTest_6.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/IdnaTest_6.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/ReadMe.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/ReadMe.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/ReadMe.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/ReadMe.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/Unicode_6_0_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/Unicode_6_0_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_6_0/Unicode_6_0_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_6_0/Unicode_6_0_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/IdnaTest_9.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/IdnaTest_9.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/IdnaTest_9.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/IdnaTest_9.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/ReadMe.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/ReadMe.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/ReadMe.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/ReadMe.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/Unicode_9_0_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/Unicode_9_0_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_9_0/Unicode_9_0_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_9_0/Unicode_9_0_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_Win7/IdnaTest_Win7.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_Win7/IdnaTest_Win7.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_Win7/IdnaTest_Win7.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_Win7/IdnaTest_Win7.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_Win7/Unicode_Win7_IdnaTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_Win7/Unicode_Win7_IdnaTest.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/Data/Unicode_Win7/Unicode_Win7_IdnaTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/Data/Unicode_Win7/Unicode_Win7_IdnaTest.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingGetAsciiTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingGetAsciiTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingGetUnicodeTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetUnicodeTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingGetUnicodeTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingIdnaConformanceTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingIdnaConformanceTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingIdnaConformanceTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingIdnaConformanceTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingUseStd3AsciiRulesTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingUseStd3AsciiRulesTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingUseStd3AsciiRulesTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/IdnMapping/IdnMappingUseStd3AsciiRulesTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
diff --git a/src/libraries/System.Globalization.Extensions/tests/Normalization/Data/win7.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/Data/win7.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/Normalization/Data/win7.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/Data/win7.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/Normalization/Data/win8.txt b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/Data/win8.txt
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/Normalization/Data/win8.txt
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/Data/win8.txt
diff --git a/src/libraries/System.Globalization.Extensions/tests/Normalization/NormalizationAll.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/NormalizationAll.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/Normalization/NormalizationAll.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/NormalizationAll.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/Normalization/StringNormalizationTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/StringNormalizationTests.cs
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/Normalization/StringNormalizationTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/Normalization/StringNormalizationTests.cs
diff --git a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/System.Globalization.Extensions.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Extensions.Tests/System.Globalization.Extensions.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/AssemblyInfo.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/AssemblyInfo.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/AssemblyInfo.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/AssemblyInfo.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.Compare.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.Compare.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.Compare.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.Compare.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IndexOf.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IndexOf.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IndexOf.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IndexOf.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IsPrefix.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IsPrefix.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IsPrefix.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IsPrefix.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IsSuffix.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IsSuffix.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.IsSuffix.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IsSuffix.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.LastIndexOf.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.LastIndexOf.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.LastIndexOf.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.LastIndexOf.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTestsBase.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTestsBase.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTestsBase.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTestsBase.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoAll.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoAll.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAsync.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoAsync.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAsync.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoAsync.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCalendar.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCalendar.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCalendar.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCalendar.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoClone.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoClone.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoClone.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoClone.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCompareInfo.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCompareInfo.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCompareInfo.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCompareInfo.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCtor.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCtor.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCurrentCulture.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCurrentCulture.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCurrentCulture.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoCurrentCulture.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoDateTimeFormat.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoDateTimeFormat.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoDateTimeFormat.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoDateTimeFormat.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoEnglishName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoEnglishName.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEquals.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoEquals.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEquals.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoEquals.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetCultures.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetCultures.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetCultures.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetCultures.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetFormat.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetFormat.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetFormat.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetFormat.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetHashCode.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetHashCode.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoGetHashCode.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoGetHashCode.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoIsNeutralCulture.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoIsNeutralCulture.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoIsNeutralCulture.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoIsNeutralCulture.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNames.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNativeName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNativeName.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNumberFormat.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNumberFormat.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNumberFormat.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoNumberFormat.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoParent.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoParent.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoParent.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoParent.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoReadOnly.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoReadOnly.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoReadOnly.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoReadOnly.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoTwoLetterISOLanguageName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoTwoLetterISOLanguageName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/CultureInfoTwoLetterISOLanguageName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/CultureInfoTwoLetterISOLanguageName.cs
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/GetCultureInfo.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/CultureInfo/GetCultureInfo.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedDayNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedDayNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedDayNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedDayNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoCalendar.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoCalendar.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoCalendar.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoCalendar.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoCalendarWeekRule.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoCalendarWeekRule.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoCalendarWeekRule.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoCalendarWeekRule.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoClone.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoClone.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoClone.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoClone.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoData.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoData.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoData.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoData.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoDayNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoDayNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoDayNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoDayNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetEra.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEra.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetEra.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEra.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetFormat.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetFormat.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetFormat.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetFormat.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetInstance.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetInstance.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetInstance.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetInstance.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthDayPattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthDayPattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthDayPattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthDayPattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoNativeCalendarName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoNativeCalendarName.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoNativeCalendarName.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoNativeCalendarName.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoRFC1123Pattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoRFC1123Pattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoRFC1123Pattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoRFC1123Pattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoReadOnly.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoReadOnly.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoReadOnly.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoReadOnly.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoSortableDateTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoSortableDateTimePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoSortableDateTimePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoSortableDateTimePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoUniversalSortableDateTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoUniversalSortableDateTimePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoUniversalSortableDateTimePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoUniversalSortableDateTimePattern.cs
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs
diff --git a/src/libraries/System.Globalization/tests/Hybrid/System.Globalization.Hybrid.WASM.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Hybrid/System.Globalization.Hybrid.WASM.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/Hybrid/System.Globalization.Hybrid.WASM.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/Hybrid/System.Globalization.Hybrid.WASM.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Hybrid/System.Globalization.IOS.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/Hybrid/System.Globalization.IOS.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/IcuAppLocal/IcuAppLocal.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuAppLocal/IcuAppLocal.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/IcuAppLocal/IcuAppLocal.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuAppLocal/IcuAppLocal.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/IcuAppLocal/IcuAppLocal.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuAppLocal/IcuAppLocal.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/IcuAppLocal/IcuAppLocal.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuAppLocal/IcuAppLocal.cs
diff --git a/src/libraries/System.Globalization/tests/IcuTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/IcuTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/IcuTests.cs
diff --git a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/Invariant.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/Invariant.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/Invariant/InvariantMode.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/Invariant/InvariantMode.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs
diff --git a/src/libraries/System.Globalization/tests/NlsTests/NlsSwitchTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NlsTests/NlsSwitchTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NlsTests/NlsSwitchTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NlsTests/NlsSwitchTests.cs
diff --git a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NlsTests/System.Globalization.Nls.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NlsTests/System.Globalization.Nls.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoClone.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoClone.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoClone.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoClone.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalDigits.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalDigits.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalDigits.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalDigits.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyDecimalSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyNegativePattern.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyPositivePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyPositivePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyPositivePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencyPositivePattern.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencySymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencySymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencySymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrencySymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrentInfo.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrentInfo.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrentInfo.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoCurrentInfo.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoData.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoData.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoGetFormat.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoGetFormat.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoGetFormat.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoGetFormat.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoGetInstance.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoGetInstance.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoGetInstance.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoGetInstance.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNaNSymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNaNSymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNaNSymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNaNSymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNegativeInfinitySymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNegativeInfinitySymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNegativeInfinitySymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNegativeInfinitySymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNegativeSign.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNegativeSign.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNegativeSign.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNegativeSign.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberDecimalDigits.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberDecimalDigits.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberDecimalDigits.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberDecimalDigits.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberDecimalSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberDecimalSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberDecimalSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberDecimalSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberNegativePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberNegativePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberNegativePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberNegativePattern.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPerMilleSymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPerMilleSymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPerMilleSymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPerMilleSymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentDecimalSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentDecimalSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentGroupSeparator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentGroupSeparator.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentGroupSeparator.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentGroupSeparator.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentGroupSizes.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentGroupSizes.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentGroupSizes.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentGroupSizes.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentNegativePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentNegativePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentNegativePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentNegativePattern.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentPositivePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentPositivePattern.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentPositivePattern.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentPositivePattern.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentSymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentSymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentSymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPercentSymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPositiveInfinitySymbol.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPositiveInfinitySymbol.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPositiveInfinitySymbol.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPositiveInfinitySymbol.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPositiveSign.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPositiveSign.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPositiveSign.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoPositiveSign.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoReadOnly.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoReadOnly.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoReadOnly.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoReadOnly.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoValidateParseStyle.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoValidateParseStyle.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoValidateParseStyle.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoValidateParseStyle.cs
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System.Globalization.Tests.csproj
similarity index 100%
rename from src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System.Globalization.Tests.csproj
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTestData.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTestData.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTestData.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTestData.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.Generated.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTests.Generated.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.Generated.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTests.Generated.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CharUnicodeInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/CultureNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CultureNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/CultureNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/CultureNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/GraphemeBreakTest.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/GraphemeBreakTest.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/GraphemeBreakTest.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/GraphemeBreakTest.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/RegionInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/RegionInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/SortVersionTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/SortVersionTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/SortVersionTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/SortVersionTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/StringInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/StringInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/StringInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/StringInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/TextElementEnumeratorTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/TextElementEnumeratorTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/TextElementEnumeratorTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/TextElementEnumeratorTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/TextInfoTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/TextInfoTests.cs
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/UnicodeCategoryTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/UnicodeCategoryTests.cs
similarity index 100%
rename from src/libraries/System.Globalization/tests/System/Globalization/UnicodeCategoryTests.cs
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/UnicodeCategoryTests.cs
diff --git a/src/libraries/System.Globalization/tests/default.rd.xml b/src/libraries/System.Runtime/tests/System.Globalization.Tests/default.rd.xml
similarity index 100%
rename from src/libraries/System.Globalization/tests/default.rd.xml
rename to src/libraries/System.Runtime/tests/System.Globalization.Tests/default.rd.xml
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/FileAccessTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileAccessTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem.Primitives/tests/FileAccessTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileAccessTests.cs
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/FileAttributesTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileAttributesTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem.Primitives/tests/FileAttributesTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileAttributesTests.cs
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/FileModeTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileModeTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem.Primitives/tests/FileModeTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileModeTests.cs
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/FileShareTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileShareTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem.Primitives/tests/FileShareTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/FileShareTests.cs
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/System.IO.FileSystem.Primitives.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/System.IO.FileSystem.Primitives.Tests.csproj
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/AllGetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/AllGetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/AllGetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/AllGetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetUnixFileMode.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetUnixFileMode.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetUnixFileMode.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/BaseGetSetUnixFileMode.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/FileGetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/FileGetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/InfoGetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/InfoGetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/InfoGetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/InfoGetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/StaticGetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/StaticGetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/StaticGetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory_UnixFileMode.Unix.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory_UnixFileMode.Unix.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory_UnixFileMode.Unix.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory_UnixFileMode.Unix.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory_UnixFileMode.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory_UnixFileMode.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory_UnixFileMode.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateDirectory_UnixFileMode.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateTempSubdirectory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateTempSubdirectory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/CreateTempSubdirectory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/CreateTempSubdirectory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Delete.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/Delete.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Delete.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/Delete.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Delete_MountVolume.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete_MountVolume.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/Delete_MountVolume.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Delete_MountVolume.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/EnumerableAPIs.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/EnumerableAPIs.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/EnumerableAPIs.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/EnumerableAPIs.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/EnumerableTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/EnumerableTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/EnumerableTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/EnumerableTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Exists.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Exists.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetDirectories.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetDirectories.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetDirectories.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetDirectories.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetDirectoryRoot.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetDirectoryRoot.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetDirectoryRoot.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetDirectoryRoot.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str_str.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str_str.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str_so.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str_str_so.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str_so.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFileSystemEntries_str_str_so.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFiles.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFiles.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetFiles.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetFiles.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetLogicalDrives.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetLogicalDrives.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetLogicalDrives.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetLogicalDrives.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetParent.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetParent.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetParent.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetParent.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/GetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Move.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Move.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/Move.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/Move.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/ReparsePoints_MountVolume.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/ReparsePoints_MountVolume.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/ReparsePoints_MountVolume.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/ReparsePoints_MountVolume.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/SetCurrentDirectory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/SetCurrentDirectory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/SetCurrentDirectory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/SetCurrentDirectory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/SymbolicLinks.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/SymbolicLinks.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Directory/SymbolicLinks.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Directory/SymbolicLinks.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Create.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Create.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/CreateSubdirectory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/CreateSubdirectory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Delete.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Delete.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/EnumerableAPIs.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/EnumerableAPIs.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/EnumerableAPIs.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Exists.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Exists.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetDirectories.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetDirectories.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetDirectories.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetDirectories.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetFileSystemInfos.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetFileSystemInfos.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetFileSystemInfos.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetFileSystemInfos.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetFiles.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetFiles.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetFiles.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetUnixFileMode.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetUnixFileMode.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetUnixFileMode.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/GetSetUnixFileMode.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/MoveTo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/MoveTo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/MoveTo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/MoveTo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Name.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Name.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Name.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Name.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Parent.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Parent.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Parent.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Parent.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Refresh.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Refresh.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Refresh.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Refresh.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Root.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Root.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Root.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/Root.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/SymbolicLinks.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/SymbolicLinks.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/SymbolicLinks.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/SymbolicLinks.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/ToString.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/ToString.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/test-dir/dummy.txt b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/test-dir/dummy.txt
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DirectoryInfo/test-dir/dummy.txt
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DirectoryInfo/test-dir/dummy.txt
diff --git a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/DisabledFileLockingSwitchTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DisabledFileLockingTests/DisabledFileLockingSwitchTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/DisabledFileLockingSwitchTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DisabledFileLockingTests/DisabledFileLockingSwitchTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/AttributeTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/AttributeTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/AttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/AttributeTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/ConstructionTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ConstructionTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/ConstructionTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ConstructionTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/ErrorHandlingTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ErrorHandlingTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/ErrorHandlingTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ErrorHandlingTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/ExampleTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ExampleTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/ExampleTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/ExampleTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/FileSystemNameTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/FileSystemNameTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/FileSystemNameTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/FileSystemNameTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/GetTimesTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/GetTimesTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/GetTimesTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/GetTimesTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/IncludePredicateTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/IncludePredicateTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/IncludePredicateTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/IncludePredicateTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/MatchCasingTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/MatchCasingTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/MatchCasingTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/MatchCasingTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/MatchTypesTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/MatchTypesTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/MatchTypesTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/MatchTypesTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/PatternTransformTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/PatternTransformTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/PatternTransformTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/PatternTransformTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/RecursionDepthTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RecursionDepthTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/RecursionDepthTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RecursionDepthTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/RemovedDirectoryTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RemovedDirectoryTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/RemovedDirectoryTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RemovedDirectoryTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/RootTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RootTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/RootTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/RootTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/SkipAttributeTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SkipAttributeTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/SkipAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SkipAttributeTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SpecialDirectoryTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SpecialDirectoryTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/SymbolicLinksTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SymbolicLinksTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/SymbolicLinksTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/SymbolicLinksTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/TrimmedPaths.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/TrimmedPaths.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Enumeration/TrimmedPaths.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Enumeration/TrimmedPaths.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FSAssert.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FSAssert.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FSAssert.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FSAssert.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Append.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Append.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Append.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Append.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/AppendAllBytes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAllBytes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/AppendAllBytes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAllBytes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/AppendAllBytesAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAllBytesAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/AppendAllBytesAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAllBytesAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/AppendAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/AppendAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/AppendAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ChangeExtension.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ChangeExtension.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ChangeExtension.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ChangeExtension.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Copy.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Copy.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Copy.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Copy.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Create.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Create.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Create.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Create.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Delete.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Delete.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Delete.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Delete.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/EncryptDecrypt.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/EncryptDecrypt.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/EncryptDecrypt.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/EncryptDecrypt.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Exists.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Exists.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Exists.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Exists.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes_SafeFileHandle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes_SafeFileHandle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes_SafeFileHandle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes_SafeFileHandle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes_String.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes_String.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetAttributes_String.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetAttributes_String.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_SafeFileHandle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_SafeFileHandle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_SafeFileHandle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_SafeFileHandle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_SafeFileHandle_Pathless.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_SafeFileHandle_Pathless.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_SafeFileHandle_Pathless.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_SafeFileHandle_Pathless.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_String.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_String.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetTimes_String.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetTimes_String.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetUnixFileMode.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetUnixFileMode.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetUnixFileMode.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetUnixFileMode.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetUnixFileMode_SafeFileHandle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetUnixFileMode_SafeFileHandle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/GetSetUnixFileMode_SafeFileHandle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/GetSetUnixFileMode_SafeFileHandle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Move.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Move.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Move.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Move.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Open.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Open.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Open.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Open.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/OpenHandle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/OpenHandle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllBytes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllBytes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllBytesAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllBytesAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllLines.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllLines.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllLines.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllLines.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllLinesAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllLinesAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllLinesAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllLinesAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllText.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllText.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllText.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllText.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllTextAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllTextAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllTextAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ReadWriteAllTextAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Replace.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Replace.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/Replace.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/Replace.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/SymbolicLinks.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/SymbolicLinks.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/AppendText.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/AppendText.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/AppendText.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/AppendText.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/CopyTo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/CopyTo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/CopyTo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/CopyTo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Create.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Create.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/CreateText.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/CreateText.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/CreateText.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/CreateText.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Delete.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Delete.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Directory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Directory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Directory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Directory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Exists.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Exists.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Extension.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Extension.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Extension.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Extension.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetAttributes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetAttributes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetAttributes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetAttributes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetAttributesCommon.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetAttributesCommon.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetAttributesCommon.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetAttributesCommon.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetTimes.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetTimes.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetUnixFileMode.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetUnixFileMode.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetUnixFileMode.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/GetSetUnixFileMode.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/IsReadOnly.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/IsReadOnly.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/IsReadOnly.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/IsReadOnly.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Length.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Length.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Length.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Length.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/MoveTo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/MoveTo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/MoveTo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/MoveTo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Name.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Name.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Name.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Name.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Open.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Open.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Refresh.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Refresh.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Refresh.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Refresh.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Replace.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Replace.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/Replace.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/Replace.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/SymbolicLinks.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/SymbolicLinks.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/ToString.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/ToString.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileInfo/ToString.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileInfo/ToString.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CopyToAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/CopyToAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/CopyToAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/CopyToAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/DeleteOnClose.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DeleteOnClose.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/DeleteOnClose.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DeleteOnClose.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/DevicesPipesAndSockets.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DevicesPipesAndSockets.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/DevicesPipesAndSockets.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DevicesPipesAndSockets.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Dispose.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Dispose.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Dispose.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Dispose.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/DisposeAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DisposeAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/DisposeAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/DisposeAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamConformanceTests.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamConformanceTests.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamConformanceTests.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamConformanceTests.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamConformanceTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamConformanceTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamConformanceTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamConformanceTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamOptions.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamOptions.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/FileStreamOptions.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FileStreamOptions.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Flush.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Flush.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Flush.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Flush.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/FlushAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FlushAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/FlushAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/FlushAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Handle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Handle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Handle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Handle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/IsAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/IsAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/IsAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/IsAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/LockUnlock.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/LockUnlock.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Name.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Name.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Name.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Name.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Position.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Position.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Position.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Position.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Read.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Read.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Read.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Read.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ReadAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ReadAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ReadWriteSpan.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ReadWriteSpan.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/SafeFileHandle.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/SafeFileHandle.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Seek.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Seek.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/Seek.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/Seek.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/SetLength.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/SetLength.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/SetLength.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/SetLength.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ToString.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ToString.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ToString.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ToString.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/WriteAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/WriteAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/WriteAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/WriteAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Browser.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Browser.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Browser.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Browser.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Unix.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Unix.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Unix.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Unix.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_options.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa_buffer.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa_buffer.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa_buffer.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa_buffer.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa_buffer_async.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa_buffer_async.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_sfh_fa_buffer_async.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_sfh_fa_buffer_async.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.delete.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.delete.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.delete.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.read.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.read.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.read.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.read.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.write.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.write.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs.write.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs.write.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer_async.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer_async.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer_async.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer_async.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer_fo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer_fo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm_fa_fs_buffer_fo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileStream/ctor_str_fm_fa_fs_buffer_fo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileSystemTest.Browser.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Browser.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileSystemTest.Browser.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Browser.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileSystemTest.Unix.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Unix.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileSystemTest.Unix.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Unix.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileSystemTest.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileSystemTest.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileSystemTest.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/FileSystemTest.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/FileSystemTest.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Junctions.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Junctions.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Junctions.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Junctions.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/LargeFileTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/LargeFileTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/ManualTests/ManualTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/ManualTests/ManualTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/ManualTests/ManualTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/ManualTests/ManualTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
diff --git a/src/libraries/System.IO.FileSystem/tests/Path/Exists_Directory.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Path/Exists_Directory.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Path/Exists_Directory.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Path/Exists_Directory.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/Path/Exists_File.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Path/Exists_File.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/Path/Exists_File.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/Path/Exists_File.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PathInternalTests.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PathInternalTests.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PathInternalTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PathInternalTests.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/CommonUtilities.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/CommonUtilities.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PortedCommon/CommonUtilities.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/CommonUtilities.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/DllImports.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/DllImports.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PortedCommon/DllImports.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/DllImports.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/IOInputs.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/IOInputs.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/IOServices.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/IOServices.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/PathInfo.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/PathInfo.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/PortedCommon/PathInfo.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/PortedCommon/PathInfo.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/Base.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Base.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/Base.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Base.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/FlushToDisk.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/FlushToDisk.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/FlushToDisk.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/FlushToDisk.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/GetLength.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/GetLength.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/GetLength.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/GetLength.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/Mixed.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Mixed.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/Mixed.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Mixed.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/NoBuffering.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/NoBuffering.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/Read.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Read.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/Read.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Read.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadScatter.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadScatter.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadScatter.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadScatter.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadScatterAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadScatterAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/ReadScatterAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/ReadScatterAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/SectorAlignedMemory.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/SectorAlignedMemory.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/SectorAlignedMemory.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/SectorAlignedMemory.Windows.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/SetLength.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/SetLength.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/SetLength.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/SetLength.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/Write.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Write.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/Write.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/Write.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteGather.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteGather.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteGather.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteGather.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteGatherAsync.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteGatherAsync.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/RandomAccess/WriteGatherAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/RandomAccess/WriteGatherAsync.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/System.IO.FileSystem.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/System.IO.FileSystem.Tests.csproj
diff --git a/src/libraries/System.IO.FileSystem/tests/TestData.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/TestData.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/TestData.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/TestData.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/UnseekableFileStream.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/UnseekableFileStream.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/UnseekableFileStream.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/UnseekableFileStream.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/VirtualDriveSymbolicLinks.Windows.cs b/src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/VirtualDriveSymbolicLinks.Windows.cs
similarity index 100%
rename from src/libraries/System.IO.FileSystem/tests/VirtualDriveSymbolicLinks.Windows.cs
rename to src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/VirtualDriveSymbolicLinks.Windows.cs
diff --git a/src/libraries/System.IO/tests/BinaryReader/BinaryReaderTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryReader/BinaryReaderTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryReader/BinaryReaderTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryReader/BinaryReaderTests.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.DisposeAsync.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.DisposeAsync.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.DisposeAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.DisposeAsync.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.EncodingTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.EncodingTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.EncodingTests.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.EncodingTests_Serial.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.EncodingTests_Serial.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.EncodingTests_Serial.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.EncodingTests_Serial.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.WriteByteCharTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.WriteByteCharTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.WriteByteCharTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.WriteByteCharTests.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.WriteTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.WriteTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriter.WriteTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriter.WriteTests.cs
diff --git a/src/libraries/System.IO/tests/BinaryWriter/BinaryWriterTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriterTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BinaryWriter/BinaryWriterTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BinaryWriter/BinaryWriterTests.cs
diff --git a/src/libraries/System.IO/tests/BufferedStream/BufferedStreamConnectedConformanceTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BufferedStream/BufferedStreamConnectedConformanceTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BufferedStream/BufferedStreamConnectedConformanceTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BufferedStream/BufferedStreamConnectedConformanceTests.cs
diff --git a/src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/BufferedStream/BufferedStreamTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/BufferedStream/BufferedStreamTests.cs
diff --git a/src/libraries/System.IO/tests/IndentedTextWriter.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/IndentedTextWriter.cs
similarity index 100%
rename from src/libraries/System.IO/tests/IndentedTextWriter.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/IndentedTextWriter.cs
diff --git a/src/libraries/System.IO/tests/InvalidDataException/InvalidDataExceptionTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/InvalidDataException/InvalidDataExceptionTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/InvalidDataException/InvalidDataExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/InvalidDataException/InvalidDataExceptionTests.cs
diff --git a/src/libraries/System.IO/tests/MemoryStream/MemoryStream.ConstructorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.ConstructorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/MemoryStream/MemoryStream.ConstructorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.ConstructorTests.cs
diff --git a/src/libraries/System.IO/tests/MemoryStream/MemoryStream.GetBufferTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.GetBufferTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/MemoryStream/MemoryStream.GetBufferTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.GetBufferTests.cs
diff --git a/src/libraries/System.IO/tests/MemoryStream/MemoryStream.ToArrayTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.ToArrayTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/MemoryStream/MemoryStream.ToArrayTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.ToArrayTests.cs
diff --git a/src/libraries/System.IO/tests/MemoryStream/MemoryStream.TryGetBufferTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.TryGetBufferTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/MemoryStream/MemoryStream.TryGetBufferTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStream.TryGetBufferTests.cs
diff --git a/src/libraries/System.IO/tests/MemoryStream/MemoryStreamTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStreamTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/MemoryStream/MemoryStreamTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/MemoryStream/MemoryStreamTests.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.CopyToTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.CopyToTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.CopyToTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.CopyToTests.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.DisposeAsync.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.DisposeAsync.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.DisposeAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.DisposeAsync.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.NullTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.NullTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.NullTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.NullTests.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.ReadAtLeast.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadAtLeast.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.ReadAtLeast.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadAtLeast.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.ReadExactly.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadExactly.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.ReadExactly.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadExactly.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.ReadWriteSpan.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadWriteSpan.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.ReadWriteSpan.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ReadWriteSpan.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.TestLeaveOpen.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.TestLeaveOpen.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.TestLeaveOpen.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.TestLeaveOpen.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.TimeoutTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.TimeoutTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.TimeoutTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.TimeoutTests.cs
diff --git a/src/libraries/System.IO/tests/Stream/Stream.ValidateArguments.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ValidateArguments.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/Stream.ValidateArguments.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/Stream.ValidateArguments.cs
diff --git a/src/libraries/System.IO/tests/Stream/SyncStreamConformanceTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/Stream/SyncStreamConformanceTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/Stream/SyncStreamConformanceTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/Stream/SyncStreamConformanceTests.cs
diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReader.CtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.CtorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamReader/StreamReader.CtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.CtorTests.cs
diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReader.StringCtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.StringCtorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamReader/StreamReader.StringCtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.StringCtorTests.cs
diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReader.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamReader/StreamReader.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.cs
diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReaderTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReaderTests.cs
diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReaderTests_Serial.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReaderTests_Serial.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamReader/StreamReaderTests_Serial.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReaderTests_Serial.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.BaseStream.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.BaseStream.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.BaseStream.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.BaseStream.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.CloseTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.CloseTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.CloseTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.CloseTests.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.CtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.CtorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.CtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.CtorTests.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.DisposeAsync.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.DisposeAsync.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.DisposeAsync.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.DisposeAsync.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.FlushTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.FlushTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.FlushTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.FlushTests.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.StringCtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.StringCtorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.StringCtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.StringCtorTests.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.WriteTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.WriteTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.WriteTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.WriteTests.cs
diff --git a/src/libraries/System.IO/tests/StreamWriter/StreamWriter.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StreamWriter/StreamWriter.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.cs
diff --git a/src/libraries/System.IO/tests/StringReader/StringReader.CtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StringReader/StringReader.CtorTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StringReader/StringReader.CtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StringReader/StringReader.CtorTests.cs
diff --git a/src/libraries/System.IO/tests/StringWriter/StringWriterTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StringWriter/StringWriterTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/StringWriter/StringWriterTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/StringWriter/StringWriterTests.cs
diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.Tests/System.IO.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO/tests/System.IO.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.Tests/System.IO.Tests.csproj
diff --git a/src/libraries/System.IO/tests/TestDataProvider/TestDataProvider.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TestDataProvider/TestDataProvider.cs
similarity index 100%
rename from src/libraries/System.IO/tests/TestDataProvider/TestDataProvider.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/TestDataProvider/TestDataProvider.cs
diff --git a/src/libraries/System.IO/tests/TextReader/CharArrayTextReader.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TextReader/CharArrayTextReader.cs
similarity index 100%
rename from src/libraries/System.IO/tests/TextReader/CharArrayTextReader.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/TextReader/CharArrayTextReader.cs
diff --git a/src/libraries/System.IO/tests/TextReader/TextReaderTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TextReader/TextReaderTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/TextReader/TextReaderTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/TextReader/TextReaderTests.cs
diff --git a/src/libraries/System.IO/tests/TextWriter/CharArrayTextWriter.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/CharArrayTextWriter.cs
similarity index 100%
rename from src/libraries/System.IO/tests/TextWriter/CharArrayTextWriter.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/CharArrayTextWriter.cs
diff --git a/src/libraries/System.IO/tests/TextWriter/TextWriterTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/TextWriterTests.cs
similarity index 100%
rename from src/libraries/System.IO/tests/TextWriter/TextWriterTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/TextWriterTests.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/ArrayHelpers.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/ArrayHelpers.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/ArrayHelpers.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/ArrayHelpers.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/HGlobalSafeBuffer.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/HGlobalSafeBuffer.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/HGlobalSafeBuffer.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/HGlobalSafeBuffer.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/System.IO.UnmanagedMemoryStream.Tests.csproj
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/System.IO.UnmanagedMemoryStream.Tests.csproj
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.ReadWriteStruct.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.ReadWriteStruct.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.ReadWriteStruct.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.ReadWriteStruct.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.ReadWriteStructArray.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.ReadWriteStructArray.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.ReadWriteStructArray.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.ReadWriteStructArray.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.TestStructs.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.TestStructs.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/Uma.TestStructs.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/Uma.TestStructs.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmaCtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmaCtorTests.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmaCtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmaCtorTests.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmaTests.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmaTests.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmaTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmaTests.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsCtorTests.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsCtorTests.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsCtorTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsCtorTests.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsManager.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsManager.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsManager.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsManager.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsSafeBuffer.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsSafeBuffer.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsSafeBuffer.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsSafeBuffer.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsSecurityTest.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsSecurityTest.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsSecurityTest.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsSecurityTest.cs
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsTests.cs b/src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsTests.cs
similarity index 100%
rename from src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsTests.cs
rename to src/libraries/System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests/UmsTests.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyNameTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyNameTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyNameTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyNameTests.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyTests.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_0_0_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_0_0_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_0_0_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_0_0_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_0_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_0_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_0_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_0_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_2.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_2.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_2.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_2.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_3.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_3.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_1_3.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_1_3.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_2_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_2_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_2_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_2_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_3_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_3_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_1_3_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_1_3_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_2_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_2_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_2_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_2_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_3_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_3_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_1_3_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_1_3_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/Program_3_0_0_0.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_3_0_0_0.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/Program_3_0_0_0.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/Program_3_0_0_0.cs
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_0_0_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_0_0_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_0_0_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_0_0_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_0_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_0_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_0_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_0_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_2.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_2.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_2.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_2.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_3.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_3.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_3.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_1_3.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_2_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_2_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_2_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_2_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_3_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_3_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_3_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_1_3_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_2_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_2_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_2_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_2_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_3_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_3_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_3_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_1_3_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_3_0_0_0.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_3_0_0_0.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/AssemblyVersion/System.Reflection.Tests.Assembly_3_0_0_0.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/AssemblyVersion/System.Reflection.Tests.Assembly_3_0_0_0.csproj
diff --git a/src/libraries/System.Reflection/tests/Common.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/Common.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/Common.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/Common.cs
diff --git a/src/libraries/System.Reflection/tests/ConstructorCommonTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorCommonTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ConstructorCommonTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorCommonTests.cs
diff --git a/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ConstructorInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/ConstructorInvokerTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorInvokerTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ConstructorInvokerTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorInvokerTests.cs
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/AssemblyTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/AssemblyTests.cs
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/ILLink.Descriptors.CoreCLR.xml b/src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/ILLink.Descriptors.CoreCLR.xml
similarity index 100%
rename from src/libraries/System.Reflection/tests/CoreCLR/ILLink.Descriptors.CoreCLR.xml
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/ILLink.Descriptors.CoreCLR.xml
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
diff --git a/src/libraries/System.Reflection/tests/CustomAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/CustomAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/CustomAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/CustomAttributeTests.cs
diff --git a/src/libraries/System.Reflection/tests/DefaultBinderTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/DefaultBinderTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/DefaultBinderTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/DefaultBinderTests.cs
diff --git a/src/libraries/System.Reflection/tests/EventInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/EventInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/EventInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/EventInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/ExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ExceptionTests.cs
diff --git a/src/libraries/System.Reflection/tests/FieldInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/FieldInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/ForwardedTypesAssembly/ForwardedTypesAssembly.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ForwardedTypesAssembly/ForwardedTypesAssembly.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ForwardedTypesAssembly/ForwardedTypesAssembly.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ForwardedTypesAssembly/ForwardedTypesAssembly.cs
diff --git a/src/libraries/System.Reflection/tests/ForwardedTypesAssembly/ForwardedTypesAssembly.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ForwardedTypesAssembly/ForwardedTypesAssembly.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/ForwardedTypesAssembly/ForwardedTypesAssembly.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ForwardedTypesAssembly/ForwardedTypesAssembly.csproj
diff --git a/src/libraries/System.Reflection/tests/GetTypeTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/GetTypeTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/GetTypeTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/GetTypeTests.cs
diff --git a/src/libraries/System.Reflection/tests/ILLink.Descriptors.xml b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ILLink.Descriptors.xml
similarity index 100%
rename from src/libraries/System.Reflection/tests/ILLink.Descriptors.xml
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ILLink.Descriptors.xml
diff --git a/src/libraries/System.Reflection/tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj
diff --git a/src/libraries/System.Reflection/tests/InvokeEmit/runtimeconfig.template.json b/src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeEmit/runtimeconfig.template.json
similarity index 100%
rename from src/libraries/System.Reflection/tests/InvokeEmit/runtimeconfig.template.json
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeEmit/runtimeconfig.template.json
diff --git a/src/libraries/System.Reflection/tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj
diff --git a/src/libraries/System.Reflection/tests/InvokeInterpreted/runtimeconfig.template.json b/src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeInterpreted/runtimeconfig.template.json
similarity index 100%
rename from src/libraries/System.Reflection/tests/InvokeInterpreted/runtimeconfig.template.json
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/InvokeInterpreted/runtimeconfig.template.json
diff --git a/src/libraries/System.Reflection/tests/ManifestResourceInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ManifestResourceInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ManifestResourceInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ManifestResourceInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/MemberInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/MemberInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/MethodCommonTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodCommonTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/MethodCommonTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodCommonTests.cs
diff --git a/src/libraries/System.Reflection/tests/MethodInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/MethodInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/MethodInvokerTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodInvokerTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/MethodInvokerTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodInvokerTests.cs
diff --git a/src/libraries/System.Reflection/tests/ModuleTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ModuleTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ModuleTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ModuleTests.cs
diff --git a/src/libraries/System.Reflection/tests/ParameterInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/ParameterInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/ParameterInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/ParameterInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/PointerTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/PointerTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/PointerTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/PointerTests.cs
diff --git a/src/libraries/System.Reflection/tests/PropertyInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/PropertyInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/PropertyInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/PropertyInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/Resources/EmbeddedImage.png b/src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/EmbeddedImage.png
similarity index 100%
rename from src/libraries/System.Reflection/tests/Resources/EmbeddedImage.png
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/EmbeddedImage.png
diff --git a/src/libraries/System.Reflection/tests/Resources/EmbeddedTextFile.txt b/src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/EmbeddedTextFile.txt
similarity index 100%
rename from src/libraries/System.Reflection/tests/Resources/EmbeddedTextFile.txt
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/EmbeddedTextFile.txt
diff --git a/src/libraries/System.Reflection/tests/Resources/ResourceTextFile.txt b/src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/ResourceTextFile.txt
similarity index 100%
rename from src/libraries/System.Reflection/tests/Resources/ResourceTextFile.txt
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/Resources/ResourceTextFile.txt
diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.csproj
diff --git a/src/libraries/System.Reflection/tests/TestAssembly/ClassToInvoke.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/ClassToInvoke.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestAssembly/ClassToInvoke.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/ClassToInvoke.cs
diff --git a/src/libraries/System.Reflection/tests/TestAssembly/EquivalentValueType.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/EquivalentValueType.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestAssembly/EquivalentValueType.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/EquivalentValueType.cs
diff --git a/src/libraries/System.Reflection/tests/TestAssembly/TestAssembly.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/TestAssembly.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestAssembly/TestAssembly.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/TestAssembly.cs
diff --git a/src/libraries/System.Reflection/tests/TestAssembly/TestAssembly.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/TestAssembly.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestAssembly/TestAssembly.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestAssembly/TestAssembly.csproj
diff --git a/src/libraries/System.Reflection/tests/TestExe/Program.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestExe/Program.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestExe/Program.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestExe/Program.cs
diff --git a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TestExe/System.Reflection.TestExe.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TestExe/System.Reflection.TestExe.csproj
diff --git a/src/libraries/System.Reflection/tests/TypeDerivedTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeDerivedTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TypeDerivedTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeDerivedTests.cs
diff --git a/src/libraries/System.Reflection/tests/TypeInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeInfoTests.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TypeInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeInfoTests.cs
diff --git a/src/libraries/System.Reflection/tests/TypeTests.Constraints.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeTests.Constraints.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/TypeTests.Constraints.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/TypeTests.Constraints.cs
diff --git a/src/libraries/System.Reflection/tests/UnloadableAssembly/UnloadableAssembly.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/UnloadableAssembly/UnloadableAssembly.cs
similarity index 100%
rename from src/libraries/System.Reflection/tests/UnloadableAssembly/UnloadableAssembly.cs
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/UnloadableAssembly/UnloadableAssembly.cs
diff --git a/src/libraries/System.Reflection/tests/UnloadableAssembly/UnloadableAssembly.csproj b/src/libraries/System.Runtime/tests/System.Reflection.Tests/UnloadableAssembly/UnloadableAssembly.csproj
similarity index 100%
rename from src/libraries/System.Reflection/tests/UnloadableAssembly/UnloadableAssembly.csproj
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/UnloadableAssembly/UnloadableAssembly.csproj
diff --git a/src/libraries/System.Reflection/tests/default.rd.xml b/src/libraries/System.Runtime/tests/System.Reflection.Tests/default.rd.xml
similarity index 100%
rename from src/libraries/System.Reflection/tests/default.rd.xml
rename to src/libraries/System.Runtime/tests/System.Reflection.Tests/default.rd.xml
diff --git a/src/libraries/System.Resources.Reader/tests/ResourceReaderUnitTest.cs b/src/libraries/System.Runtime/tests/System.Resources.Reader.Tests/ResourceReaderUnitTest.cs
similarity index 100%
rename from src/libraries/System.Resources.Reader/tests/ResourceReaderUnitTest.cs
rename to src/libraries/System.Runtime/tests/System.Resources.Reader.Tests/ResourceReaderUnitTest.cs
diff --git a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj b/src/libraries/System.Runtime/tests/System.Resources.Reader.Tests/System.Resources.Reader.Tests.csproj
similarity index 100%
rename from src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Resources.Reader.Tests/System.Resources.Reader.Tests.csproj
diff --git a/src/libraries/System.Resources.ResourceManager/tests/MissingManifestResourceExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/MissingManifestResourceExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/MissingManifestResourceExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/MissingManifestResourceExceptionTests.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/MissingSatelliteAssemblyException.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/MissingSatelliteAssemblyException.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/MissingSatelliteAssemblyException.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/MissingSatelliteAssemblyException.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/NeutralResourcesLanguageAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/NeutralResourcesLanguageAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/NeutralResourcesLanguageAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/NeutralResourcesLanguageAttributeTests.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/ResourceManagerTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/ResourceManagerTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/ResourceManagerTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/ResourceManagerTests.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/ResourceSetTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/ResourceSetTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/ResourceSetTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/ResourceSetTests.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/AToZResx.Designer.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/AToZResx.Designer.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/AToZResx.Designer.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/AToZResx.Designer.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/AToZResx.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/AToZResx.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/AToZResx.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/AToZResx.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/CustomReader.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/CustomReader.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/CustomReader.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/CustomReader.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestClassWithoutNeutralResources.fr.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestClassWithoutNeutralResources.fr.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestClassWithoutNeutralResources.fr.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestClassWithoutNeutralResources.fr.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.Designer.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.Designer.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.Designer.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.Designer.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.es-MX.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.es-MX.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.es-MX.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.es-MX.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.es.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.es.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.es.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.es.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.fr-FR.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.fr-FR.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.fr-FR.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.fr-FR.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.Designer.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.Designer.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.Designer.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.Designer.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.resources b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.resources
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.resources
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.resources
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.netstandard17.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.netstandard17.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.resx b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.resx
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/TestResx.resx
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/TestResx.resx
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/bitmap.bmp b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/bitmap.bmp
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/bitmap.bmp
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/bitmap.bmp
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Resources/icon.ico b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/icon.ico
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/Resources/icon.ico
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/Resources/icon.ico
diff --git a/src/libraries/System.Resources.ResourceManager/tests/SatelliteContractVersionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/SatelliteContractVersionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/SatelliteContractVersionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/SatelliteContractVersionAttributeTests.cs
diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/System.Resources.ResourceManager.Tests.csproj
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/System.Resources.ResourceManager.Tests.csproj
diff --git a/src/libraries/System.Resources.ResourceManager/tests/TrimCompatibilityTests.cs b/src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/TrimCompatibilityTests.cs
similarity index 100%
rename from src/libraries/System.Resources.ResourceManager/tests/TrimCompatibilityTests.cs
rename to src/libraries/System.Runtime/tests/System.Resources.ResourceManager.Tests/TrimCompatibilityTests.cs
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.CompilerServices.Unsafe.Tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.CompilerServices.Unsafe.Tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.CompilerServices.Unsafe.Tests/UnsafeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.CompilerServices.Unsafe/tests/UnsafeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.CompilerServices.Unsafe.Tests/UnsafeTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj
diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Class1.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/Class1.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Class1.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/Class1.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/ClassesSample.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/ClassesSample.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/ClassesSample.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/AssemblyResolveTestApp/ClassesSample.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/ILLink.Descriptors.xml b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/ILLink.Descriptors.xml
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/ILLink.Descriptors.xml
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/ILLink.Descriptors.xml
diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System.Runtime.Extensions.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System.Runtime.Extensions.Tests.csproj
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/ApplicationIdTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/ApplicationIdTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/ApplicationIdTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/ApplicationIdTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/BitConverter.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverter.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/BitConverter.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverter.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/BitConverterArray.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterArray.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/BitConverterArray.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterArray.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/BitConverterBase.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterBase.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/BitConverterBase.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterBase.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/BitConverterSpan.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterSpan.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/BitConverterSpan.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/BitConverterSpan.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.BoxedObjectCheck.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.BoxedObjectCheck.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.BoxedObjectCheck.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.BoxedObjectCheck.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.FromBase64.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromBase64.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.FromBase64.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromBase64.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.FromHexString.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.FromHexString.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.TestBase.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.TestBase.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.TestBase.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.TestBase.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBase64CharArray.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBase64CharArray.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBase64CharArray.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBase64CharArray.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBase64String.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBase64String.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBase64String.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBase64String.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBoolean.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBoolean.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToBoolean.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToBoolean.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToByte.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToByte.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToByte.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToByte.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToChar.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToChar.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToChar.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToChar.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDateTime.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDateTime.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDateTime.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDateTime.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDecimal.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDecimal.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDecimal.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDecimal.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDouble.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDouble.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToDouble.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToDouble.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToHexString.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToHexString.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToHexString.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToHexString.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt16.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt16.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt16.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt16.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt32.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt32.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt32.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt32.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt64.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt64.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToInt64.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToInt64.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToSByte.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToSByte.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToSByte.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToSByte.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToSingle.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToSingle.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToSingle.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToSingle.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToString.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToString.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToString.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToString.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt16.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt16.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt16.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt16.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt32.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt32.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt32.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt32.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt64.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt64.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.ToUInt64.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.ToUInt64.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Convert.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Diagnostics/Stopwatch.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Diagnostics/Stopwatch.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Diagnostics/Stopwatch.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Diagnostics/Stopwatch.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.Exit.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.Exit.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.ExpandEnvironmentVariables.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.ExpandEnvironmentVariables.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.ExpandEnvironmentVariables.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.ExpandEnvironmentVariables.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.GetCommandLineArgs.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.GetCommandLineArgs.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.GetCommandLineArgs.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.GetCommandLineArgs.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.GetEnvironmentVariable.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.GetEnvironmentVariable.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.IsPrivilegedProcess.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.IsPrivilegedProcess.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.IsPrivilegedProcess.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.IsPrivilegedProcess.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.MachineName.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.MachineName.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.MachineName.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.MachineName.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.NewLine.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.NewLine.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.NewLine.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.NewLine.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.ProcessorCount.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.ProcessorCount.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.SetEnvironmentVariable.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.SetEnvironmentVariable.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.StackTrace.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.StackTrace.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.StackTrace.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.TickCount.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.TickCount.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.TickCount.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.TickCount.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.UserDomainName.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.UserDomainName.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.UserDomainName.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.UserName.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.UserName.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Environment.UserName.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Environment.UserName.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/EnvironmentTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/EnvironmentTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/Path.GetRelativePath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/Path.GetRelativePath.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/Path.GetRelativePath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/Path.GetRelativePath.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/Path.IsPathFullyQualified.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/Path.IsPathFullyQualified.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/Path.IsPathFullyQualified.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTestsBase.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTestsBase.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTestsBase.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTestsBase.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Combine.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Combine.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Combine.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Combine.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Join.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Join.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Join.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Join.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Unix.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Unix.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Windows.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests_Windows.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/MarshalByRefObjectTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/MarshalByRefObjectTest.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/MarshalByRefObjectTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/MarshalByRefObjectTest.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Math.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Math.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Math.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Math.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/MathF.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/MathF.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/MathF.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/MathF.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Net/WebUtility.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Net/WebUtility.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Net/WebUtility.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Net/WebUtility.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Numerics/BitOperationsTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Numerics/BitOperationsTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Numerics/BitOperationsTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Numerics/BitOperationsTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/OperatingSystemTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/OperatingSystemTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Progress.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Progress.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Progress.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Progress.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Random.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Random.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Random.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Random.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Reflection/AssemblyNameProxyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Reflection/AssemblyNameProxyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Reflection/AssemblyNameProxyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Reflection/AssemblyNameProxyTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/CompilerServices/SwitchExpressionExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/CompilerServices/SwitchExpressionExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Runtime/CompilerServices/SwitchExpressionExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/CompilerServices/SwitchExpressionExceptionTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/ProfileOptimization.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/ProfileOptimization.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/Versioning/FrameworkName.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/Versioning/FrameworkName.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Runtime/Versioning/FrameworkName.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/Versioning/FrameworkName.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/Versioning/VersioningHelperTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/Versioning/VersioningHelperTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/Runtime/Versioning/VersioningHelperTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Runtime/Versioning/VersioningHelperTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/StringComparer.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/StringComparer.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/StringComparer.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/StringComparer.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/UnloadingAndProcessExitTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/UnloadingAndProcessExitTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/System/UnloadingAndProcessExitTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/UnloadingAndProcessExitTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/AssemblyAttributes.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/AssemblyAttributes.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/AssemblyAttributes.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/AssemblyAttributes.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Program.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/Program.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/Program.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/Program.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/Resources/Strings.resx b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/Resources/Strings.resx
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestApp/Resources/Strings.resx
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/Resources/Strings.resx
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/TestApp.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/TestApp.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/TestApp.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestApp/TestApp.csproj
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestAppOutsideOfTPA/Program.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestAppOutsideOfTPA/Program.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestHelpers.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestHelpers.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/TestHelpers.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/TestHelpers.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.cs
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
diff --git a/src/libraries/System.Runtime.Handles/tests/CriticalHandle.cs b/src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/CriticalHandle.cs
similarity index 100%
rename from src/libraries/System.Runtime.Handles/tests/CriticalHandle.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/CriticalHandle.cs
diff --git a/src/libraries/System.Runtime.Handles/tests/SafeHandle.cs b/src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeHandle.cs
similarity index 100%
rename from src/libraries/System.Runtime.Handles/tests/SafeHandle.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeHandle.cs
diff --git a/src/libraries/System.Runtime.Handles/tests/SafeWaitHandle.cs b/src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeWaitHandle.cs
similarity index 100%
rename from src/libraries/System.Runtime.Handles/tests/SafeWaitHandle.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeWaitHandle.cs
diff --git a/src/libraries/System.Runtime.Handles/tests/SafeWaitHandleExtensions.cs b/src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeWaitHandleExtensions.cs
similarity index 100%
rename from src/libraries/System.Runtime.Handles/tests/SafeWaitHandleExtensions.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/SafeWaitHandleExtensions.cs
diff --git a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/System.Runtime.Handles.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Handles.Tests/System.Runtime.Handles.Tests.csproj
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/AssemblyInfo.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/AssemblyInfo.cs
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/AssemblyInfo.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/AssemblyInfo.cs
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/CheckArchitectureTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/CheckArchitectureTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/CheckArchitectureTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/CheckArchitectureTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/CheckPlatformTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/CheckPlatformTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/CheckPlatformTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/CheckPlatformTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/RuntimeIdentifierTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/RuntimeIdentifierTests.cs
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/RuntimeIdentifierTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/RuntimeIdentifierTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/Helpers.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/Helpers.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/Helpers.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/Helpers.cs
diff --git a/src/libraries/System.Runtime/tests/Hybrid/System.Runtime.IOS.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/Hybrid/System.Runtime.IOS.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/Hybrid/System.Runtime.IOS.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/Hybrid/System.Runtime.IOS.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/ILLink.Descriptors.xml b/src/libraries/System.Runtime/tests/System.Runtime.Tests/ILLink.Descriptors.xml
similarity index 100%
rename from src/libraries/System.Runtime/tests/ILLink.Descriptors.xml
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/ILLink.Descriptors.xml
diff --git a/src/libraries/System.Runtime/tests/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs
diff --git a/src/libraries/System.Runtime/tests/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
diff --git a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/NlsTests/System.Runtime.Nls.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/NlsTests/System.Runtime.Nls.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/System/AccessViolationExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AccessViolationExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AccessViolationExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AccessViolationExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ActivatorTests.Generic.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ActivatorTests.Generic.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ActivatorTests.Generic.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ActivatorTests.Generic.cs
diff --git a/src/libraries/System.Runtime/tests/System/ActivatorTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ActivatorTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ActivatorTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ActivatorTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/AmbiguousImplementationExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AmbiguousImplementationExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AmbiguousImplementationExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AmbiguousImplementationExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.Switch.Validation.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.Switch.Validation.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.Switch.Validation.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.Switch.Validation.cs
diff --git a/src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.Switch.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.Switch.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.Switch.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.Switch.cs
diff --git a/src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AppContext/AppContextTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AppContext/AppContextTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ApplicationExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ApplicationExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ApplicationExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ApplicationExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArgIteratorTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgIteratorTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArgIteratorTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgIteratorTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArgumentExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArgumentExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArgumentNullExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentNullExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArgumentNullExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentNullExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArgumentOutOfRangeExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentOutOfRangeExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArgumentOutOfRangeExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArgumentOutOfRangeExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArithmeticExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArithmeticExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArithmeticExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArithmeticExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArrayEnumeratorTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayEnumeratorTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArrayEnumeratorTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayEnumeratorTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArraySegmentTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArraySegmentTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArraySegmentTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArraySegmentTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArrayTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArrayTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ArrayTypeMismatchExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayTypeMismatchExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ArrayTypeMismatchExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ArrayTypeMismatchExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/AttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/AttributeUsageAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AttributeUsageAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/AttributeUsageAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/AttributeUsageAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Attributes.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Attributes.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Attributes.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Attributes.cs
diff --git a/src/libraries/System.Runtime/tests/System/BadImageFormatExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BadImageFormatExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/BadImageFormatExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BadImageFormatExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/BooleanTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BooleanTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/BooleanTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BooleanTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/BooleanTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BooleanTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/BooleanTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BooleanTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/BufferTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BufferTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/BufferTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/BufferTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ByteTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ByteTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ByteTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ByteTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/ByteTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ByteTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ByteTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ByteTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/CLSCompliantAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CLSCompliantAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/CLSCompliantAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CLSCompliantAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/CharTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CharTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/CharTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CharTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/CharTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CharTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/CharTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/CharTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Collections/Generic/KeyNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/Generic/KeyNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Collections/Generic/KeyNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/Generic/KeyNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Collections/Generic/KeyValuePairTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/Generic/KeyValuePairTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Collections/Generic/KeyValuePairTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/Generic/KeyValuePairTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Collections/ObjectModel/CollectionTestBase.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/CollectionTestBase.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Collections/ObjectModel/CollectionTestBase.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/CollectionTestBase.cs
diff --git a/src/libraries/System.Runtime/tests/System/Collections/ObjectModel/CollectionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/CollectionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Collections/ObjectModel/CollectionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/CollectionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Collections/ObjectModel/ReadOnlyCollectionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/ReadOnlyCollectionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Collections/ObjectModel/ReadOnlyCollectionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Collections/ObjectModel/ReadOnlyCollectionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ComponentModel/DefaultValueAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ComponentModel/DefaultValueAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ComponentModel/DefaultValueAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ComponentModel/DefaultValueAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ComponentModel/EditorBrowsableAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ComponentModel/EditorBrowsableAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ComponentModel/EditorBrowsableAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ComponentModel/EditorBrowsableAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DBNullTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DBNullTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DBNullTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DBNullTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DateOnlyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateOnlyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DateOnlyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateOnlyTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateTimeOffsetTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateTimeOffsetTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DateTimeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateTimeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DateTimeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateTimeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DecimalTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DecimalTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DecimalTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DecimalTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/DecimalTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DecimalTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DecimalTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DecimalTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DelegateTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DelegateTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DelegateTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DelegateTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/ConstantExpectedAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/ConstantExpectedAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/ConstantExpectedAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/ConstantExpectedAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/DynamicDependencyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/DynamicDependencyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/DynamicDependencyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/DynamicDependencyAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMembersAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMembersAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMembersAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMembersAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/ExperimentalAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/ExperimentalAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/ExperimentalAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/ExperimentalAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresAssemblyFilesAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresAssemblyFilesAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresAssemblyFilesAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresAssemblyFilesAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresDynamicCodeAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresDynamicCodeAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresDynamicCodeAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresDynamicCodeAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/SetsRequiredMembersAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/SetsRequiredMembersAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/SetsRequiredMembersAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/SetsRequiredMembersAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/StringSyntaxAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/StringSyntaxAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/StringSyntaxAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/StringSyntaxAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/UnconditionalSuppressMessageAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/UnconditionalSuppressMessageAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/CodeAnalysis/UnconditionalSuppressMessageAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/CodeAnalysis/UnconditionalSuppressMessageAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/ConditionalAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/ConditionalAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/ConditionalAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/ConditionalAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/StackTraceHiddenAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/StackTraceHiddenAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/StackTraceHiddenAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/StackTraceHiddenAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Diagnostics/UnreachableExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/UnreachableExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Diagnostics/UnreachableExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Diagnostics/UnreachableExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DivideByZeroExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DivideByZeroExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DivideByZeroExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DivideByZeroExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DoubleTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DoubleTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DoubleTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DoubleTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/DoubleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DoubleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DoubleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DoubleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/DuplicateWaitObjectExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DuplicateWaitObjectExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/DuplicateWaitObjectExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DuplicateWaitObjectExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EntryPointNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EntryPointNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/EnumTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EnumTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/EnumTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EnumTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/EventArgsTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EventArgsTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/EventArgsTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/EventArgsTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Exception.Helpers.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Exception.Helpers.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Exception.Helpers.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Exception.Helpers.cs
diff --git a/src/libraries/System.Runtime/tests/System/ExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ExecutionEngineExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExecutionEngineExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ExecutionEngineExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExecutionEngineExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ExitCodeTests.Unix.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExitCodeTests.Unix.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ExitCodeTests.Unix.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExitCodeTests.Unix.cs
diff --git a/src/libraries/System.Runtime/tests/System/ExternalExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExternalExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ExternalExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ExternalExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/FieldAccessExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FieldAccessExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/FieldAccessExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FieldAccessExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/FlagsAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FlagsAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/FlagsAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FlagsAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/FormatExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FormatExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/FormatExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FormatExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/FormattableStringTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FormattableStringTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/FormattableStringTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/FormattableStringTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/GCTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/GCTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/GCTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/GCTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/GuidTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/GuidTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/GuidTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/GuidTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/HalfTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HalfTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/HalfTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HalfTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/HalfTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HalfTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/HalfTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HalfTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/HandleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HandleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/HandleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HandleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/HashCodeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HashCodeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/HashCodeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/HashCodeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/DirectoryNotFoundException.InteropTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/DirectoryNotFoundException.InteropTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/DirectoryNotFoundException.InteropTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/DirectoryNotFoundException.InteropTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/DirectoryNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/DirectoryNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/DirectoryNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/DirectoryNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/EndOfStreamExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/EndOfStreamExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/EndOfStreamExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/EndOfStreamExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/Exceptions.HResults.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/Exceptions.HResults.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/Exceptions.HResults.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/Exceptions.HResults.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/FileLoadException.InteropTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadException.InteropTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/FileLoadException.InteropTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadException.InteropTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/FileLoadExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/FileLoadExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/FileNotFoundException.InteropTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileNotFoundException.InteropTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/FileNotFoundException.InteropTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileNotFoundException.InteropTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/FileNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/FileNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/FileNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/IOExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/IOExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/IOExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/IOExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/PathTooLongException.InteropTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/PathTooLongException.InteropTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/PathTooLongException.InteropTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/PathTooLongException.InteropTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IO/PathTooLongExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/PathTooLongExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IO/PathTooLongExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/PathTooLongExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IndexOutOfRangeExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IndexOutOfRangeExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IndexOutOfRangeExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IndexOutOfRangeExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IndexTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IndexTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IndexTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IndexTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int128Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int128Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int128Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int128Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int128Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int128Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int128Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int128Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int16Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int16Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int16Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int16Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int16Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int16Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int16Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int16Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int32Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int32Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int32Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int32Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int32Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int32Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int32Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int32Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int64Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int64Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int64Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int64Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/Int64Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int64Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Int64Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Int64Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/IntPtrTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IntPtrTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IntPtrTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IntPtrTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/IntPtrTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IntPtrTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/IntPtrTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IntPtrTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/InvalidCastExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidCastExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/InvalidCastExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidCastExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/InvalidOperationExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidOperationExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/InvalidOperationExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidOperationExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/InvalidProgramExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidProgramExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/InvalidProgramExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/InvalidProgramExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/LazyOfTMetadataTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyOfTMetadataTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/LazyOfTMetadataTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyOfTMetadataTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/LazyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/LazyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MarshalByRefObjectTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MarshalByRefObjectTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MarshalByRefObjectTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MarshalByRefObjectTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MemberAccessExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MemberAccessExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MemberAccessExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MemberAccessExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MethodAccessExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MethodAccessExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MethodAccessExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MethodAccessExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingFieldExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingFieldExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MissingFieldExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingFieldExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingMemberExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingMemberExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MissingMemberExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingMemberExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingMethodExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingMethodExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MissingMethodExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MissingMethodExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MulticastDelegateTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/MulticastDelegateTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NotFiniteNumberExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotFiniteNumberExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NotFiniteNumberExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotFiniteNumberExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NotImplementedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotImplementedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NotImplementedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotImplementedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NotSupportedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotSupportedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NotSupportedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NotSupportedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NullReferenceExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullReferenceExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NullReferenceExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullReferenceExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NullableMetadataTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullableMetadataTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NullableMetadataTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullableMetadataTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NullableTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullableTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NullableTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NullableTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/NumberFormatTestHelper.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NumberFormatTestHelper.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/NumberFormatTestHelper.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/NumberFormatTestHelper.cs
diff --git a/src/libraries/System.Runtime/tests/System/Numerics/GenericMathDimHelpers.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/GenericMathDimHelpers.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Numerics/GenericMathDimHelpers.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/GenericMathDimHelpers.cs
diff --git a/src/libraries/System.Runtime/tests/System/Numerics/IBinaryNumberTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IBinaryNumberTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Numerics/IBinaryNumberTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IBinaryNumberTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Numerics/IExponentialFunctionsTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IExponentialFunctionsTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Numerics/IExponentialFunctionsTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IExponentialFunctionsTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Numerics/IFloatingPointTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IFloatingPointTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Numerics/IFloatingPointTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/IFloatingPointTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Numerics/TotalOrderIeee754ComparerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/TotalOrderIeee754ComparerTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Numerics/TotalOrderIeee754ComparerTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Numerics/TotalOrderIeee754ComparerTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ObjectDisposedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObjectDisposedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ObjectDisposedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObjectDisposedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ObjectTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObjectTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ObjectTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObjectTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ObsoleteAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObsoleteAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ObsoleteAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ObsoleteAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/OutOfMemoryExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/OutOfMemoryExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/OutOfMemoryExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/OutOfMemoryExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/OverflowExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/OverflowExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/OverflowExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/OverflowExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/ParamArrayAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ParamArrayAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ParamArrayAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ParamArrayAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/PlatformNotSupportedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/PlatformNotSupportedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/PlatformNotSupportedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/PlatformNotSupportedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/PseudoCustomAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/PseudoCustomAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/PseudoCustomAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/PseudoCustomAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/RangeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RangeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/RangeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RangeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/RankExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RankExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/RankExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RankExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/RealFormatterTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RealFormatterTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/RealFormatterTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RealFormatterTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/RealParserTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RealParserTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/RealParserTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/RealParserTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyAlgorithmIdAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyAlgorithmIdAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyAlgorithmIdAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyAlgorithmIdAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyCompanyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCompanyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyCompanyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCompanyAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyConfigurationAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyConfigurationAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyConfigurationAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyConfigurationAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyCopyrightAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCopyrightAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyCopyrightAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCopyrightAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyCultureAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCultureAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyCultureAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyCultureAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyDefaultAliasAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDefaultAliasAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyDefaultAliasAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDefaultAliasAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyDelaySignAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDelaySignAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyDelaySignAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDelaySignAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyDescriptionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDescriptionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyDescriptionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyDescriptionAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyFileVersionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyFileVersionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyFileVersionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyFileVersionAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyFlagsAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyFlagsAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyFlagsAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyFlagsAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyInformationalVersionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyInformationalVersionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyInformationalVersionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyInformationalVersionAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyKeyFileAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyKeyFileAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyKeyFileAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyKeyFileAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyKeyNameAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyKeyNameAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyKeyNameAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyKeyNameAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyMetadataAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyMetadataAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyMetadataAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyMetadataAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyProductAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyProductAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyProductAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyProductAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblySignatureKeyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblySignatureKeyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblySignatureKeyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblySignatureKeyAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyTitleAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyTitleAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyTitleAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyTitleAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyTrademarkAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyTrademarkAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyTrademarkAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyTrademarkAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/AssemblyVersionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyVersionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/AssemblyVersionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/AssemblyVersionAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/BindingFlagsDoNotWrap.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/BindingFlagsDoNotWrap.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/BindingFlagsDoNotWrap.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/BindingFlagsDoNotWrap.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/CustomAttributeDataTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttributeDataTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/CustomAttributeDataTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttributeDataTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/CustomAttribute_Named_Typed_ArgumentTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttribute_Named_Typed_ArgumentTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/CustomAttribute_Named_Typed_ArgumentTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttribute_Named_Typed_ArgumentTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/CustomAttributesTestData.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttributesTestData.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/CustomAttributesTestData.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/CustomAttributesTestData.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/DefaultMemberAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/DefaultMemberAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/DefaultMemberAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/DefaultMemberAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/EmbeddedImage.png b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/EmbeddedImage.png
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/EmbeddedImage.png
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/EmbeddedImage.png
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/EmbeddedTextFile.txt b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/EmbeddedTextFile.txt
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/EmbeddedTextFile.txt
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/EmbeddedTextFile.txt
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/FieldInfoTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/FieldInfoTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/FieldInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/FieldInfoTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/FunctionPointerTestsExtensions.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/FunctionPointerTestsExtensions.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/FunctionPointerTestsExtensions.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/FunctionPointerTestsExtensions.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeEmit/System.Runtime.ReflectionInvokeEmit.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeEmit/System.Runtime.ReflectionInvokeEmit.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeEmit/System.Runtime.ReflectionInvokeEmit.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeEmit/System.Runtime.ReflectionInvokeEmit.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeEmit/runtimeconfig.template.json b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeEmit/runtimeconfig.template.json
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeEmit/runtimeconfig.template.json
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeEmit/runtimeconfig.template.json
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeInterpreted/System.Runtime.ReflectionInvokeInterpreted.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeInterpreted/System.Runtime.ReflectionInvokeInterpreted.Tests.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeInterpreted/System.Runtime.ReflectionInvokeInterpreted.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeInterpreted/System.Runtime.ReflectionInvokeInterpreted.Tests.csproj
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeInterpreted/runtimeconfig.template.json b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeInterpreted/runtimeconfig.template.json
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeInterpreted/runtimeconfig.template.json
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeInterpreted/runtimeconfig.template.json
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeRefReturn.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeRefReturn.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeRefReturn.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeRefReturn.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/InvokeWithRefLikeArgs.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeWithRefLikeArgs.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/InvokeWithRefLikeArgs.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/InvokeWithRefLikeArgs.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/IsCollectibleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/IsCollectibleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/IsCollectibleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/IsCollectibleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/MethodBaseTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/MethodBaseTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/MethodBaseTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/MethodBaseTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/MethodBodyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/MethodBodyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/MethodBodyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/MethodBodyTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ModuleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ModuleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/NullabilityInfoContextTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/NullabilityInfoContextTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ObfuscateAssemblyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ObfuscateAssemblyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ObfuscateAssemblyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ObfuscateAssemblyAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ObfuscationAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ObfuscationAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ObfuscationAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ObfuscationAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/PointerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/PointerTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/PointerTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/PointerTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ReflectionCacheTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionCacheTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ReflectionCacheTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionCacheTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ReflectionContextTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionContextTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ReflectionContextTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionContextTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ReflectionTypeLoadExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionTypeLoadExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/ReflectionTypeLoadExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/ReflectionTypeLoadExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/RuntimeTypeMemberCacheTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/RuntimeTypeMemberCacheTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/RuntimeTypeMemberCacheTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/RuntimeTypeMemberCacheTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/SignatureTypes.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/SignatureTypes.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/SignatureTypes.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/SignatureTypes.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/StrongNameKeyPairTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/StrongNameKeyPairTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/StrongNameKeyPairTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/StrongNameKeyPairTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/TypeDelegatorTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeDelegatorTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/TypeDelegatorTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeDelegatorTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.GetMember.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.GetMember.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Reflection/TypeTests.GetMember.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.GetMember.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/AttributesTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/AttributesTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/AttributesTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/AttributesTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/CallerArgumentExpressionAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/CallerArgumentExpressionAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/CallerArgumentExpressionAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/CallerArgumentExpressionAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/DefaultInterpolatedStringHandlerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/DefaultInterpolatedStringHandlerTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/DefaultInterpolatedStringHandlerTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/DefaultInterpolatedStringHandlerTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/FormattableStringFactoryTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/FormattableStringFactoryTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/FormattableStringFactoryTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/FormattableStringFactoryTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/MethodImplAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/MethodImplAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/MethodImplAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/MethodImplAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeFeatureTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeFeatureTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeFeatureTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeFeatureTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeWrappedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeWrappedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeWrappedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeWrappedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/StrongBoxTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/StrongBoxTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/StrongBoxTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/StrongBoxTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/ConstrainedExecution/PrePrepareMethodAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ConstrainedExecution/PrePrepareMethodAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/ConstrainedExecution/PrePrepareMethodAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ConstrainedExecution/PrePrepareMethodAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/ControlledExecutionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ControlledExecutionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/ControlledExecutionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ControlledExecutionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/DependentHandleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/DependentHandleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/DependentHandleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/DependentHandleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/ExceptionServices/ExceptionDispatchInfoTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ExceptionServices/ExceptionDispatchInfoTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/ExceptionServices/ExceptionDispatchInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ExceptionServices/ExceptionDispatchInfoTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ExceptionServices/HandleProcessCorruptedStateExceptions.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/JitInfoTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/JitInfoTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/MemoryFailPointTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/MemoryFailPointTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/MemoryFailPointTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/MemoryFailPointTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/NgenServicingAttributesTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/NgenServicingAttributesTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/NgenServicingAttributesTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/NgenServicingAttributesTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/Serialization/OptionalFieldAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/OptionalFieldAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/Serialization/OptionalFieldAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/OptionalFieldAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/Serialization/SerializationExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/SerializationExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/Serialization/SerializationExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/SerializationExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/Serialization/StreamingContextTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/StreamingContextTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/Serialization/StreamingContextTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Serialization/StreamingContextTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/Versioning/OSPlatformAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Versioning/OSPlatformAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/Versioning/OSPlatformAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Versioning/OSPlatformAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Runtime/Versioning/RequiresPreviewFeaturesAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Versioning/RequiresPreviewFeaturesAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Runtime/Versioning/RequiresPreviewFeaturesAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/Versioning/RequiresPreviewFeaturesAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/SByteTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SByteTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/SByteTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SByteTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/SByteTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SByteTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/SByteTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SByteTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Security/SecurityAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Security/SecurityAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Security/SecurityAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Security/SecurityAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Security/SecurityExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Security/SecurityExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Security/SecurityExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Security/SecurityExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/SingleTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SingleTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/SingleTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SingleTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/SingleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SingleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/SingleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SingleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/StackOverflowExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StackOverflowExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StackOverflowExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StackOverflowExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/String.SplitTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/String.SplitTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/String.SplitTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/String.SplitTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/StringComparerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StringComparerTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/StringGetHashCodeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringGetHashCodeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StringGetHashCodeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringGetHashCodeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/StringSplitExtensions.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringSplitExtensions.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StringSplitExtensions.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringSplitExtensions.cs
diff --git a/src/libraries/System.Runtime/tests/System/StringTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StringTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/StringTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/StringTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/SystemExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SystemExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/SystemExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/SystemExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/CompositeFormatTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/CompositeFormatTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/CompositeFormatTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/CompositeFormatTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/EncodingTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/EncodingTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/EncodingTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/Latin1UtilityTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Latin1UtilityTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/Latin1UtilityTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Latin1UtilityTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/RuneTests.TestData.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/RuneTests.TestData.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/RuneTests.TestData.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/RuneTests.TestData.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/RuneTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/RuneTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/RuneTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/RuneTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/StringBuilderInterpolationTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/StringBuilderInterpolationTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/StringBuilderInterpolationTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/StringBuilderInterpolationTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/StringBuilderTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/StringBuilderTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/StringBuilderTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/StringBuilderTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8Tests.TryWrite.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8Tests.TryWrite.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8Tests.TryWrite.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8Tests.TryWrite.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8UtilityTests.ValidateBytes.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8UtilityTests.ValidateBytes.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8UtilityTests.ValidateBytes.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Text/Unicode/Utf8UtilityTests.ValidateBytes.cs
diff --git a/src/libraries/System.Runtime/tests/System/Threading/PeriodicTimerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Threading/PeriodicTimerTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Threading/PeriodicTimerTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Threading/PeriodicTimerTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Threading/WaitHandleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Threading/WaitHandleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Threading/WaitHandleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Threading/WaitHandleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeOnlyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeOnlyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeOnlyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeOnlyTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeSpanTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeSpanTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeSpanTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeSpanTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneNotFoundExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeZoneNotFoundExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneNotFoundExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeZoneTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TimeoutExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeoutExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TimeoutExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeoutExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TupleTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TupleTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TupleTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TupleTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Type/FunctionPointerTests.Runtime.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/FunctionPointerTests.Runtime.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Type/FunctionPointerTests.Runtime.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/FunctionPointerTests.Runtime.cs
diff --git a/src/libraries/System.Runtime/tests/System/Type/TypePropertyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypePropertyTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Type/TypePropertyTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypePropertyTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Type/TypeTests.Get.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypeTests.Get.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Type/TypeTests.Get.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypeTests.Get.cs
diff --git a/src/libraries/System.Runtime/tests/System/Type/TypeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Type/TypeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Type/TypeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TypeLoadExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypeLoadExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TypeLoadExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypeLoadExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TypeUnloadedExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypeUnloadedExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TypeUnloadedExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypeUnloadedExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/TypedReferenceTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypedReferenceTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/TypedReferenceTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TypedReferenceTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt128Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt128Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt128Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt128Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt128Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt128Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt128Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt128Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt16Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt16Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt16Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt16Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt16Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt16Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt16Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt16Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt32Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt32Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt32Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt32Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt32Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt32Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt32Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt32Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt64Tests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt64Tests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt64Tests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt64Tests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/UInt64Tests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt64Tests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UInt64Tests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UInt64Tests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UIntPtrTests.GenericMath.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UIntPtrTests.GenericMath.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UIntPtrTests.GenericMath.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UIntPtrTests.GenericMath.cs
diff --git a/src/libraries/System.Runtime/tests/System/UIntPtrTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UIntPtrTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UIntPtrTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UIntPtrTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UnitySerializationHolderTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UnitySerializationHolderTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UnitySerializationHolderTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UnitySerializationHolderTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.CreateStringTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.CreateStringTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Uri.CreateUriTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.CreateUriTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Uri.CreateUriTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.CreateUriTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/Uri.MethodsTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.MethodsTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/Uri.MethodsTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Uri.MethodsTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/UseResourceKeysTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UseResourceKeysTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/UseResourceKeysTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/UseResourceKeysTest.cs
diff --git a/src/libraries/System.Runtime/tests/System/ValueTypeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ValueTypeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/ValueTypeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/ValueTypeTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/VersionTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/VersionTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/VersionTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/VersionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/WeakReferenceTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/WeakReferenceTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/System/WeakReferenceTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/System/WeakReferenceTests.cs
diff --git a/src/libraries/System.Runtime/tests/TestCollectibleAssembly/TestCollectibleAssembly.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestCollectibleAssembly/TestCollectibleAssembly.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestCollectibleAssembly/TestCollectibleAssembly.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestCollectibleAssembly/TestCollectibleAssembly.cs
diff --git a/src/libraries/System.Runtime/tests/TestCollectibleAssembly/TestCollectibleAssembly.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestCollectibleAssembly/TestCollectibleAssembly.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestCollectibleAssembly/TestCollectibleAssembly.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestCollectibleAssembly/TestCollectibleAssembly.csproj
diff --git a/src/libraries/System.Runtime/tests/TestLoadAssembly/ClassesSample.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/ClassesSample.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestLoadAssembly/ClassesSample.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/ClassesSample.cs
diff --git a/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/TestLoadAssembly.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/TestLoadAssembly.cs
diff --git a/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/TestLoadAssembly.csproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestLoadAssembly/TestLoadAssembly.csproj
diff --git a/src/libraries/System.Runtime/tests/TestModule/README.md b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/README.md
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestModule/README.md
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/README.md
diff --git a/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.il b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/System.Reflection.TestModule.il
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.il
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/System.Reflection.TestModule.il
diff --git a/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/System.Reflection.TestModule.ilproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/System.Reflection.TestModule.ilproj
diff --git a/src/libraries/System.Runtime/tests/TestStructs/System.TestStructs.il b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestStructs/System.TestStructs.il
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestStructs/System.TestStructs.il
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestStructs/System.TestStructs.il
diff --git a/src/libraries/System.Runtime/tests/TestStructs/System.TestStructs.ilproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestStructs/System.TestStructs.ilproj
similarity index 100%
rename from src/libraries/System.Runtime/tests/TestStructs/System.TestStructs.ilproj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TestStructs/System.TestStructs.ilproj
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/AppDomainGetThreadGenericPrincipalTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/AppDomainGetThreadGenericPrincipalTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/AppDomainGetThreadGenericPrincipalTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/AppDomainGetThreadGenericPrincipalTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/AppDomainGetThreadWindowsPrincipalTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/AppDomainGetThreadWindowsPrincipalTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/AppDomainGetThreadWindowsPrincipalTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/AppDomainGetThreadWindowsPrincipalTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/CreateDelegateTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/CreateDelegateTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/CreateDelegateTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/CreateDelegateTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/DebuggerTypeProxyAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DebuggerTypeProxyAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/DebuggerTypeProxyAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DebuggerTypeProxyAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/DebuggerVisualizerAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DebuggerVisualizerAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/DebuggerVisualizerAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DebuggerVisualizerAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/DefaultValueAttributeCtorTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DefaultValueAttributeCtorTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/DefaultValueAttributeCtorTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/DefaultValueAttributeCtorTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/GenericArraySortHelperTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/GenericArraySortHelperTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/GenericArraySortHelperTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/GenericArraySortHelperTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/InheritedAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InheritedAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/InheritedAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InheritedAttributeTests.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/InterfacesOnArrays.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InterfacesOnArrays.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/InterfacesOnArrays.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InterfacesOnArrays.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/InvariantGlobalizationFalse.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InvariantGlobalizationFalse.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/InvariantGlobalizationFalse.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InvariantGlobalizationFalse.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/InvariantGlobalizationTrue.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InvariantGlobalizationTrue.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/InvariantGlobalizationTrue.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/InvariantGlobalizationTrue.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/NullabilityInfoContextSupportFalse.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/NullabilityInfoContextSupportFalse.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/NullabilityInfoContextSupportFalse.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/NullabilityInfoContextSupportFalse.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/NullabilityInfoContextSupportTrue.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/NullabilityInfoContextSupportTrue.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/NullabilityInfoContextSupportTrue.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/NullabilityInfoContextSupportTrue.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/StackFrameHelperTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/StackFrameHelperTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/StackFrameHelperTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/StackFrameHelperTest.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/System.Runtime.TrimmingTests.proj
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/System.Runtime.TrimmingTests.proj
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/TypeBuilderComDisabled.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/TypeBuilderComDisabled.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/TypeBuilderComDisabled.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/TypeBuilderComDisabled.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/UseWindowsThreadPoolFalse.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/UseWindowsThreadPoolFalse.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/UseWindowsThreadPoolFalse.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/UseWindowsThreadPoolFalse.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/UseWindowsThreadPoolTrue.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/UseWindowsThreadPoolTrue.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/UseWindowsThreadPoolTrue.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/UseWindowsThreadPoolTrue.cs
diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/VerifyResourcesGetTrimmedTest.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/VerifyResourcesGetTrimmedTest.cs
similarity index 100%
rename from src/libraries/System.Runtime/tests/TrimmingTests/VerifyResourcesGetTrimmedTest.cs
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/TrimmingTests/VerifyResourcesGetTrimmedTest.cs
diff --git a/src/libraries/System.Runtime/tests/default.rd.xml b/src/libraries/System.Runtime/tests/System.Runtime.Tests/default.rd.xml
similarity index 100%
rename from src/libraries/System.Runtime/tests/default.rd.xml
rename to src/libraries/System.Runtime/tests/System.Runtime.Tests/default.rd.xml
diff --git a/src/libraries/System.Security.SecureString/tests/SecureStringTests.cs b/src/libraries/System.Runtime/tests/System.Security.SecureString.Tests/SecureStringTests.cs
similarity index 100%
rename from src/libraries/System.Security.SecureString/tests/SecureStringTests.cs
rename to src/libraries/System.Runtime/tests/System.Security.SecureString.Tests/SecureStringTests.cs
diff --git a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/libraries/System.Runtime/tests/System.Security.SecureString.Tests/System.Security.SecureString.Tests.csproj
similarity index 100%
rename from src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Security.SecureString.Tests/System.Security.SecureString.Tests.csproj
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetDecoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetDecoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetDecoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetDecoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetEncoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetEncoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetEncoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetEncoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/ASCIIEncoding/ASCIIEncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/ASCIIEncoding/ASCIIEncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/CaseConversionTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/CaseConversionTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/CaseConversionTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/CaseConversionTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/EqualsTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/EqualsTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/EqualsTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/EqualsTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/FromUtf16Tests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/FromUtf16Tests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/FromUtf16Tests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/FromUtf16Tests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/IsValidByteTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/IsValidByteTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/IsValidByteTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/IsValidByteTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/IsValidCharTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/IsValidCharTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/IsValidCharTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/IsValidCharTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/ToUtf16Tests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/ToUtf16Tests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/ToUtf16Tests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/ToUtf16Tests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Ascii/TrimTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/TrimTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Ascii/TrimTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Ascii/TrimTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/CustomEncoderReplacementFallback.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/CustomEncoderReplacementFallback.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/CustomEncoderReplacementFallback.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/CustomEncoderReplacementFallback.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/Decoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/Decoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/Decoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/Decoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderConvert2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderConvert2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderConvert2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderConvert2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderCtor.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderCtor.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderCtor.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderCtor.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetCharCount2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetCharCount2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetCharCount2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetCharCount2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetCharCount3.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetCharCount3.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetCharCount3.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetCharCount3.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetChars2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetChars2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetChars2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetChars2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetChars3.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetChars3.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderGetChars3.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderGetChars3.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderReset.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderReset.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderReset.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderReset.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Decoder/DecoderSpanTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderSpanTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Decoder/DecoderSpanTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Decoder/DecoderSpanTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/DecoderFallback/DecoderFallbackTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/DecoderFallback/DecoderFallbackTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/DecoderFallback/DecoderFallbackTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/DecoderFallback/DecoderFallbackTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/DecoderFallbackException/DecoderFallbackExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/DecoderFallbackException/DecoderFallbackExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/DecoderFallbackException/DecoderFallbackExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/DecoderFallbackException/DecoderFallbackExceptionTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/Encoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/Encoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/Encoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/Encoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/EncoderConvert2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderConvert2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/EncoderConvert2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderConvert2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/EncoderCtor.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderCtor.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/EncoderCtor.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderCtor.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/EncoderGetByteCount2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderGetByteCount2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/EncoderGetByteCount2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderGetByteCount2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/EncoderGetBytes2.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderGetBytes2.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/EncoderGetBytes2.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderGetBytes2.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoder/EncoderSpanTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderSpanTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoder/EncoderSpanTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoder/EncoderSpanTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/EncoderFallbackException/EncoderFallbackExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/EncoderFallbackException/EncoderFallbackExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/EncoderFallbackException/EncoderFallbackExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/EncoderFallbackException/EncoderFallbackExceptionTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/Encoding.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/Encoding.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/EncodingConvertTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingConvertTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/EncodingConvertTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingConvertTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/EncodingCtorTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingCtorTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/EncodingCtorTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingCtorTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingGetEncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingGetEncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/EncodingVirtualTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingVirtualTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/EncodingVirtualTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/EncodingVirtualTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Encoding/TranscodingStreamTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/TranscodingStreamTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Encoding/TranscodingStreamTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Encoding/TranscodingStreamTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/EncodingTestHelpers.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/EncodingTestHelpers.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/EncodingTestHelpers.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/EncodingTestHelpers.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Fallback/DecoderExceptionFallbackTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/DecoderExceptionFallbackTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Fallback/DecoderExceptionFallbackTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/DecoderExceptionFallbackTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Fallback/DecoderReplacementFallbackTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/DecoderReplacementFallbackTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Fallback/DecoderReplacementFallbackTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/DecoderReplacementFallbackTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Fallback/EncoderExceptionFallbackTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/EncoderExceptionFallbackTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Fallback/EncoderExceptionFallbackTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/EncoderExceptionFallbackTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Fallback/EncoderReplacementFallbackTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/EncoderReplacementFallbackTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Fallback/EncoderReplacementFallbackTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Fallback/EncoderReplacementFallbackTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/Latin1Encoding/Latin1EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/Latin1Encoding/Latin1EncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/NegativeEncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/NegativeEncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/NegativeEncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/NegativeEncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj
diff --git a/src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF32Encoding/UTF32EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF32Encoding/UTF32EncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetDecoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetDecoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetDecoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetDecoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetEncoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetEncoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetEncoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetEncoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF7Encoding/UTF7EncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetDecoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetDecoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetDecoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetDecoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetEncoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetEncoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetEncoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetEncoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UTF8Encoding/UTF8EncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UTF8Encoding/UTF8EncodingTests.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncoding.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncoding.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncoding.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncoding.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingDecode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingDecode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingDecode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingEncode.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingEncode.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingEncode.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingEncode.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetDecoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetDecoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetDecoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetDecoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetEncoder.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetEncoder.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetEncoder.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetEncoder.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetMaxByteCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetMaxByteCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetMaxByteCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetMaxByteCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetMaxCharCount.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetMaxCharCount.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingGetMaxCharCount.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingGetMaxCharCount.cs
diff --git a/src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingTests.cs b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingTests.cs
similarity index 100%
rename from src/libraries/System.Text.Encoding/tests/UnicodeEncoding/UnicodeEncodingTests.cs
rename to src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/UnicodeEncoding/UnicodeEncodingTests.cs
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/AsyncMethodBuilderAttributeTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/AsyncMethodBuilderAttributeTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/AsyncMethodBuilderAttributeTests.cs
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/AsyncValueTaskMethodBuilderTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/AsyncValueTaskMethodBuilderTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/AsyncValueTaskMethodBuilderTests.cs
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/ManualResetValueTaskSourceTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/ManualResetValueTaskSourceTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/ManualResetValueTaskSourceTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/ManualResetValueTaskSourceTests.cs
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/PoolingAsyncValueTaskMethodBuilderTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/PoolingAsyncValueTaskMethodBuilderTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/PoolingAsyncValueTaskMethodBuilderTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/PoolingAsyncValueTaskMethodBuilderTests.cs
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/System.Threading.Tasks.Extensions.Tests.csproj
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/System.Threading.Tasks.Extensions.Tests.csproj
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/ValueTaskTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks.Extensions/tests/ValueTaskTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Extensions.Tests/ValueTaskTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/AggregateExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/AggregateExceptionTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/CESchedulerPairTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/CESchedulerPairTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/CESchedulerPairTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/CESchedulerPairTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/CancellationTokenTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/CancellationTokenTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/CancellationTokenTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/CancellationTokenTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Helpers.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Helpers.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Helpers.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Helpers.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/MethodCoverage.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/MethodCoverage.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/OperationCanceledExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/OperationCanceledExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/OperationCanceledExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/OperationCanceledExceptionTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncIteratorMethodBuilderTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/AsyncIteratorMethodBuilderTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncIteratorMethodBuilderTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/AsyncIteratorMethodBuilderTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/ConfiguredAsyncDisposable.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/ConfiguredAsyncDisposable.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/ConfiguredAsyncDisposable.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/ConfiguredAsyncDisposable.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerableTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerableTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerableTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerableTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/TaskAwaiterTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/YieldAwaitableTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/ExecutionContextFlowTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/ExecutionContextFlowTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/ExecutionContextFlowTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/ExecutionContextFlowTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/RunContinuationsAsynchronouslyTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/RunContinuationsAsynchronouslyTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/RunContinuationsAsynchronouslyTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/RunContinuationsAsynchronouslyTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TPLTestException.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TPLTestException.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TPLTestException.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TPLTestException.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskAPMTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskAPMTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskAPMTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskAPMTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskArgumentValidationTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskArgumentValidationTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskArgumentValidationTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskArgumentValidationTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCancelWaitTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCancelWaitTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCancelWaitTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCancelWaitTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCancelWaitTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCancelWaitTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCanceledExceptionTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCanceledExceptionTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCanceledExceptionTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCanceledExceptionTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCompletionSourceTResultTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCompletionSourceTResultTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCompletionSourceTResultTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCompletionSourceTResultTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCompletionSourceTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCompletionSourceTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCompletionSourceTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCompletionSourceTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWhenAllTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWhenAllTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWhenAllTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWhenAllTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWhenAnyTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWhenAnyTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWhenAnyTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWhenAnyTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithAllAnyTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithAllAnyTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithAllAnyTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithAllAnyTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWith_ContFuncAndActionTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWith_ContFuncAndActionTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWith_ContFuncAndActionTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWith_ContFuncAndActionTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWith_ContFuncAndActionWithArgsTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWith_ContFuncAndActionWithArgsTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWith_ContFuncAndActionWithArgsTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWith_ContFuncAndActionWithArgsTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskCreateTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCreateTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskCreateTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskCreateTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskDisposeTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskDisposeTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskDisposeTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskDisposeTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncTest2.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncTest2.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncTest2.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncTest2.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncWork.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncWork.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskFromAsyncWork.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskFromAsyncWork.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskPropertiesTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskPropertiesTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskPropertiesTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskPropertiesTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRtTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRtTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRtTests_Core.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRtTests_Core.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRunSyncTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskRunSyncTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskStatusTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskStatusTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskStatusTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskStatusTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskWaitAllAnyTest.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskWaitAllAnyTest.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/Task/TaskWaitAllAnyTest.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskWaitAllAnyTest.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/TaskFactory/TaskFactoryTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskFactory/TaskFactoryTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/TaskFactory/TaskFactoryTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskFactory/TaskFactoryTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/TaskFactory/TaskFactory_FromAsyncTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskFactory/TaskFactory_FromAsyncTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/TaskFactory/TaskFactory_FromAsyncTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskFactory/TaskFactory_FromAsyncTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskScheduler/TaskSchedulerTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskScheduler/TaskSchedulerTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/TaskToAsyncResultTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskToAsyncResultTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/TaskToAsyncResultTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/TaskToAsyncResultTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/UnwrapTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/UnwrapTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/UnwrapTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/UnwrapTests.cs
diff --git a/src/libraries/System.Threading.Tasks/tests/XunitAssemblyAttributes.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/XunitAssemblyAttributes.cs
similarity index 100%
rename from src/libraries/System.Threading.Tasks/tests/XunitAssemblyAttributes.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/XunitAssemblyAttributes.cs
diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/System.Threading.Timer.Tests.csproj
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/System.Threading.Timer.Tests.csproj
diff --git a/src/libraries/System.Threading.Timer/tests/TimerChangeTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerChangeTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/TimerChangeTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerChangeTests.cs
diff --git a/src/libraries/System.Threading.Timer/tests/TimerConstructorTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerConstructorTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/TimerConstructorTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerConstructorTests.cs
diff --git a/src/libraries/System.Threading.Timer/tests/TimerDisposeTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerDisposeTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/TimerDisposeTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerDisposeTests.cs
diff --git a/src/libraries/System.Threading.Timer/tests/TimerFiringTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerFiringTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/TimerFiringTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerFiringTests.cs
diff --git a/src/libraries/System.Threading.Timer/tests/TimerMetricsTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerMetricsTests.cs
similarity index 100%
rename from src/libraries/System.Threading.Timer/tests/TimerMetricsTests.cs
rename to src/libraries/System.Runtime/tests/System.Threading.Timer.Tests/TimerMetricsTests.cs
diff --git a/src/libraries/System.ValueTuple/tests/ExtensionsTests.cs b/src/libraries/System.Runtime/tests/System.ValueTuple.Tests/ExtensionsTests.cs
similarity index 100%
rename from src/libraries/System.ValueTuple/tests/ExtensionsTests.cs
rename to src/libraries/System.Runtime/tests/System.ValueTuple.Tests/ExtensionsTests.cs
diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/libraries/System.Runtime/tests/System.ValueTuple.Tests/System.ValueTuple.Tests.csproj
similarity index 100%
rename from src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
rename to src/libraries/System.Runtime/tests/System.ValueTuple.Tests/System.ValueTuple.Tests.csproj
diff --git a/src/libraries/System.ValueTuple/tests/TupleElementNamesTests.cs b/src/libraries/System.Runtime/tests/System.ValueTuple.Tests/TupleElementNamesTests.cs
similarity index 100%
rename from src/libraries/System.ValueTuple/tests/TupleElementNamesTests.cs
rename to src/libraries/System.Runtime/tests/System.ValueTuple.Tests/TupleElementNamesTests.cs
diff --git a/src/libraries/System.ValueTuple/tests/TupleTests.cs b/src/libraries/System.Runtime/tests/System.ValueTuple.Tests/TupleTests.cs
similarity index 100%
rename from src/libraries/System.ValueTuple/tests/TupleTests.cs
rename to src/libraries/System.Runtime/tests/System.ValueTuple.Tests/TupleTests.cs
diff --git a/src/libraries/System.ValueTuple/tests/ValueTupleTests.cs b/src/libraries/System.Runtime/tests/System.ValueTuple.Tests/ValueTupleTests.cs
similarity index 100%
rename from src/libraries/System.ValueTuple/tests/ValueTupleTests.cs
rename to src/libraries/System.Runtime/tests/System.ValueTuple.Tests/ValueTupleTests.cs
diff --git a/src/libraries/System.Security.SecureString/README.md b/src/libraries/System.Security.SecureString/README.md
deleted file mode 100644
index 769393cfae384..0000000000000
--- a/src/libraries/System.Security.SecureString/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# System.Security.SecureString
-
-This assembly no longer contains any code.  It is provided only to permit type unification for libraries built against previous versions of .NET.
-
-## Contribution Bar
-
-- [x] We only consider enhancements to the tests, or the creation of new tests.
-
-## Source
-
-* The `SecureString` type is part of [System.Private.CoreLib](../System.Private.CoreLib/), exposed via [System.Runtime](../System.Runtime/).
-* The `SecureStringMarshal` type is part of [System.Runtime.InteropServices](../System.Runtime.InteropServices/).
-* Tests for these types are in the [tests](tests/) subdirectory.
-
-## Deployment
-
-The System.Security.SecureString assembly is part of the shared framework, and ships with every new release of .NET.
diff --git a/src/libraries/System.Threading.Tasks.Extensions/README.md b/src/libraries/System.Threading.Tasks.Extensions/README.md
deleted file mode 100644
index 83791474420c7..0000000000000
--- a/src/libraries/System.Threading.Tasks.Extensions/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# System.Threading.Tasks.Extensions
-Provides types including [`ValueTask`](https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask) and [`ValueTask<T>`](https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1) that enable writing memory-efficient asynchronous code.
-
-Documentation can be found at https://learn.microsoft.com/dotnet/api/system.threading.tasks
-
-## Contribution Bar
-- [x] [We consider new features, new APIs and performance changes](../../libraries/README.md#primary-bar)
-- [x] [We consider PRs that target this library for new source code analyzers](../../libraries/README.md#secondary-bars)
-
-## Source
-
-* The source of this project can found in [../System.Private.CoreLib/src/System/Threading/Tasks](../System.Private.CoreLib/src/System/Threading/Tasks)
-
-## Deployment
-[System.Threading.Tasks.Extensions](https://www.nuget.org/packages/System.Threading.Tasks.Extensions) is included in the shared framework. The package does not need to be installed into any project compatible with .NET Standard 2.1; it only needs to be installed when targeting .NET Standard 2.0 or .NET Framework.
\ No newline at end of file
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 88ac0d5f0aac1..0c6ef75b52a6a 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -76,8 +76,8 @@
     <!-- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" /> -->
 
     <!-- https://github.com/dotnet/runtime/issues/94225 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\Hybrid\System.Globalization.Calendars.Hybrid.WASM.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization\tests\Hybrid\System.Globalization.Hybrid.WASM.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Calendars.Tests\Hybrid\System.Globalization.Calendars.Hybrid.WASM.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\Hybrid\System.Globalization.Hybrid.WASM.Tests.csproj" />
   </ItemGroup>
 
   <!-- Projects that don't support code coverage measurement. -->
@@ -166,10 +166,10 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.Physical\tests\Microsoft.Extensions.FileProviders.Physical.Tests.csproj" />
 
     <!-- Timeout on Helix, cannot repro locally -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security\tests\FunctionalTests\System.Net.Security.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Requests\tests\System.Net.Requests.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Mail\tests\Functional\System.Net.Mail.Functional.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.FileSystem\tests\DisabledFileLockingTests\System.IO.FileSystem.DisabledFileLocking.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Requests\tests\System.Net.Requests.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security\tests\FunctionalTests\System.Net.Security.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\DisabledFileLockingTests\System.IO.FileSystem.DisabledFileLocking.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="('$(TargetOS)' == 'android' or '$(TargetsLinuxBionic)' == 'true') and '$(RunDisabledAndroidTests)' != 'true'">
@@ -177,12 +177,12 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Hosting\tests\UnitTests\Microsoft.Extensions.Hosting.Unit.Tests.csproj" />
 
     <!-- Tests crash -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization\tests\Invariant\Invariant.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.FileSystem\tests\System.IO.FileSystem.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.FileSystem.Watcher\tests\System.IO.FileSystem.Watcher.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Quic\tests\FunctionalTests\System.Net.Quic.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Formatters\tests\System.Runtime.Serialization.Formatters.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\Invariant\Invariant.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\System.IO.FileSystem.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Algorithms\tests\System.Security.Cryptography.Algorithms.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Csp\tests\System.Security.Cryptography.Csp.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Thread\tests\System.Threading.Thread.Tests.csproj" />
@@ -205,7 +205,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj" />
 
     <!-- Crashes on CI (possibly flakey) -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj"/>
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Dynamic.Runtime.Tests\System.Dynamic.Runtime.Tests.csproj"/>
 
     <!-- gRPC tests should be run only manually -->
     <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
@@ -213,15 +213,14 @@
 
   <ItemGroup Condition="('$(TargetOS)' == 'android' or '$(TargetsLinuxBionic)' == 'true') and '$(TargetArchitecture)' == 'arm64' and '$(RunDisabledAndroidTests)' != 'true'">
     <!-- Crashes on CI (possibly flakey) https://github.com/dotnet/runtime/issues/52615 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Memory/tests/System.Memory.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj" />
@@ -229,6 +228,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime/tests/System.IO.FileSystem.Primitives.Tests/System.IO.FileSystem.Primitives.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="('$(TargetOS)' == 'android' or '$(TargetsLinuxBionic)' == 'true') and '$(TargetArchitecture)' == 'x64' and '$(RunDisabledAndroidTests)' != 'true'">
@@ -242,7 +242,7 @@
   <ItemGroup Condition="('$(TargetOS)' == 'android' or '$(TargetsLinuxBionic)' == 'true') and '$(TargetArchitecture)' == 'x86' and '$(RunDisabledAndroidTests)' != 'true'">
     <!-- Crashes only on x86 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\tests\Microsoft.Extensions.Primitives.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Extensions\tests\System.Runtime.Extensions.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Extensions.Tests\System.Runtime.Extensions.Tests.csproj" />
 
     <!-- Out of memory https://github.com/dotnet/runtime/issues/62547 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography\tests\System.Security.Cryptography.Tests.csproj" />
@@ -261,8 +261,8 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj" />
     <!-- https://github.com/dotnet/runtime/issues/93852 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection/tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection/tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime/tests/System.Reflection.Tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime/tests/System.Reflection.Tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj" />
 
     <!-- Has deps that JIT, need re-done in order to pass -->
@@ -274,7 +274,7 @@
     -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection/tests/System.Reflection.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj" />
 
     <!--
@@ -361,7 +361,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Composition\tests\System.ComponentModel.Composition.Tests.csproj" />
 
     <!-- Mono-Browser ignores runtimeconfig.template.json (e.g. for this it has "System.Globalization.EnforceJapaneseEraYearRanges": true) -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Calendars.Tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj" />
 
     <!-- This OuterLoop test requires browser UI, but the Helix agents are headless -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.WebSockets.Client\tests\wasm\System.Net.WebSockets.Client.Wasm.Tests.csproj" />
@@ -394,12 +394,12 @@
 
   <ItemGroup Condition="('$(TargetOS)' != 'browser' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true') or ('$(TargetOS)' == 'browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true') or ('$(TargetOS)' == 'ios' and '$(BuildTestsOnHelix)' == 'true')">
     <!-- Issue: https://github.com/dotnet/runtime/issues/50724 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.EventSource\tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\System.Diagnostics.DiagnosticSource.Tests.csproj" />
-    <ProjectExclusions Condition="'$(TargetOS)' != 'ios'" Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" Condition="'$(TargetOS)' != 'ios'" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Dynamic.Runtime.Tests\System.Dynamic.Runtime.Tests.csproj" />
 
     <!-- Issue: https://github.com/dotnet/runtime/issues/51708 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Expressions\tests\System.Linq.Expressions.Tests.csproj" />
@@ -426,15 +426,15 @@
                       Condition="'$(TargetOS)' != 'windows'" />
 
     <!-- Not applicable to NativeAOT -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\InvokeEmit\System.Reflection.InvokeEmit.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\InvokeInterpreted\System.Reflection.InvokeInterpreted.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System\Reflection\InvokeEmit\System.Runtime.ReflectionInvokeEmit.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System\Reflection\InvokeInterpreted\System.Runtime.ReflectionInvokeInterpreted.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Loader\tests\DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Loader\tests\RefEmitLoadContext\System.Runtime.Loader.RefEmitLoadContext.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Loader\tests\System.Runtime.Loader.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Reflection.Tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Reflection.Tests\InvokeEmit\System.Reflection.InvokeEmit.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Reflection.Tests\InvokeInterpreted\System.Reflection.InvokeInterpreted.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System\Reflection\InvokeEmit\System.Runtime.ReflectionInvokeEmit.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\ystem\Reflection\InvokeInterpreted\System.Runtime.ReflectionInvokeInterpreted.Tests.csproj" />
 
     <!-- Most of these need tagging as "requires Ref.Emit". Not much interesting things left to run. Low priority. -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.Lightweight\tests\System.Reflection.Emit.Lightweight.Tests.csproj" />
@@ -488,38 +488,38 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Mail\tests\Functional\System.Net.Mail.Functional.Tests.csproj"
                       Condition="'$(TargetOS)' == 'windows'"/>
 
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Http.Json\tests\FunctionalTests\System.Net.Http.Json.Functional.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Parallel\tests\System.Linq.Parallel.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.PerformanceCounter\tests\System.Diagnostics.PerformanceCounter.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Xml\tests\System.Security.Cryptography.Xml.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\tests\Microsoft.VisualBasic.Core.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.CodeDom\tests\System.CodeDom.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Composition\tests\System.ComponentModel.Composition.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Composition.Registration\tests\System.ComponentModel.Composition.Registration.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Composition\tests\System.ComponentModel.Composition.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition.Hosting\tests\System.Composition.Hosting.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition.TypedParts\tests\System.Composition.TypedParts.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Configuration.ConfigurationManager\tests\System.Configuration.ConfigurationManager.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.Common.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.PerformanceCounter\tests\System.Diagnostics.PerformanceCounter.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TraceSource\tests\System.Diagnostics.TraceSource.Config.Tests\System.Diagnostics.TraceSource.Config.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Parallel\tests\System.Linq.Parallel.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Http.Json\tests\FunctionalTests\System.Net.Http.Json.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ObjectModel\tests\System.ObjectModel.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\NlsTests\System.Runtime.Nls.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Formatters\tests\System.Runtime.Serialization.Formatters.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Json\tests\System.Runtime.Serialization.Json.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Json\tests\ReflectionOnly\System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Json\tests\System.Runtime.Serialization.Json.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Schema\tests\System.Runtime.Serialization.Schema.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\System.Runtime.Serialization.Xml.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\ReflectionOnly\System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\System.Runtime.Serialization.Xml.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Dynamic.Runtime.Tests\System.Dynamic.Runtime.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\NlsTests\System.Runtime.Nls.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Xml\tests\System.Security.Cryptography.Xml.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -533,36 +533,35 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SmokeTestProject Condition="'$(UseNativeAOTRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />
+    <SmokeTestProject Condition="'$(UseNativeAOTRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
     <GrpcTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'wasi'">
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)Microsoft.XmlSerializer.Generator\tests\Microsoft.XmlSerializer.Generator.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.AppContext\tests\System.AppContext.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Buffers\tests\System.Buffers.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Collections.Specialized\tests\System.Collections.Specialized.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.DataSetExtensions.Tests\System.Data.DataSetExtensions.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.IO.Packaging\tests\System.IO.Packaging.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Private.Xml.Linq\tests\Schema\System.Xml.Schema.Extensions.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Json\tests\System.Runtime.Serialization.Json.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Globalization\tests\System.Globalization.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Globalization\tests\Invariant\Invariant.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.IO.Packaging\tests\System.IO.Packaging.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Data.DataSetExtensions\tests\System.Data.DataSetExtensions.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\System.Runtime.Serialization.Xml.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\ReflectionOnly\System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Xml\tests\System.Runtime.Serialization.Xml.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Buffers.Tests\System.Buffers.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\Invariant\Invariant.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\System.Globalization.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestNativeAot)' == 'true'">
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Reflection\tests\System.Reflection.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Intrinsics\tests\System.Runtime.Intrinsics.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.IO.Compression\tests\System.IO.Compression.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.IO.FileSystem\tests\System.IO.FileSystem.Tests.csproj" />
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Threading\tests\System.Threading.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Linq.Expressions\tests\System.Linq.Expressions.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\System.Runtime.InteropServices.UnitTests\System.Runtime.InteropServices.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Intrinsics\tests\System.Runtime.Intrinsics.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\System.IO.FileSystem.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Reflection.Tests\System.Reflection.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Threading\tests\System.Threading.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(MonoWasmBuildVariant)' == 'multithread'">
@@ -631,7 +630,7 @@
 
   <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'ios' and '$(RunAOTCompilation)' == 'true'">
     <!-- Only System.Runtime tests on iOS for now -->
-    <ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
 
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\**\*.Test.csproj"
                       Exclude="@(ProjectExclusions)"