diff --git a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
index 5bf9756d3..3798dd439 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.System.csproj" />
+    <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj
index 640b6b490..299439850 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.System.csproj" />
+    <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System2.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Demos/GuessG3/GuessBootGen3.Cosmos b/Demos/GuessG3/GuessBootGen3.Cosmos
index 2c68a48a0..9a2d122fd 100644
--- a/Demos/GuessG3/GuessBootGen3.Cosmos
+++ b/Demos/GuessG3/GuessBootGen3.Cosmos
@@ -61,8 +61,8 @@
       <Project>{fc65d765-990d-4f00-b240-8dd17fa91ea9}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\Kernel\Cosmos.HAL\Cosmos.HAL3.csproj">
-      <Name>Cosmos.HAL3</Name>
+    <ProjectReference Include="..\..\source\Kernel\Cosmos.HAL\Cosmos.HAL.csproj">
+      <Name>Cosmos.HAL</Name>
       <Project>{3f8ede0e-61bd-4d01-95f5-4a5a17f6221e}</Project>
       <Private>True</Private>
     </ProjectReference>
diff --git a/Demos/GuessG3/GuessKernelGen3.csproj b/Demos/GuessG3/GuessKernelGen3.csproj
index 2b877a7ab..15f886d98 100644
--- a/Demos/GuessG3/GuessKernelGen3.csproj
+++ b/Demos/GuessG3/GuessKernelGen3.csproj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\source\Kernel\80-System\Cosmos.System\Cosmos.System.csproj" />
     <ProjectReference Include="..\..\source\Kernel\Cosmos.CPU\Cosmos.CPU.csproj" />
