diff --git a/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj b/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj
deleted file mode 100644
index b684e5bc2..000000000
--- a/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netcoreapp2.0</TargetFramework>
-        <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-        <NoWarn>CA2242;$(NoWarn)</NoWarn>
-        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\source\Cosmos.System2\Cosmos.System2.csproj" />
-        <ProjectReference Include="..\Tests\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
-        <ProjectReference Include="..\Tests\Kernels\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.csproj" />
-    </ItemGroup>
-
-
-</Project>
diff --git a/Test.sln b/Test.sln
index e5ee7bb3a..4dd53a51d 100644
--- a/Test.sln
+++ b/Test.sln
@@ -162,7 +162,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System.Tests", "Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Kernel.Tests.DiskManager", "Tests\Kernels\Cosmos.Kernel.Tests.DiskManager\Cosmos.Kernel.Tests.DiskManager.csproj", "{BB6A5306-4C7A-4973-A48E-9FE3E683EAEC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Compiler.Tests.BclSystem", "Cosmos.Compiler.Tests.Bcl.System\Cosmos.Compiler.Tests.BclSystem.csproj", "{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.BclSystem", "Tests\Kernels\Cosmos.Compiler.Tests.Bcl.System\Cosmos.Compiler.Tests.BclSystem.csproj", "{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -621,14 +621,14 @@ Global
 		{BB6A5306-4C7A-4973-A48E-9FE3E683EAEC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB6A5306-4C7A-4973-A48E-9FE3E683EAEC}.Release|x86.ActiveCfg = Release|Any CPU
 		{BB6A5306-4C7A-4973-A48E-9FE3E683EAEC}.Release|x86.Build.0 = Release|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Debug|x86.Build.0 = Debug|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A}.Release|x86.Build.0 = Release|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Debug|x86.Build.0 = Debug|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Release|x86.ActiveCfg = Release|Any CPU
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -706,7 +706,7 @@ Global
 		{99E24E61-0743-47FF-AB0A-55A36C5E184C} = {52D81759-C7CC-427F-8C96-89CA10C914B5}
 		{970C5E07-5D09-4882-949C-A8E876B22732} = {52D81759-C7CC-427F-8C96-89CA10C914B5}
 		{BB6A5306-4C7A-4973-A48E-9FE3E683EAEC} = {29EEC029-6A2B-478A-B6E5-D63A91388ABA}
-		{FE476473-8E1B-4D50-9ABB-F5DCA907FF6A} = {ECEA7778-E786-4317-90B9-A2D4427CB91C}
+		{30D9FA9C-0B4D-40FF-8903-6B9E9C825729} = {ECEA7778-E786-4317-90B9-A2D4427CB91C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4418C803-277E-448F-A0A0-52788FA215AD}
diff --git a/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj b/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj
index 5e0414960..a2fb37690 100644
--- a/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj
+++ b/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj
@@ -6,9 +6,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Cosmos.Compiler.Tests.Bcl.System\Cosmos.Compiler.Tests.BclSystem.csproj">
-          <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-        </ProjectReference>
         <ProjectReference Include="..\..\source\TheRingMaster\TheRingMaster.csproj" ReferenceOutputAssembly="False" />
         <ProjectReference Include="..\..\Tools\NASM\NASM.csproj" ReferenceOutputAssembly="False" />
         <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj" />
@@ -21,6 +18,7 @@
         <ProjectReference Include="..\Kernels\BoxingTests\BoxingTests.csproj" />
         <ProjectReference Include="..\Kernels\ConsoleTest\ConsoleTest.csproj" />
         <ProjectReference Include="..\Kernels\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.csproj" />
+        <ProjectReference Include="..\Kernels\Cosmos.Compiler.Tests.Bcl.System\Cosmos.Compiler.Tests.BclSystem.csproj" />
         <ProjectReference Include="..\Kernels\Cosmos.Compiler.Tests.Encryption\Cosmos.Compiler.Tests.Encryption.csproj" />
         <ProjectReference Include="..\Kernels\Cosmos.Compiler.Tests.Exceptions\Cosmos.Compiler.Tests.Exceptions.csproj" />
         <ProjectReference Include="..\Kernels\Cosmos.Compiler.Tests.Interfaces\Cosmos.Compiler.Tests.Interfaces.csproj" />
diff --git a/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs
index 19bd1d091..34eac84ed 100644
--- a/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs
+++ b/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs
@@ -14,8 +14,8 @@ namespace Cosmos.TestRunner.Full
         {
             get
             {
-                //yield return RunTargetEnum.Bochs;
-                yield return RunTargetEnum.VMware;
+                yield return RunTargetEnum.Bochs;
+                //yield return RunTargetEnum.VMware;
                 //yield return RunTargetEnum.HyperV;
             }
         }
diff --git a/Tests/Cosmos.TestRunner.Full/TestKernelSets.cs b/Tests/Cosmos.TestRunner.Full/TestKernelSets.cs
index 02349cd43..c03b31ceb 100644
--- a/Tests/Cosmos.TestRunner.Full/TestKernelSets.cs
+++ b/Tests/Cosmos.TestRunner.Full/TestKernelSets.cs
@@ -19,7 +19,7 @@ namespace Cosmos.TestRunner.Full
             yield return typeof(Cosmos.Compiler.Tests.TypeSystem.Kernel);
             yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel);
             yield return typeof(Cosmos.Compiler.Tests.Bcl.System.Kernel);
-            yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel);
+            //yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel);
             yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel);
             yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel);
             yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel);
diff --git a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj
new file mode 100644
index 000000000..f9b905215
--- /dev/null
+++ b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Cosmos.Compiler.Tests.BclSystem.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.0</TargetFramework>
+        <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+        <NoWarn>CA2242;$(NoWarn)</NoWarn>
+        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
+        <ProjectReference Include="..\..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
+        <ProjectReference Include="..\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.csproj" />
+    </ItemGroup>
+
+
+</Project>
diff --git a/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/ArrayTests.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ArrayTests.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/ArrayTests.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ArrayTests.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/BooleanTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/BooleanTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/BooleanTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/BooleanTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/ByteTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ByteTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/ByteTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ByteTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/CharTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/CharTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/CharTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/CharTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/ConvertTests.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ConvertTests.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/ConvertTests.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ConvertTests.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/DateTimeTests.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DateTimeTests.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/DateTimeTests.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DateTimeTests.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/DecimalTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DecimalTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/DecimalTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DecimalTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/DoubleTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DoubleTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/DoubleTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/DoubleTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/Int16Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int16Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/Int16Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int16Test.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/Int32Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int32Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/Int32Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int32Test.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/Int64Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int64Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/Int64Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/Int64Test.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/MathTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/MathTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/MathTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/MathTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/ObjectTests.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ObjectTests.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/ObjectTests.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/ObjectTests.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/SByteTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/SByteTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/SByteTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/SByteTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/SingleTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/SingleTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/SingleTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/SingleTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/StringTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/StringTest.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/StringTest.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/StringTest.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/TimeSpanTests.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/TimeSpanTests.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/TimeSpanTests.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/TimeSpanTests.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/UInt16Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt16Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/UInt16Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt16Test.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/UInt32Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt32Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/UInt32Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt32Test.cs
diff --git a/Cosmos.Compiler.Tests.Bcl.System/System/UInt64Test.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt64Test.cs
similarity index 100%
rename from Cosmos.Compiler.Tests.Bcl.System/System/UInt64Test.cs
rename to Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/UInt64Test.cs