diff --git a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
index 3798dd439..d89bf70f0 100644
--- a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
+++ b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+    <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj
index 299439850..b8caac812 100644
--- a/Demos/Guess/GuessKernel.csproj
+++ b/Demos/Guess/GuessKernel.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+    <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests/BoxingTests/BoxingTests.csproj b/Tests/BoxingTests/BoxingTests.csproj
index bcce699d1..9101fe888 100644
--- a/Tests/BoxingTests/BoxingTests.csproj
+++ b/Tests/BoxingTests/BoxingTests.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj
index 07a119fca..6cc808bf6 100644
--- a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj
+++ b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj
index 2a1a65278..93f48009e 100644
--- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj
index 842ef813e..912e01f4c 100644
--- a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj
+++ b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj
index 1bd63933f..a1c662677 100644
--- a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj
+++ b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj
index 3bfd66080..1004133f7 100644
--- a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj
+++ b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj
index f787d0b99..f38bbe7a6 100644
--- a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj
+++ b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj
index 61f4d1bfd..df857a814 100644
--- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj
+++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj
index d1645495f..36c214239 100644
--- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj
@@ -12,7 +12,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj
index 8877a5eda..983fd4608 100644
--- a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj
+++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj
@@ -11,7 +11,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Common\Cosmos.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj
index 10c59d35f..5d65b9920 100644
--- a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj
+++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj
@@ -11,7 +11,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Common\Cosmos.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
index c480409f4..12b2e5d65 100644
--- a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
+++ b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
@@ -24,7 +24,7 @@
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System_Plugs\Cosmos.System2_Plugs.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2_Plugs\Cosmos.System2_Plugs.csproj" />
         <ProjectReference Include="..\..\source\Kernel\00-CPU\Cosmos.CPU_Asm\Cosmos.CPU_Asm.csproj" />
         <ProjectReference Include="..\..\source\Kernel\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj" />
         <ProjectReference Include="..\..\source\Kernel\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj" />
diff --git a/Tests/GraphicTest/GraphicTest.csproj b/Tests/GraphicTest/GraphicTest.csproj
index 413d9e1cb..5476e9a67 100644
--- a/Tests/GraphicTest/GraphicTest.csproj
+++ b/Tests/GraphicTest/GraphicTest.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj
index 0c7dcc7da..f90b7a606 100644
--- a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj
+++ b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tests/VGACompilerCrash/VGACompilerCrash.csproj b/Tests/VGACompilerCrash/VGACompilerCrash.csproj
index 0bef7468a..7c0a03e40 100644
--- a/Tests/VGACompilerCrash/VGACompilerCrash.csproj
+++ b/Tests/VGACompilerCrash/VGACompilerCrash.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
diff --git a/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj b/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
index 7490bbae3..9bb833159 100644
--- a/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
+++ b/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
-        <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
     </ItemGroup>
 
 </Project>