-    <ProjectReference Include="..\..\source\Kernel\Cosmos.System\Cosmos.System3.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Kernel.sln b/Kernel.sln
index 77de4342d..2d4592ee0 100644
--- a/Kernel.sln
+++ b/Kernel.sln
@@ -58,7 +58,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel\Cosmos.Platform\Cosmos.Platform.csproj", "{63843265-D889-47D2-883E-595289C99F42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System3", "source\Kernel\Cosmos.System\Cosmos.System3.csproj", "{F8BF6943-B69D-4549-9C16-75146616E19C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel\80-System\Cosmos.System\Cosmos.System.csproj", "{F8BF6943-B69D-4549-9C16-75146616E19C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00 CPU", "00 CPU", "{C5D22A6E-96F8-4F85-9EE4-C1EB8C5E0530}"
 EndProject
@@ -80,7 +80,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "source\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL3", "source\Kernel\Cosmos.HAL\Cosmos.HAL3.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel\Cosmos.HAL\Cosmos.HAL.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{47F9D446-ACD4-489A-AD6D-A46A19247E2F}"
 EndProject
@@ -88,7 +88,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "sour
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{4E9B8F31-AEA0-402D-9B3A-223100F2156D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System3_Plugs", "source\Kernel\Cosmos.System3_Plugs\Cosmos.System3_Plugs.csproj", "{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj", "{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Plugs", "source\Kernel\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj", "{365810FC-AFC2-4130-8A70-EF1F2C3FA5D6}"
 EndProject
diff --git a/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat b/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat
index 3558a7d72..17247c3b8 100644
--- a/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat	
+++ b/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat	
@@ -1,5 +1,5 @@
 cd "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Kernel\"
-copy "C:\source\Cosmos\source\Kernel\Cosmos.System3_Plugs\bin\Debug\netstandard1.5\Cosmos.System3_Plugs.dll"
+copy "C:\source\Cosmos\source\Kernel\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll"
 copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll"
 copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll"
 
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.targets b/source/Cosmos.Build.MSBuild/Cosmos.targets
index 43638301f..7132895d9 100644
--- a/source/Cosmos.Build.MSBuild/Cosmos.targets
+++ b/source/Cosmos.Build.MSBuild/Cosmos.targets
@@ -28,7 +28,7 @@
   <ItemGroup Condition="$(UseGen3Kernel) == 'True'">
     <Reference Include="Cosmos.CPU_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
     <Reference Include="Cosmos.CPU_Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.System3_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.System_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
     <Reference Include="Cosmos.Debug.Kernel.Plugs.Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
     <Reference Remove="System.Core" />
   </ItemGroup>
diff --git a/source/Kernel/Cosmos.System/Boot.cs b/source/Kernel/80-System/Cosmos.System/Boot.cs
similarity index 100%
rename from source/Kernel/Cosmos.System/Boot.cs
rename to source/Kernel/80-System/Cosmos.System/Boot.cs
diff --git a/source/Kernel/Cosmos.System/Cosmos.System3.csproj b/source/Kernel/80-System/Cosmos.System/Cosmos.System.csproj
similarity index 53%
rename from source/Kernel/Cosmos.System/Cosmos.System3.csproj
rename to source/Kernel/80-System/Cosmos.System/Cosmos.System.csproj
index 5f25b0573..3ea75427a 100644
--- a/source/Kernel/Cosmos.System/Cosmos.System3.csproj
+++ b/source/Kernel/80-System/Cosmos.System/Cosmos.System.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.HAL\Cosmos.HAL3.csproj" />
-    <ProjectReference Include="..\Cosmos.Shared\Cosmos.Shared.csproj" />
+    <ProjectReference Include="..\..\Cosmos.HAL\Cosmos.HAL.csproj" />
+    <ProjectReference Include="..\..\Cosmos.Shared\Cosmos.Shared.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/source/Kernel/Cosmos.System/FileSystem.cs b/source/Kernel/80-System/Cosmos.System/FileSystem.cs
similarity index 100%
rename from source/Kernel/Cosmos.System/FileSystem.cs
rename to source/Kernel/80-System/Cosmos.System/FileSystem.cs
diff --git a/source/Kernel/Cosmos.System3_Plugs/Cosmos.System3_Plugs.csproj b/source/Kernel/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj
similarity index 84%
rename from source/Kernel/Cosmos.System3_Plugs/Cosmos.System3_Plugs.csproj
rename to source/Kernel/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj
index 9f0e54205..906ed09a9 100644
--- a/source/Kernel/Cosmos.System3_Plugs/Cosmos.System3_Plugs.csproj
+++ b/source/Kernel/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj
@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
+      <ProjectReference Include="..\..\..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/source/Kernel/Cosmos.System3_Plugs/Cosmos.snk b/source/Kernel/80-System/Cosmos.System_Plugs/Cosmos.snk
similarity index 100%
rename from source/Kernel/Cosmos.System3_Plugs/Cosmos.snk
rename to source/Kernel/80-System/Cosmos.System_Plugs/Cosmos.snk
diff --git a/source/Kernel/Cosmos.System3_Plugs/System/ConsoleImpl.cs b/source/Kernel/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs
similarity index 100%
rename from source/Kernel/Cosmos.System3_Plugs/System/ConsoleImpl.cs
rename to source/Kernel/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs
diff --git a/source/Kernel/Cosmos.System3_Plugs/System/EnvironmentImpl.cs b/source/Kernel/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs
similarity index 100%
rename from source/Kernel/Cosmos.System3_Plugs/System/EnvironmentImpl.cs
rename to source/Kernel/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs
diff --git a/source/Kernel/ConsoleApp1/Test.csproj b/source/Kernel/ConsoleApp1/Test.csproj
index 93e3e04aa..88af7c9af 100644
--- a/source/Kernel/ConsoleApp1/Test.csproj
+++ b/source/Kernel/ConsoleApp1/Test.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\80-System\Cosmos.System\Cosmos.System.csproj" />
     <ProjectReference Include="..\Cosmos.Shared\Cosmos.Shared.csproj" />
-    <ProjectReference Include="..\Cosmos.System\Cosmos.System3.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/source/Kernel/Cosmos.HAL/Cosmos.HAL3.csproj b/source/Kernel/Cosmos.HAL/Cosmos.HAL.csproj
similarity index 100%
rename from source/Kernel/Cosmos.HAL/Cosmos.HAL3.csproj
rename to source/Kernel/Cosmos.HAL/Cosmos.HAL.csproj
diff --git a/source/Kernel/Cosmos.Platform/Cosmos.Platform.csproj b/source/Kernel/Cosmos.Platform/Cosmos.Platform.csproj
index c4c00804a..3e5548ba2 100644
--- a/source/Kernel/Cosmos.Platform/Cosmos.Platform.csproj
+++ b/source/Kernel/Cosmos.Platform/Cosmos.Platform.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.CPU\Cosmos.CPU.csproj" />
-    <ProjectReference Include="..\Cosmos.HAL\Cosmos.HAL3.csproj" />
+    <ProjectReference Include="..\Cosmos.HAL\Cosmos.HAL.csproj" />
     <ProjectReference Include="..\Cosmos.Shared\Cosmos.Shared.csproj" />
   </ItemGroup>