diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss
index dcf624c1a..906325063 100644
--- a/Setup/Cosmos.iss
+++ b/Setup/Cosmos.iss
@@ -176,7 +176,7 @@ Source: ".\Build\VSIP\Cosmos.Common.Extensions.*"; DestDir: "{app}\Kernel"; Flag
 Source: ".\source2\Cosmos.ico"; DestDir: "{app}"; Flags: ignoreversion uninsremovereadonly
 
 ; XSharp Source
-Source: ".\source2\Compiler\Cosmos.Compiler.DebugStub\*.xs"; DestDir: "{app}\XSharp\DebugStub\"; Flags: ignoreversion uninsremovereadonly
+Source: ".\source\Cosmos.Debug.DebugStub\*.xs"; DestDir: "{app}\XSharp\DebugStub\"; Flags: ignoreversion uninsremovereadonly
 
 ; System.Data.SQLite library
 Source: ".\Resources\Dependencies\Dapper\*.*"; DestDir: "{app}\Build\VSIP"; Flags: ignoreversion uninsremovereadonly
diff --git a/Users/Matthijs/DebugCompiler/DebugCompiler.csproj b/Users/Matthijs/DebugCompiler/DebugCompiler.csproj
index e4ed4d913..9feb91242 100644
--- a/Users/Matthijs/DebugCompiler/DebugCompiler.csproj
+++ b/Users/Matthijs/DebugCompiler/DebugCompiler.csproj
@@ -63,7 +63,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\source2\Build\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj">
       <Project>{BC6AE974-1F18-4A19-A956-5062E4D3FD53}</Project>
       <Name>Cosmos.Build.MSBuild</Name>
     </ProjectReference>
diff --git a/source/Build.sln b/source/Build.sln
index a248f3771..abbbf6e19 100644
--- a/source/Build.sln
+++ b/source/Build.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D95021E1-A2C9-4829-819E-ED433AF13162}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Common", "..\source2\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{0462E82B-8C29-41A9-8265-9C89038ADB29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Common", "Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{0462E82B-8C29-41A9-8265-9C89038ADB29}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.MSBuild", "..\source2\Build\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj", "{BC6AE974-1F18-4A19-A956-5062E4D3FD53}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.MSBuild", "Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj", "{BC6AE974-1F18-4A19-A956-5062E4D3FD53}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{FF5BAFDE-AE9D-438D-935A-86B33EE0A758}"
 EndProject
@@ -22,13 +22,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visual Studio", "Visual Stu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Package", "..\source2\VSIP\Cosmos.VS.Package\Cosmos.VS.Package.csproj", "{61535AF6-4A1E-4691-B2BC-039851EF4850}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU", "..\source2\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU", "Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Plugs", "..\source2\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Plugs", "Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.GDB", "..\source2\Debug\Cosmos.Debug.GDB\Cosmos.Debug.GDB.csproj", "{3370FC04-B669-46A4-A4AA-A89540318F8D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.DebugStub", "..\source2\Compiler\Cosmos.Compiler.DebugStub\Cosmos.Debug.DebugStub.csproj", "{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.DebugStub", "Cosmos.Debug.DebugStub\Cosmos.Debug.DebugStub.csproj", "{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Assembler", "..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj", "{1116130E-28E0-428A-A597-F4B3B676C0CA}"
 EndProject
@@ -104,15 +104,15 @@ Global
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs04
 		SccLocalPath0 = .
-		SccProjectUniqueName1 = ..\\source2\\Build\\Cosmos.Build.Common\\Cosmos.Build.Common.csproj
+		SccProjectUniqueName1 = Cosmos.Build.Common\\Cosmos.Build.Common.csproj
 		SccProjectTopLevelParentUniqueName1 = Build.sln
-		SccProjectName1 = ../source2/Build/Cosmos.Build.Common
+		SccProjectName1 = Cosmos.Build.Common
 		SccAuxPath1 = https://tfs.codeplex.com/tfs/TFS04
-		SccLocalPath1 = ..\\source2\\Build\\Cosmos.Build.Common
-		SccProjectUniqueName2 = ..\\source2\\Build\\Cosmos.Build.MSBuild\\Cosmos.Build.MSBuild.csproj
+		SccLocalPath1 = Cosmos.Build.Common
+		SccProjectUniqueName2 = Cosmos.Build.MSBuild\\Cosmos.Build.MSBuild.csproj
 		SccProjectTopLevelParentUniqueName2 = Build.sln
-		SccProjectName2 = ../source2/Build/Cosmos.Build.MSBuild
-		SccLocalPath2 = ..\\source2\\Build\\Cosmos.Build.MSBuild
+		SccProjectName2 = Cosmos.Build.MSBuild
+		SccLocalPath2 = Cosmos.Build.MSBuild
 		SccProjectUniqueName3 = ..\\source2\\Debug\\Cosmos.Debug.Common\\Cosmos.Debug.Common.csproj
 		SccProjectTopLevelParentUniqueName3 = Build.sln
 		SccProjectName3 = ../source2/Debug/Cosmos.Debug.Common
@@ -125,14 +125,14 @@ Global
 		SccProjectTopLevelParentUniqueName5 = Build.sln
 		SccProjectName5 = ../source2/VSIP/Cosmos.VS.Package
 		SccLocalPath5 = ..\\source2\\VSIP\\Cosmos.VS.Package
-		SccProjectUniqueName6 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU\\Cosmos.IL2CPU.csproj
+		SccProjectUniqueName6 = Cosmos.IL2CPU\\Cosmos.IL2CPU.csproj
 		SccProjectTopLevelParentUniqueName6 = Build.sln
-		SccProjectName6 = ../source2/IL2CPU/Cosmos.IL2CPU
-		SccLocalPath6 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU
-		SccProjectUniqueName7 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
+		SccProjectName6 = Cosmos.IL2CPU
+		SccLocalPath6 = Cosmos.IL2CPU
+		SccProjectUniqueName7 = Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
 		SccProjectTopLevelParentUniqueName7 = Build.sln
-		SccProjectName7 = ../source2/IL2CPU/Cosmos.IL2CPU.Plugs
-		SccLocalPath7 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs
+		SccProjectName7 = Cosmos.IL2CPU.Plugs
+		SccLocalPath7 = Cosmos.IL2CPU.Plugs
 		SccProjectUniqueName8 = ..\\source2\\Debug\\Cosmos.Debug.GDB\\Cosmos.Debug.GDB.csproj
 		SccProjectTopLevelParentUniqueName8 = Build.sln
 		SccProjectName8 = ../source2/Debug/Cosmos.Debug.GDB
@@ -177,10 +177,10 @@ Global
 		SccProjectTopLevelParentUniqueName18 = Build.sln
 		SccProjectName18 = ../source2/VSIP/Cosmos.VS.Windows
 		SccLocalPath18 = ..\\source2\\VSIP\\Cosmos.VS.Windows
-		SccProjectUniqueName19 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Debug.DebugStub.csproj
+		SccProjectUniqueName19 = Cosmos.Debug.DebugStub\\Cosmos.Debug.DebugStub.csproj
 		SccProjectTopLevelParentUniqueName19 = Build.sln
-		SccProjectName19 = ../source2/Compiler/Cosmos.Compiler.DebugStub
-		SccLocalPath19 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
+		SccProjectName19 = Cosmos.Debug.DebugStub
+		SccLocalPath19 = Cosmos.Debug.DebugStub
 		SccProjectUniqueName20 = ..\\source2\\Cosmos.Assembler\\Cosmos.Assembler.csproj
 		SccProjectTopLevelParentUniqueName20 = Build.sln
 		SccProjectName20 = ../source2/Cosmos.Assembler
diff --git a/source2/Build/Cosmos.Build.Common/BuildProperties.cs b/source/Cosmos.Build.Common/BuildProperties.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/BuildProperties.cs
rename to source/Cosmos.Build.Common/BuildProperties.cs
diff --git a/source2/Build/Cosmos.Build.Common/Cosmos.Build.Common.csproj b/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj
similarity index 94%
rename from source2/Build/Cosmos.Build.Common/Cosmos.Build.Common.csproj
rename to source/Cosmos.Build.Common/Cosmos.Build.Common.csproj
index b492e6fc6..0f8794d56 100644
--- a/source2/Build/Cosmos.Build.Common/Cosmos.Build.Common.csproj
+++ b/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>Cosmos.Build.Common</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>%24/IL2CPU/source2/Build/Cosmos.Build.Common</SccProjectName>
+    <SccProjectName>%24/IL2CPU/source/Cosmos.Build.Common</SccProjectName>
     <SccLocalPath>.</SccLocalPath>
     <SccAuxPath>https://tfs.codeplex.com/tfs/TFS04</SccAuxPath>
     <SccProvider>{4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}</SccProvider>
@@ -63,7 +63,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mosa.Utility.IsoImage">
-      <HintPath>..\..\..\Resources\Dependencies\Mosa\Mosa.Utility.IsoImage.dll</HintPath>
+      <HintPath>..\..\Resources\Dependencies\Mosa\Mosa.Utility.IsoImage.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/source2/Build/Cosmos.Build.Common/Cosmos.snk b/source/Cosmos.Build.Common/Cosmos.snk
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/Cosmos.snk
rename to source/Cosmos.Build.Common/Cosmos.snk
diff --git a/source2/Build/Cosmos.Build.Common/CosmosPaths.cs b/source/Cosmos.Build.Common/CosmosPaths.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/CosmosPaths.cs
rename to source/Cosmos.Build.Common/CosmosPaths.cs
diff --git a/source2/Build/Cosmos.Build.Common/EnumValue.cs b/source/Cosmos.Build.Common/EnumValue.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/EnumValue.cs
rename to source/Cosmos.Build.Common/EnumValue.cs
diff --git a/source2/Build/Cosmos.Build.Common/Enums.cs b/source/Cosmos.Build.Common/Enums.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/Enums.cs
rename to source/Cosmos.Build.Common/Enums.cs
diff --git a/source2/Build/Cosmos.Build.Common/ExtensionMethods.cs b/source/Cosmos.Build.Common/ExtensionMethods.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/ExtensionMethods.cs
rename to source/Cosmos.Build.Common/ExtensionMethods.cs
diff --git a/source2/Build/Cosmos.Build.Common/IsoMaker.cs b/source/Cosmos.Build.Common/IsoMaker.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/IsoMaker.cs
rename to source/Cosmos.Build.Common/IsoMaker.cs
diff --git a/source2/Build/Cosmos.Build.Common/Properties/AssemblyInfo.cs b/source/Cosmos.Build.Common/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/Properties/AssemblyInfo.cs
rename to source/Cosmos.Build.Common/Properties/AssemblyInfo.cs
diff --git a/source2/Build/Cosmos.Build.Common/PropertiesBase.cs b/source/Cosmos.Build.Common/PropertiesBase.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/PropertiesBase.cs
rename to source/Cosmos.Build.Common/PropertiesBase.cs
diff --git a/source2/Build/Cosmos.Build.Common/UsbMaker.cs b/source/Cosmos.Build.Common/UsbMaker.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Common/UsbMaker.cs
rename to source/Cosmos.Build.Common/UsbMaker.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/App.config b/source/Cosmos.Build.MSBuild/App.config
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/App.config
rename to source/Cosmos.Build.MSBuild/App.config
diff --git a/source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs b/source/Cosmos.Build.MSBuild/BaseToolTask.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs
rename to source/Cosmos.Build.MSBuild/BaseToolTask.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
similarity index 89%
rename from source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
rename to source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
index 4eed0df6c..8be0edd75 100644
--- a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
+++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -73,7 +73,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.87.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\source\packages\System.Data.SQLite.x86.1.0.87.0\lib\net40\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.x86.1.0.87.0\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -90,19 +90,19 @@
     <Compile Include="TestClass.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Compiler\Cosmos.Compiler.DebugStub\Cosmos.Debug.DebugStub.csproj">
+    <ProjectReference Include="..\Cosmos.Debug.DebugStub\Cosmos.Debug.DebugStub.csproj">
       <Project>{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}</Project>
       <Name>Cosmos.Debug.DebugStub</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
+    <ProjectReference Include="..\..\source2\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
       <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
+    <ProjectReference Include="..\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
       <Project>{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}</Project>
       <Name>Cosmos.IL2CPU</Name>
     </ProjectReference>
diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj.vspscc b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj.vspscc
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj.vspscc
rename to source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj.vspscc
diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.snk b/source/Cosmos.Build.MSBuild/Cosmos.snk
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/Cosmos.snk
rename to source/Cosmos.Build.MSBuild/Cosmos.snk
diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.targets b/source/Cosmos.Build.MSBuild/Cosmos.targets
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/Cosmos.targets
rename to source/Cosmos.Build.MSBuild/Cosmos.targets
diff --git a/source2/Build/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs b/source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
rename to source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/IL2CPU.cs b/source/Cosmos.Build.MSBuild/IL2CPU.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/IL2CPU.cs
rename to source/Cosmos.Build.MSBuild/IL2CPU.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/IL2CPUTask.cs b/source/Cosmos.Build.MSBuild/IL2CPUTask.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/IL2CPUTask.cs
rename to source/Cosmos.Build.MSBuild/IL2CPUTask.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/Ld.cs b/source/Cosmos.Build.MSBuild/Ld.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/Ld.cs
rename to source/Cosmos.Build.MSBuild/Ld.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/MakeISO.cs b/source/Cosmos.Build.MSBuild/MakeISO.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/MakeISO.cs
rename to source/Cosmos.Build.MSBuild/MakeISO.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/NAsm.cs b/source/Cosmos.Build.MSBuild/NAsm.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/NAsm.cs
rename to source/Cosmos.Build.MSBuild/NAsm.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/Properties/AssemblyInfo.cs b/source/Cosmos.Build.MSBuild/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/Properties/AssemblyInfo.cs
rename to source/Cosmos.Build.MSBuild/Properties/AssemblyInfo.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/ReadMe.html b/source/Cosmos.Build.MSBuild/ReadMe.html
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/ReadMe.html
rename to source/Cosmos.Build.MSBuild/ReadMe.html
diff --git a/source2/Build/Cosmos.Build.MSBuild/ReadNAsmMapToDebugInfo.cs b/source/Cosmos.Build.MSBuild/ReadNAsmMapToDebugInfo.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/ReadNAsmMapToDebugInfo.cs
rename to source/Cosmos.Build.MSBuild/ReadNAsmMapToDebugInfo.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/TestClass.cs b/source/Cosmos.Build.MSBuild/TestClass.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/TestClass.cs
rename to source/Cosmos.Build.MSBuild/TestClass.cs
diff --git a/source2/Build/Cosmos.Build.MSBuild/packages.config b/source/Cosmos.Build.MSBuild/packages.config
similarity index 100%
rename from source2/Build/Cosmos.Build.MSBuild/packages.config
rename to source/Cosmos.Build.MSBuild/packages.config
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.asm b/source/Cosmos.Debug.DebugStub/AsmBreak.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.asm
rename to source/Cosmos.Debug.DebugStub/AsmBreak.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.xs b/source/Cosmos.Debug.DebugStub/AsmBreak.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.xs
rename to source/Cosmos.Debug.DebugStub/AsmBreak.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdMisc.asm b/source/Cosmos.Debug.DebugStub/CmdMisc.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdMisc.asm
rename to source/Cosmos.Debug.DebugStub/CmdMisc.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdMisc.xs b/source/Cosmos.Debug.DebugStub/CmdMisc.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdMisc.xs
rename to source/Cosmos.Debug.DebugStub/CmdMisc.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm b/source/Cosmos.Debug.DebugStub/CmdProcess.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm
rename to source/Cosmos.Debug.DebugStub/CmdProcess.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs b/source/Cosmos.Debug.DebugStub/CmdProcess.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs
rename to source/Cosmos.Debug.DebugStub/CmdProcess.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.asm b/source/Cosmos.Debug.DebugStub/CmdSend.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.asm
rename to source/Cosmos.Debug.DebugStub/CmdSend.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs b/source/Cosmos.Debug.DebugStub/CmdSend.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs
rename to source/Cosmos.Debug.DebugStub/CmdSend.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Consts.asm b/source/Cosmos.Debug.DebugStub/Consts.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Consts.asm
rename to source/Cosmos.Debug.DebugStub/Consts.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Consts.xs b/source/Cosmos.Debug.DebugStub/Consts.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Consts.xs
rename to source/Cosmos.Debug.DebugStub/Consts.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj b/source/Cosmos.Debug.DebugStub/Cosmos.Debug.DebugStub.csproj
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj
rename to source/Cosmos.Debug.DebugStub/Cosmos.Debug.DebugStub.csproj
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj.vspscc b/source/Cosmos.Debug.DebugStub/Cosmos.Debug.DebugStub.csproj.vspscc
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj.vspscc
rename to source/Cosmos.Debug.DebugStub/Cosmos.Debug.DebugStub.csproj.vspscc
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.snk b/source/Cosmos.Debug.DebugStub/Cosmos.snk
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.snk
rename to source/Cosmos.Debug.DebugStub/Cosmos.snk
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm b/source/Cosmos.Debug.DebugStub/DebugStub.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm
rename to source/Cosmos.Debug.DebugStub/DebugStub.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs b/source/Cosmos.Debug.DebugStub/DebugStub.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs
rename to source/Cosmos.Debug.DebugStub/DebugStub.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Init.asm b/source/Cosmos.Debug.DebugStub/Init.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Init.asm
rename to source/Cosmos.Debug.DebugStub/Init.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Init.xs b/source/Cosmos.Debug.DebugStub/Init.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Init.xs
rename to source/Cosmos.Debug.DebugStub/Init.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Properties/AssemblyInfo.cs b/source/Cosmos.Debug.DebugStub/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Properties/AssemblyInfo.cs
rename to source/Cosmos.Debug.DebugStub/Properties/AssemblyInfo.cs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Screen.asm b/source/Cosmos.Debug.DebugStub/Screen.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Screen.asm
rename to source/Cosmos.Debug.DebugStub/Screen.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Screen.xs b/source/Cosmos.Debug.DebugStub/Screen.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Screen.xs
rename to source/Cosmos.Debug.DebugStub/Screen.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Serial.asm b/source/Cosmos.Debug.DebugStub/Serial.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Serial.asm
rename to source/Cosmos.Debug.DebugStub/Serial.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Serial.xs b/source/Cosmos.Debug.DebugStub/Serial.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Serial.xs
rename to source/Cosmos.Debug.DebugStub/Serial.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/TracerEntry.asm b/source/Cosmos.Debug.DebugStub/TracerEntry.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/TracerEntry.asm
rename to source/Cosmos.Debug.DebugStub/TracerEntry.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/TracerEntry.xs b/source/Cosmos.Debug.DebugStub/TracerEntry.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/TracerEntry.xs
rename to source/Cosmos.Debug.DebugStub/TracerEntry.xs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Utilities.asm b/source/Cosmos.Debug.DebugStub/Utilities.asm
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Utilities.asm
rename to source/Cosmos.Debug.DebugStub/Utilities.asm
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Utilities.xs b/source/Cosmos.Debug.DebugStub/Utilities.xs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.DebugStub/Utilities.xs
rename to source/Cosmos.Debug.DebugStub/Utilities.xs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs b/source/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs
rename to source/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj b/source/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
similarity index 95%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
rename to source/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
index f539470e5..0afd18a93 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
+++ b/source/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
@@ -85,7 +85,7 @@
     <Content Include="ReadMe.html" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj.vspscc b/source/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj.vspscc
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj.vspscc
rename to source/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj.vspscc
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/DebugStubAttribute.cs b/source/Cosmos.IL2CPU.Plugs/DebugStubAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/DebugStubAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/DebugStubAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs b/source/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/FieldTypeAttribute.cs b/source/Cosmos.IL2CPU.Plugs/FieldTypeAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/FieldTypeAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/FieldTypeAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/InlineAttribute.cs b/source/Cosmos.IL2CPU.Plugs/InlineAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/InlineAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/InlineAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/Key.snk b/source/Cosmos.IL2CPU.Plugs/Key.snk
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/Key.snk
rename to source/Cosmos.IL2CPU.Plugs/Key.snk
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugAttribute.cs b/source/Cosmos.IL2CPU.Plugs/PlugAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/PlugAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs b/source/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs b/source/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs
rename to source/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs b/source/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs
rename to source/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Plugs/ReadMe.html b/source/Cosmos.IL2CPU.Plugs/ReadMe.html
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Plugs/ReadMe.html
rename to source/Cosmos.IL2CPU.Plugs/ReadMe.html
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs b/source/Cosmos.IL2CPU.Profiler/Assembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs
rename to source/Cosmos.IL2CPU.Profiler/Assembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj b/source/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
similarity index 84%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
rename to source/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
index a597a25a5..e6b292d06 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
+++ b/source/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
@@ -69,31 +69,31 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
+    <ProjectReference Include="..\..\source2\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
       <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Kernel\Debug\Cosmos.Debug.Kernel.Plugs\Cosmos.Debug.Kernel.Plugs.csproj">
+    <ProjectReference Include="..\..\source2\Kernel\Debug\Cosmos.Debug.Kernel.Plugs\Cosmos.Debug.Kernel.Plugs.csproj">
       <Project>{B97A2956-C363-47F2-A6AA-B4FCCFF4D315}</Project>
       <Name>Cosmos.Debug.Kernel.Plugs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Kernel\System\Cosmos.System.Plugs.System\Cosmos.System.Plugs.System.csproj">
+    <ProjectReference Include="..\..\source2\Kernel\System\Cosmos.System.Plugs.System\Cosmos.System.Plugs.System.csproj">
       <Project>{7C64B97F-516D-4A6D-B9E1-3FE48F561409}</Project>
       <Name>Cosmos.System.Plugs.System</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Kernel\System\Cosmos.System\Cosmos.System.csproj">
+    <ProjectReference Include="..\..\source2\Kernel\System\Cosmos.System\Cosmos.System.csproj">
       <Project>{DA50B9B2-0E95-4F0D-A3C8-79FC549301B5}</Project>
       <Name>Cosmos.System</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Kernel\System\Hardware\Core\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
+    <ProjectReference Include="..\..\source2\Kernel\System\Hardware\Core\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
       <Project>{D9A87AAD-FCC9-4517-B31D-E904DAD00784}</Project>
       <Name>Cosmos.Core.Plugs</Name>
     </ProjectReference>
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj.vspscc b/source/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj.vspscc
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj.vspscc
rename to source/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj.vspscc
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/FakeKernel.cs b/source/Cosmos.IL2CPU.Profiler/FakeKernel.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/FakeKernel.cs
rename to source/Cosmos.IL2CPU.Profiler/FakeKernel.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/ILOp.cs b/source/Cosmos.IL2CPU.Profiler/ILOp.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/ILOp.cs
rename to source/Cosmos.IL2CPU.Profiler/ILOp.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Program.cs b/source/Cosmos.IL2CPU.Profiler/Program.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/Program.cs
rename to source/Cosmos.IL2CPU.Profiler/Program.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Properties/AssemblyInfo.cs b/source/Cosmos.IL2CPU.Profiler/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/Properties/AssemblyInfo.cs
rename to source/Cosmos.IL2CPU.Profiler/Properties/AssemblyInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/app.config b/source/Cosmos.IL2CPU.Profiler/app.config
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU.Profiler/app.config
rename to source/Cosmos.IL2CPU.Profiler/app.config
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/.editorconfig b/source/Cosmos.IL2CPU/.editorconfig
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/.editorconfig
rename to source/Cosmos.IL2CPU/.editorconfig
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/App.config b/source/Cosmos.IL2CPU/App.config
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/App.config
rename to source/Cosmos.IL2CPU/App.config
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/AppAssembler.cs b/source/Cosmos.IL2CPU/AppAssembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/AppAssembler.cs
rename to source/Cosmos.IL2CPU/AppAssembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
similarity index 94%
rename from source2/IL2CPU/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
rename to source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
index bd7b1f01d..ceb75ab18 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
+++ b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
@@ -66,10 +66,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Cecil">
-      <HintPath>..\..\..\Resources\Dependencies\cecil\Mono.Cecil.dll</HintPath>
+      <HintPath>..\..\Resources\Dependencies\cecil\Mono.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>..\..\..\Resources\Dependencies\cecil\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>..\..\Resources\Dependencies\cecil\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -381,27 +381,27 @@
     <Content Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\source\XSharp.Nasm\XSharp.Nasm.csproj">
+    <ProjectReference Include="..\XSharp.Nasm\XSharp.Nasm.csproj">
       <Project>{841A734E-9606-4AAB-9C4A-74E7E303FF5D}</Project>
       <Name>XSharp.Nasm</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\source\XSharp.Compiler\XSharp.Compiler.csproj">
+    <ProjectReference Include="..\XSharp.Compiler\XSharp.Compiler.csproj">
       <Project>{A281A1B1-C718-4BCB-A7BE-ED840A70449A}</Project>
       <Name>XSharp.Compiler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
+    <ProjectReference Include="..\..\source2\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
       <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MDbg4\src\debugger\corapi\corapi.csproj">
+    <ProjectReference Include="..\..\source2\MDbg4\src\debugger\corapi\corapi.csproj">
       <Project>{04EF9865-E1B1-403D-802B-E4FAEA50A634}</Project>
       <Name>corapi</Name>
     </ProjectReference>
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj.vspscc b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj.vspscc
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj.vspscc
rename to source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj.vspscc
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Cosmos.snk b/source/Cosmos.IL2CPU/Cosmos.snk
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Cosmos.snk
rename to source/Cosmos.IL2CPU/Cosmos.snk
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/AssemblerImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/AssemblerImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/AssemblerImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/AssemblerImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/Microsoft/Win32/RegistryKeyImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/Microsoft/Win32/RegistryKeyImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/Microsoft/Win32/RegistryKeyImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/Microsoft/Win32/RegistryKeyImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ArrayImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/ArrayImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ArrayImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/ArrayImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ArrayImplRefs.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/ArrayImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ArrayImplRefs.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/ArrayImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/BooleanImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/BooleanImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/BooleanImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/BooleanImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ByteImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/ByteImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ByteImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/ByteImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/CharImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/CharImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/CharImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/CharImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DelegateHelper.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/DelegateHelper.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DelegateHelper.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/DelegateHelper.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DelegateImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/DelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DelegateImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/DelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DoubleImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/DoubleImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/DoubleImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/DoubleImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/ColorImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/ColorImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/ColorImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/ColorImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/SRImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/SRImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/SRImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Drawing1/SRImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/EnumImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/EnumImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/EnumImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/EnumImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/EnvironmentImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/EnvironmentImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/EnvironmentImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/EnvironmentImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/GCImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/GCImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/GCImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/GCImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Globalization/CultureInfoImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Globalization/CultureInfoImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Globalization/CultureInfoImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Globalization/CultureInfoImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Globalization/NumberFormatInfoImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Globalization/NumberFormatInfoImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Globalization/NumberFormatInfoImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Globalization/NumberFormatInfoImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int16Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Int16Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int16Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Int16Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int32Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Int32Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int32Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Int32Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int64Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Int64Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Int64Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Int64Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/IntPtrImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/IntPtrImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/IntPtrImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/IntPtrImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/MulticastDelegateImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/MulticastDelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/MulticastDelegateImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/MulticastDelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Net/IPAddressImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Net/IPAddressImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Net/IPAddressImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Net/IPAddressImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Net/SocketAddressImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Net/SocketAddressImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Net/SocketAddressImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Net/SocketAddressImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/NumberImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/NumberImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/NumberImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/NumberImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ObjectImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/ObjectImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ObjectImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/ObjectImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ObjectImplRefs.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/ObjectImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/ObjectImplRefs.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/ObjectImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Resource/ResourceManager.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Resource/ResourceManager.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Resource/ResourceManager.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Resource/ResourceManager.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Runtime/CompilerServices/RuntimeHelpers.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Runtime/CompilerServices/RuntimeHelpers.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Runtime/CompilerServices/RuntimeHelpers.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Runtime/CompilerServices/RuntimeHelpers.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Runtime/InteropServices/SafeHandleImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Runtime/InteropServices/SafeHandleImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Runtime/InteropServices/SafeHandleImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Runtime/InteropServices/SafeHandleImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.RuntimeTypeCache.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.RuntimeTypeCache.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.RuntimeTypeCache.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.RuntimeTypeCache.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeType.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeTypeHandle.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeTypeHandle.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/RuntimeTypeHandle.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/RuntimeTypeHandle.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SByteImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/SByteImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SByteImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/SByteImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SRImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/SRImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SRImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/SRImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Security/CodeAccessSecurityEngineImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Security/CodeAccessSecurityEngineImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Security/CodeAccessSecurityEngineImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Security/CodeAccessSecurityEngineImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Security/Cryptography/Utils.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Security/Cryptography/Utils.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Security/Cryptography/Utils.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Security/Cryptography/Utils.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SingleImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/SingleImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/SingleImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/SingleImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/StringImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/StringImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/StringImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/StringImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/StringImplRefs.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/StringImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/StringImplRefs.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/StringImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Text/StringBuilderImpl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Text/StringBuilderImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Text/StringBuilderImpl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Text/StringBuilderImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Threading/Interlocked.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/Threading/Interlocked.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/Threading/Interlocked.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/Threading/Interlocked.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt16Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/UInt16Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt16Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/UInt16Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt32Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/UInt32Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt32Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/UInt32Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt64Impl.cs b/source/Cosmos.IL2CPU/CustomImplementation/System/UInt64Impl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/CustomImplementation/System/UInt64Impl.cs
rename to source/Cosmos.IL2CPU/CustomImplementation/System/UInt64Impl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ElfHash.cs b/source/Cosmos.IL2CPU/ElfHash.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ElfHash.cs
rename to source/Cosmos.IL2CPU/ElfHash.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ExceptionHelper.cs b/source/Cosmos.IL2CPU/ExceptionHelper.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ExceptionHelper.cs
rename to source/Cosmos.IL2CPU/ExceptionHelper.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Extensions.cs b/source/Cosmos.IL2CPU/Extensions.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Extensions.cs
rename to source/Cosmos.IL2CPU/Extensions.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/GCImplementation.cs b/source/Cosmos.IL2CPU/GCImplementation.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/GCImplementation.cs
rename to source/Cosmos.IL2CPU/GCImplementation.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/GCImplementationRefs.cs b/source/Cosmos.IL2CPU/GCImplementationRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/GCImplementationRefs.cs
rename to source/Cosmos.IL2CPU/GCImplementationRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Heap.cs b/source/Cosmos.IL2CPU/Heap.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Heap.cs
rename to source/Cosmos.IL2CPU/Heap.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Add.cs b/source/Cosmos.IL2CPU/IL/Add.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Add.cs
rename to source/Cosmos.IL2CPU/IL/Add.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Add_Ovf.cs b/source/Cosmos.IL2CPU/IL/Add_Ovf.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Add_Ovf.cs
rename to source/Cosmos.IL2CPU/IL/Add_Ovf.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Add_Ovf_Un.cs b/source/Cosmos.IL2CPU/IL/Add_Ovf_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Add_Ovf_Un.cs
rename to source/Cosmos.IL2CPU/IL/Add_Ovf_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/And.cs b/source/Cosmos.IL2CPU/IL/And.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/And.cs
rename to source/Cosmos.IL2CPU/IL/And.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Arglist.cs b/source/Cosmos.IL2CPU/IL/Arglist.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Arglist.cs
rename to source/Cosmos.IL2CPU/IL/Arglist.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Box.cs b/source/Cosmos.IL2CPU/IL/Box.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Box.cs
rename to source/Cosmos.IL2CPU/IL/Box.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Br.cs b/source/Cosmos.IL2CPU/IL/Br.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Br.cs
rename to source/Cosmos.IL2CPU/IL/Br.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Branch.cs b/source/Cosmos.IL2CPU/IL/Branch.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Branch.cs
rename to source/Cosmos.IL2CPU/IL/Branch.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Break.cs b/source/Cosmos.IL2CPU/IL/Break.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Break.cs
rename to source/Cosmos.IL2CPU/IL/Break.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Brfalse.cs b/source/Cosmos.IL2CPU/IL/Brfalse.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Brfalse.cs
rename to source/Cosmos.IL2CPU/IL/Brfalse.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Brtrue.cs b/source/Cosmos.IL2CPU/IL/Brtrue.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Brtrue.cs
rename to source/Cosmos.IL2CPU/IL/Brtrue.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Call.cs b/source/Cosmos.IL2CPU/IL/Call.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Call.cs
rename to source/Cosmos.IL2CPU/IL/Call.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Calli.cs b/source/Cosmos.IL2CPU/IL/Calli.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Calli.cs
rename to source/Cosmos.IL2CPU/IL/Calli.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Callvirt.cs b/source/Cosmos.IL2CPU/IL/Callvirt.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Callvirt.cs
rename to source/Cosmos.IL2CPU/IL/Callvirt.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Castclass.cs b/source/Cosmos.IL2CPU/IL/Castclass.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Castclass.cs
rename to source/Cosmos.IL2CPU/IL/Castclass.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ceq.cs b/source/Cosmos.IL2CPU/IL/Ceq.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ceq.cs
rename to source/Cosmos.IL2CPU/IL/Ceq.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Cgt.cs b/source/Cosmos.IL2CPU/IL/Cgt.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Cgt.cs
rename to source/Cosmos.IL2CPU/IL/Cgt.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Cgt_Un.cs b/source/Cosmos.IL2CPU/IL/Cgt_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Cgt_Un.cs
rename to source/Cosmos.IL2CPU/IL/Cgt_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ckfinite.cs b/source/Cosmos.IL2CPU/IL/Ckfinite.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ckfinite.cs
rename to source/Cosmos.IL2CPU/IL/Ckfinite.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Clt.cs b/source/Cosmos.IL2CPU/IL/Clt.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Clt.cs
rename to source/Cosmos.IL2CPU/IL/Clt.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Clt_Un.cs b/source/Cosmos.IL2CPU/IL/Clt_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Clt_Un.cs
rename to source/Cosmos.IL2CPU/IL/Clt_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Constrained.cs b/source/Cosmos.IL2CPU/IL/Constrained.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Constrained.cs
rename to source/Cosmos.IL2CPU/IL/Constrained.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I.cs b/source/Cosmos.IL2CPU/IL/Conv_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I.cs
rename to source/Cosmos.IL2CPU/IL/Conv_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I1.cs b/source/Cosmos.IL2CPU/IL/Conv_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I1.cs
rename to source/Cosmos.IL2CPU/IL/Conv_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I2.cs b/source/Cosmos.IL2CPU/IL/Conv_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I2.cs
rename to source/Cosmos.IL2CPU/IL/Conv_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I4.cs b/source/Cosmos.IL2CPU/IL/Conv_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I4.cs
rename to source/Cosmos.IL2CPU/IL/Conv_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I8.cs b/source/Cosmos.IL2CPU/IL/Conv_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_I8.cs
rename to source/Cosmos.IL2CPU/IL/Conv_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I1.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I1.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I1_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I1_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I1_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I1_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I2.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I2.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I2_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I2_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I2_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I2_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I4.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I4.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I4_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I4_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I4_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I4_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I8.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I8.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I8_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I8_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I8_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I8_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_I_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_I_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_I_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U1.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U1.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U1_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U1_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U1_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U1_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U2.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U2.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U2_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U2_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U2_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U2_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U4.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U4.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U4_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U4_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U4_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U4_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U8.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U8.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U8_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U8_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U8_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U8_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_Ovf_U_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_Ovf_U_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_Ovf_U_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R4.cs b/source/Cosmos.IL2CPU/IL/Conv_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R4.cs
rename to source/Cosmos.IL2CPU/IL/Conv_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R8.cs b/source/Cosmos.IL2CPU/IL/Conv_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R8.cs
rename to source/Cosmos.IL2CPU/IL/Conv_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R_Un.cs b/source/Cosmos.IL2CPU/IL/Conv_R_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_R_Un.cs
rename to source/Cosmos.IL2CPU/IL/Conv_R_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U.cs b/source/Cosmos.IL2CPU/IL/Conv_U.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U.cs
rename to source/Cosmos.IL2CPU/IL/Conv_U.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U1.cs b/source/Cosmos.IL2CPU/IL/Conv_U1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U1.cs
rename to source/Cosmos.IL2CPU/IL/Conv_U1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U2.cs b/source/Cosmos.IL2CPU/IL/Conv_U2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U2.cs
rename to source/Cosmos.IL2CPU/IL/Conv_U2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U4.cs b/source/Cosmos.IL2CPU/IL/Conv_U4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U4.cs
rename to source/Cosmos.IL2CPU/IL/Conv_U4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U8.cs b/source/Cosmos.IL2CPU/IL/Conv_U8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Conv_U8.cs
rename to source/Cosmos.IL2CPU/IL/Conv_U8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Cpblk.cs b/source/Cosmos.IL2CPU/IL/Cpblk.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Cpblk.cs
rename to source/Cosmos.IL2CPU/IL/Cpblk.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Cpobj.cs b/source/Cosmos.IL2CPU/IL/Cpobj.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Cpobj.cs
rename to source/Cosmos.IL2CPU/IL/Cpobj.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Div.cs b/source/Cosmos.IL2CPU/IL/Div.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Div.cs
rename to source/Cosmos.IL2CPU/IL/Div.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Div_Un.cs b/source/Cosmos.IL2CPU/IL/Div_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Div_Un.cs
rename to source/Cosmos.IL2CPU/IL/Div_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Dup.cs b/source/Cosmos.IL2CPU/IL/Dup.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Dup.cs
rename to source/Cosmos.IL2CPU/IL/Dup.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Endfilter.cs b/source/Cosmos.IL2CPU/IL/Endfilter.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Endfilter.cs
rename to source/Cosmos.IL2CPU/IL/Endfilter.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Endfinally.cs b/source/Cosmos.IL2CPU/IL/Endfinally.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Endfinally.cs
rename to source/Cosmos.IL2CPU/IL/Endfinally.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/FieldInfo.cs b/source/Cosmos.IL2CPU/IL/FieldInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/FieldInfo.cs
rename to source/Cosmos.IL2CPU/IL/FieldInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Initblk.cs b/source/Cosmos.IL2CPU/IL/Initblk.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Initblk.cs
rename to source/Cosmos.IL2CPU/IL/Initblk.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Initobj.cs b/source/Cosmos.IL2CPU/IL/Initobj.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Initobj.cs
rename to source/Cosmos.IL2CPU/IL/Initobj.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Isinst.cs b/source/Cosmos.IL2CPU/IL/Isinst.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Isinst.cs
rename to source/Cosmos.IL2CPU/IL/Isinst.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Jmp.cs b/source/Cosmos.IL2CPU/IL/Jmp.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Jmp.cs
rename to source/Cosmos.IL2CPU/IL/Jmp.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldarg.cs b/source/Cosmos.IL2CPU/IL/Ldarg.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldarg.cs
rename to source/Cosmos.IL2CPU/IL/Ldarg.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldarga.cs b/source/Cosmos.IL2CPU/IL/Ldarga.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldarga.cs
rename to source/Cosmos.IL2CPU/IL/Ldarga.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_I4.cs b/source/Cosmos.IL2CPU/IL/Ldc_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_I4.cs
rename to source/Cosmos.IL2CPU/IL/Ldc_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_I8.cs b/source/Cosmos.IL2CPU/IL/Ldc_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_I8.cs
rename to source/Cosmos.IL2CPU/IL/Ldc_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_R4.cs b/source/Cosmos.IL2CPU/IL/Ldc_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_R4.cs
rename to source/Cosmos.IL2CPU/IL/Ldc_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_R8.cs b/source/Cosmos.IL2CPU/IL/Ldc_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldc_R8.cs
rename to source/Cosmos.IL2CPU/IL/Ldc_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem.cs b/source/Cosmos.IL2CPU/IL/Ldelem.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I.cs b/source/Cosmos.IL2CPU/IL/Ldelem_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I1.cs b/source/Cosmos.IL2CPU/IL/Ldelem_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I1.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I2.cs b/source/Cosmos.IL2CPU/IL/Ldelem_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I2.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I4.cs b/source/Cosmos.IL2CPU/IL/Ldelem_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I4.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I8.cs b/source/Cosmos.IL2CPU/IL/Ldelem_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_I8.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_R4.cs b/source/Cosmos.IL2CPU/IL/Ldelem_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_R4.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_R8.cs b/source/Cosmos.IL2CPU/IL/Ldelem_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_R8.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_Ref.cs b/source/Cosmos.IL2CPU/IL/Ldelem_Ref.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_Ref.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_Ref.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U1.cs b/source/Cosmos.IL2CPU/IL/Ldelem_U1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U1.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_U1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U2.cs b/source/Cosmos.IL2CPU/IL/Ldelem_U2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U2.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_U2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U4.cs b/source/Cosmos.IL2CPU/IL/Ldelem_U4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelem_U4.cs
rename to source/Cosmos.IL2CPU/IL/Ldelem_U4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelema.cs b/source/Cosmos.IL2CPU/IL/Ldelema.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldelema.cs
rename to source/Cosmos.IL2CPU/IL/Ldelema.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldfld.cs b/source/Cosmos.IL2CPU/IL/Ldfld.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldfld.cs
rename to source/Cosmos.IL2CPU/IL/Ldfld.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldflda.cs b/source/Cosmos.IL2CPU/IL/Ldflda.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldflda.cs
rename to source/Cosmos.IL2CPU/IL/Ldflda.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldftn.cs b/source/Cosmos.IL2CPU/IL/Ldftn.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldftn.cs
rename to source/Cosmos.IL2CPU/IL/Ldftn.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I.cs b/source/Cosmos.IL2CPU/IL/Ldind_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I1.cs b/source/Cosmos.IL2CPU/IL/Ldind_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I1.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I2.cs b/source/Cosmos.IL2CPU/IL/Ldind_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I2.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I4.cs b/source/Cosmos.IL2CPU/IL/Ldind_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I4.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I8.cs b/source/Cosmos.IL2CPU/IL/Ldind_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_I8.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_R4.cs b/source/Cosmos.IL2CPU/IL/Ldind_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_R4.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_R8.cs b/source/Cosmos.IL2CPU/IL/Ldind_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_R8.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_Ref.cs b/source/Cosmos.IL2CPU/IL/Ldind_Ref.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_Ref.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_Ref.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U1.cs b/source/Cosmos.IL2CPU/IL/Ldind_U1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U1.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_U1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U2.cs b/source/Cosmos.IL2CPU/IL/Ldind_U2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U2.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_U2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U4.cs b/source/Cosmos.IL2CPU/IL/Ldind_U4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldind_U4.cs
rename to source/Cosmos.IL2CPU/IL/Ldind_U4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldlen.cs b/source/Cosmos.IL2CPU/IL/Ldlen.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldlen.cs
rename to source/Cosmos.IL2CPU/IL/Ldlen.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldloc.cs b/source/Cosmos.IL2CPU/IL/Ldloc.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldloc.cs
rename to source/Cosmos.IL2CPU/IL/Ldloc.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldloca.cs b/source/Cosmos.IL2CPU/IL/Ldloca.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldloca.cs
rename to source/Cosmos.IL2CPU/IL/Ldloca.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldnull.cs b/source/Cosmos.IL2CPU/IL/Ldnull.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldnull.cs
rename to source/Cosmos.IL2CPU/IL/Ldnull.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldobj.cs b/source/Cosmos.IL2CPU/IL/Ldobj.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldobj.cs
rename to source/Cosmos.IL2CPU/IL/Ldobj.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldsfld.cs b/source/Cosmos.IL2CPU/IL/Ldsfld.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldsfld.cs
rename to source/Cosmos.IL2CPU/IL/Ldsfld.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldsflda.cs b/source/Cosmos.IL2CPU/IL/Ldsflda.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldsflda.cs
rename to source/Cosmos.IL2CPU/IL/Ldsflda.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldstr.cs b/source/Cosmos.IL2CPU/IL/Ldstr.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldstr.cs
rename to source/Cosmos.IL2CPU/IL/Ldstr.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldtoken.cs b/source/Cosmos.IL2CPU/IL/Ldtoken.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldtoken.cs
rename to source/Cosmos.IL2CPU/IL/Ldtoken.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ldvirtftn.cs b/source/Cosmos.IL2CPU/IL/Ldvirtftn.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ldvirtftn.cs
rename to source/Cosmos.IL2CPU/IL/Ldvirtftn.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Leave.cs b/source/Cosmos.IL2CPU/IL/Leave.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Leave.cs
rename to source/Cosmos.IL2CPU/IL/Leave.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Localloc.cs b/source/Cosmos.IL2CPU/IL/Localloc.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Localloc.cs
rename to source/Cosmos.IL2CPU/IL/Localloc.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Mkrefany.cs b/source/Cosmos.IL2CPU/IL/Mkrefany.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Mkrefany.cs
rename to source/Cosmos.IL2CPU/IL/Mkrefany.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Mul.cs b/source/Cosmos.IL2CPU/IL/Mul.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Mul.cs
rename to source/Cosmos.IL2CPU/IL/Mul.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Mul_Ovf.cs b/source/Cosmos.IL2CPU/IL/Mul_Ovf.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Mul_Ovf.cs
rename to source/Cosmos.IL2CPU/IL/Mul_Ovf.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Mul_Ovf_Un.cs b/source/Cosmos.IL2CPU/IL/Mul_Ovf_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Mul_Ovf_Un.cs
rename to source/Cosmos.IL2CPU/IL/Mul_Ovf_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Neg.cs b/source/Cosmos.IL2CPU/IL/Neg.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Neg.cs
rename to source/Cosmos.IL2CPU/IL/Neg.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Newarr.cs b/source/Cosmos.IL2CPU/IL/Newarr.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Newarr.cs
rename to source/Cosmos.IL2CPU/IL/Newarr.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Newobj.cs b/source/Cosmos.IL2CPU/IL/Newobj.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Newobj.cs
rename to source/Cosmos.IL2CPU/IL/Newobj.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Nop.cs b/source/Cosmos.IL2CPU/IL/Nop.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Nop.cs
rename to source/Cosmos.IL2CPU/IL/Nop.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Not.cs b/source/Cosmos.IL2CPU/IL/Not.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Not.cs
rename to source/Cosmos.IL2CPU/IL/Not.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Or.cs b/source/Cosmos.IL2CPU/IL/Or.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Or.cs
rename to source/Cosmos.IL2CPU/IL/Or.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Pop.cs b/source/Cosmos.IL2CPU/IL/Pop.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Pop.cs
rename to source/Cosmos.IL2CPU/IL/Pop.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Readonly.cs b/source/Cosmos.IL2CPU/IL/Readonly.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Readonly.cs
rename to source/Cosmos.IL2CPU/IL/Readonly.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Refanytype.cs b/source/Cosmos.IL2CPU/IL/Refanytype.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Refanytype.cs
rename to source/Cosmos.IL2CPU/IL/Refanytype.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Refanyval.cs b/source/Cosmos.IL2CPU/IL/Refanyval.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Refanyval.cs
rename to source/Cosmos.IL2CPU/IL/Refanyval.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Rem.cs b/source/Cosmos.IL2CPU/IL/Rem.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Rem.cs
rename to source/Cosmos.IL2CPU/IL/Rem.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Rem_Un.cs b/source/Cosmos.IL2CPU/IL/Rem_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Rem_Un.cs
rename to source/Cosmos.IL2CPU/IL/Rem_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Ret.cs b/source/Cosmos.IL2CPU/IL/Ret.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Ret.cs
rename to source/Cosmos.IL2CPU/IL/Ret.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Rethrow.cs b/source/Cosmos.IL2CPU/IL/Rethrow.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Rethrow.cs
rename to source/Cosmos.IL2CPU/IL/Rethrow.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Shl.cs b/source/Cosmos.IL2CPU/IL/Shl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Shl.cs
rename to source/Cosmos.IL2CPU/IL/Shl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Shr.cs b/source/Cosmos.IL2CPU/IL/Shr.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Shr.cs
rename to source/Cosmos.IL2CPU/IL/Shr.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Shr_Un.cs b/source/Cosmos.IL2CPU/IL/Shr_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Shr_Un.cs
rename to source/Cosmos.IL2CPU/IL/Shr_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Sizeof.cs b/source/Cosmos.IL2CPU/IL/Sizeof.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Sizeof.cs
rename to source/Cosmos.IL2CPU/IL/Sizeof.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Starg.cs b/source/Cosmos.IL2CPU/IL/Starg.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Starg.cs
rename to source/Cosmos.IL2CPU/IL/Starg.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem.cs b/source/Cosmos.IL2CPU/IL/Stelem.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem.cs
rename to source/Cosmos.IL2CPU/IL/Stelem.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I.cs b/source/Cosmos.IL2CPU/IL/Stelem_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I1.cs b/source/Cosmos.IL2CPU/IL/Stelem_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I1.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I2.cs b/source/Cosmos.IL2CPU/IL/Stelem_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I2.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I4.cs b/source/Cosmos.IL2CPU/IL/Stelem_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I4.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I8.cs b/source/Cosmos.IL2CPU/IL/Stelem_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_I8.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_R4.cs b/source/Cosmos.IL2CPU/IL/Stelem_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_R4.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_R8.cs b/source/Cosmos.IL2CPU/IL/Stelem_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_R8.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_Ref.cs b/source/Cosmos.IL2CPU/IL/Stelem_Ref.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stelem_Ref.cs
rename to source/Cosmos.IL2CPU/IL/Stelem_Ref.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stfld.cs b/source/Cosmos.IL2CPU/IL/Stfld.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stfld.cs
rename to source/Cosmos.IL2CPU/IL/Stfld.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I.cs b/source/Cosmos.IL2CPU/IL/Stind_I.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I.cs
rename to source/Cosmos.IL2CPU/IL/Stind_I.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I1.cs b/source/Cosmos.IL2CPU/IL/Stind_I1.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I1.cs
rename to source/Cosmos.IL2CPU/IL/Stind_I1.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I2.cs b/source/Cosmos.IL2CPU/IL/Stind_I2.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I2.cs
rename to source/Cosmos.IL2CPU/IL/Stind_I2.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I4.cs b/source/Cosmos.IL2CPU/IL/Stind_I4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I4.cs
rename to source/Cosmos.IL2CPU/IL/Stind_I4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I8.cs b/source/Cosmos.IL2CPU/IL/Stind_I8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_I8.cs
rename to source/Cosmos.IL2CPU/IL/Stind_I8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_R4.cs b/source/Cosmos.IL2CPU/IL/Stind_R4.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_R4.cs
rename to source/Cosmos.IL2CPU/IL/Stind_R4.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_R8.cs b/source/Cosmos.IL2CPU/IL/Stind_R8.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_R8.cs
rename to source/Cosmos.IL2CPU/IL/Stind_R8.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_Ref.cs b/source/Cosmos.IL2CPU/IL/Stind_Ref.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stind_Ref.cs
rename to source/Cosmos.IL2CPU/IL/Stind_Ref.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stloc.cs b/source/Cosmos.IL2CPU/IL/Stloc.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stloc.cs
rename to source/Cosmos.IL2CPU/IL/Stloc.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stobj.cs b/source/Cosmos.IL2CPU/IL/Stobj.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stobj.cs
rename to source/Cosmos.IL2CPU/IL/Stobj.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Stsfld.cs b/source/Cosmos.IL2CPU/IL/Stsfld.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Stsfld.cs
rename to source/Cosmos.IL2CPU/IL/Stsfld.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Sub.cs b/source/Cosmos.IL2CPU/IL/Sub.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Sub.cs
rename to source/Cosmos.IL2CPU/IL/Sub.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Sub_Ovf.cs b/source/Cosmos.IL2CPU/IL/Sub_Ovf.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Sub_Ovf.cs
rename to source/Cosmos.IL2CPU/IL/Sub_Ovf.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Sub_Ovf_Un.cs b/source/Cosmos.IL2CPU/IL/Sub_Ovf_Un.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Sub_Ovf_Un.cs
rename to source/Cosmos.IL2CPU/IL/Sub_Ovf_Un.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Switch.cs b/source/Cosmos.IL2CPU/IL/Switch.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Switch.cs
rename to source/Cosmos.IL2CPU/IL/Switch.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Throw.cs b/source/Cosmos.IL2CPU/IL/Throw.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Throw.cs
rename to source/Cosmos.IL2CPU/IL/Throw.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Unaligned.cs b/source/Cosmos.IL2CPU/IL/Unaligned.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Unaligned.cs
rename to source/Cosmos.IL2CPU/IL/Unaligned.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Unbox.cs b/source/Cosmos.IL2CPU/IL/Unbox.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Unbox.cs
rename to source/Cosmos.IL2CPU/IL/Unbox.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Unbox_Any.cs b/source/Cosmos.IL2CPU/IL/Unbox_Any.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Unbox_Any.cs
rename to source/Cosmos.IL2CPU/IL/Unbox_Any.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Volatile.cs b/source/Cosmos.IL2CPU/IL/Volatile.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Volatile.cs
rename to source/Cosmos.IL2CPU/IL/Volatile.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/IL/Xor.cs b/source/Cosmos.IL2CPU/IL/Xor.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/IL/Xor.cs
rename to source/Cosmos.IL2CPU/IL/Xor.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOp.cs b/source/Cosmos.IL2CPU/ILOp.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOp.cs
rename to source/Cosmos.IL2CPU/ILOp.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCode.cs b/source/Cosmos.IL2CPU/ILOpCode.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCode.cs
rename to source/Cosmos.IL2CPU/ILOpCode.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/.editorconfig b/source/Cosmos.IL2CPU/ILOpCodes/.editorconfig
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/.editorconfig
rename to source/Cosmos.IL2CPU/ILOpCodes/.editorconfig
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/BoxOfT.cs b/source/Cosmos.IL2CPU/ILOpCodes/BoxOfT.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/BoxOfT.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/BoxOfT.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/NullRef.cs b/source/Cosmos.IL2CPU/ILOpCodes/NullRef.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/NullRef.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/NullRef.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpBranch.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpBranch.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpBranch.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpBranch.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpDouble.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpDouble.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpDouble.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpDouble.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpField.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpField.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpField.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpField.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpInt.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpInt.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpInt.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpInt.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpInt64.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpInt64.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpInt64.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpInt64.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpMethod.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpMethod.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpMethod.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpMethod.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpNone.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSig.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpSig.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSig.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpSig.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSingle.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpSingle.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSingle.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpSingle.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpString.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpString.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpString.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpString.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSwitch.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpSwitch.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpSwitch.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpSwitch.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpToken.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpToken.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpToken.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpToken.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpType.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpType.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpType.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpType.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpVar.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpVar.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILOpCodes/OpVar.cs
rename to source/Cosmos.IL2CPU/ILOpCodes/OpVar.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILReader.cs b/source/Cosmos.IL2CPU/ILReader.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILReader.cs
rename to source/Cosmos.IL2CPU/ILReader.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ILScanner.cs b/source/Cosmos.IL2CPU/ILScanner.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ILScanner.cs
rename to source/Cosmos.IL2CPU/ILScanner.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/MethodBaseComparer.cs b/source/Cosmos.IL2CPU/MethodBaseComparer.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/MethodBaseComparer.cs
rename to source/Cosmos.IL2CPU/MethodBaseComparer.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/MethodInfo.cs b/source/Cosmos.IL2CPU/MethodInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/MethodInfo.cs
rename to source/Cosmos.IL2CPU/MethodInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ObjectUtilities.cs b/source/Cosmos.IL2CPU/ObjectUtilities.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ObjectUtilities.cs
rename to source/Cosmos.IL2CPU/ObjectUtilities.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/OpCodeAttribute.cs b/source/Cosmos.IL2CPU/OpCodeAttribute.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/OpCodeAttribute.cs
rename to source/Cosmos.IL2CPU/OpCodeAttribute.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Optimizer.cs b/source/Cosmos.IL2CPU/Optimizer.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Optimizer.cs
rename to source/Cosmos.IL2CPU/Optimizer.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/OurHashSet.cs b/source/Cosmos.IL2CPU/OurHashSet.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/OurHashSet.cs
rename to source/Cosmos.IL2CPU/OurHashSet.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/PlugInfo.cs b/source/Cosmos.IL2CPU/PlugInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/PlugInfo.cs
rename to source/Cosmos.IL2CPU/PlugInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/PlugManager.cs b/source/Cosmos.IL2CPU/PlugManager.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/PlugManager.cs
rename to source/Cosmos.IL2CPU/PlugManager.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/BreakAssembler.cs b/source/Cosmos.IL2CPU/Plugs/Diagnostics/BreakAssembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/BreakAssembler.cs
rename to source/Cosmos.IL2CPU/Plugs/Diagnostics/BreakAssembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImpl.cs b/source/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImplRefs.cs b/source/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImplRefs.cs
rename to source/Cosmos.IL2CPU/Plugs/Diagnostics/DebugImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebuggerImpl.cs b/source/Cosmos.IL2CPU/Plugs/Diagnostics/DebuggerImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/Diagnostics/DebuggerImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/Diagnostics/DebuggerImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/MS/System/MathImpl.cs b/source/Cosmos.IL2CPU/Plugs/MS/System/MathImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/MS/System/MathImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/MS/System/MathImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/MS/System/StringImpl.cs b/source/Cosmos.IL2CPU/Plugs/MS/System/StringImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/MS/System/StringImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/MS/System/StringImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/CtorImplAssembler.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/CtorImplAssembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/CtorImplAssembler.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/CtorImplAssembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DelegateImpl.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DelegateImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DoubleImpl.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DoubleImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DoubleImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/DoubleImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/GetMulticastInvokeAssembler.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/GetMulticastInvokeAssembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/GetMulticastInvokeAssembler.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/GetMulticastInvokeAssembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/InvokeImplAssembler.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/InvokeImplAssembler.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/InvokeImplAssembler.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/InvokeImplAssembler.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/NormalDelegateImpl.cs b/source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/NormalDelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/NEW_PLUGS/NormalDelegateImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/NEW_PLUGS/NormalDelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System.Runtime.CompilerServices/RuntimeHelpersImpl.cs b/source/Cosmos.IL2CPU/Plugs/System.Runtime.CompilerServices/RuntimeHelpersImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System.Runtime.CompilerServices/RuntimeHelpersImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System.Runtime.CompilerServices/RuntimeHelpersImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ArrayImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/ArrayImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ArrayImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/ArrayImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_InternalCopy.cs b/source/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_InternalCopy.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_InternalCopy.cs
rename to source/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_InternalCopy.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_get_Length.cs b/source/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_get_Length.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_get_Length.cs
rename to source/Cosmos.IL2CPU/Plugs/System/Assemblers/Array_get_Length.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Buffer_BlockCopy.cs b/source/Cosmos.IL2CPU/Plugs/System/Assemblers/Buffer_BlockCopy.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/Buffer_BlockCopy.cs
rename to source/Cosmos.IL2CPU/Plugs/System/Assemblers/Buffer_BlockCopy.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/MulticastDelegate_Invoke.cs b/source/Cosmos.IL2CPU/Plugs/System/Assemblers/MulticastDelegate_Invoke.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Assemblers/MulticastDelegate_Invoke.cs
rename to source/Cosmos.IL2CPU/Plugs/System/Assemblers/MulticastDelegate_Invoke.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Buffer.cs b/source/Cosmos.IL2CPU/Plugs/System/Buffer.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/Buffer.cs
rename to source/Cosmos.IL2CPU/Plugs/System/Buffer.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/DelegateImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/DelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/DelegateImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/DelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EnumImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/EnumImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EnumImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/EnumImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EventHandlerImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/EventHandlerImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EventHandlerImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/EventHandlerImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EventHandlerImplRefs.cs b/source/Cosmos.IL2CPU/Plugs/System/EventHandlerImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/EventHandlerImplRefs.cs
rename to source/Cosmos.IL2CPU/Plugs/System/EventHandlerImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ExceptionImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/ExceptionImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ExceptionImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/ExceptionImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImplRefs.cs b/source/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImplRefs.cs
rename to source/Cosmos.IL2CPU/Plugs/System/MulticastDelegateImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ObjectImplRefs.cs b/source/Cosmos.IL2CPU/Plugs/System/ObjectImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/ObjectImplRefs.cs
rename to source/Cosmos.IL2CPU/Plugs/System/ObjectImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/OutOfMemoryExceptionImpl.cs b/source/Cosmos.IL2CPU/Plugs/System/OutOfMemoryExceptionImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Plugs/System/OutOfMemoryExceptionImpl.cs
rename to source/Cosmos.IL2CPU/Plugs/System/OutOfMemoryExceptionImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/Properties/AssemblyInfo.cs b/source/Cosmos.IL2CPU/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/Properties/AssemblyInfo.cs
rename to source/Cosmos.IL2CPU/Properties/AssemblyInfo.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ReadMe.txt b/source/Cosmos.IL2CPU/ReadMe.txt
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ReadMe.txt
rename to source/Cosmos.IL2CPU/ReadMe.txt
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/ReflectionUtilities.cs b/source/Cosmos.IL2CPU/ReflectionUtilities.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/ReflectionUtilities.cs
rename to source/Cosmos.IL2CPU/ReflectionUtilities.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/RuntimeEngineImpl.cs b/source/Cosmos.IL2CPU/RuntimeEngineImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/RuntimeEngineImpl.cs
rename to source/Cosmos.IL2CPU/RuntimeEngineImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/RuntimeEngineRefs.cs b/source/Cosmos.IL2CPU/RuntimeEngineRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/RuntimeEngineRefs.cs
rename to source/Cosmos.IL2CPU/RuntimeEngineRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/SkipList.cs b/source/Cosmos.IL2CPU/SkipList.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/SkipList.cs
rename to source/Cosmos.IL2CPU/SkipList.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/VTablesImpl.cs b/source/Cosmos.IL2CPU/VTablesImpl.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/VTablesImpl.cs
rename to source/Cosmos.IL2CPU/VTablesImpl.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/VTablesImplRefs.cs b/source/Cosmos.IL2CPU/VTablesImplRefs.cs
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/VTablesImplRefs.cs
rename to source/Cosmos.IL2CPU/VTablesImplRefs.cs
diff --git a/source2/IL2CPU/Cosmos.IL2CPU/packages.config b/source/Cosmos.IL2CPU/packages.config
similarity index 100%
rename from source2/IL2CPU/Cosmos.IL2CPU/packages.config
rename to source/Cosmos.IL2CPU/packages.config
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 55f04e563..b4193f5a5 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -64,9 +64,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Sys", "Cosmos\Cosmos
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Sys.Plugs", "Cosmos\Cosmos.Sys.Plugs\Cosmos.Sys.Plugs.csproj", "{6110AD07-EB07-4A99-BB73-7A69AF5732F1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Common", "..\source2\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{0462E82B-8C29-41A9-8265-9C89038ADB29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Common", "Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{0462E82B-8C29-41A9-8265-9C89038ADB29}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.MSBuild", "..\source2\Build\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj", "{BC6AE974-1F18-4A19-A956-5062E4D3FD53}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.MSBuild", "Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj", "{BC6AE974-1F18-4A19-A956-5062E4D3FD53}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.Common", "..\source2\Debug\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj", "{AB24E403-54F3-4F67-B5E0-119A7227AAC1}"
 EndProject
@@ -74,11 +74,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.VSDebugEngine"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Package", "..\source2\VSIP\Cosmos.VS.Package\Cosmos.VS.Package.csproj", "{61535AF6-4A1E-4691-B2BC-039851EF4850}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU", "..\source2\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU", "Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Hardware.SMBIOS", "Cosmos.Hardware.SMBIOS\Cosmos.Hardware.SMBIOS.csproj", "{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Plugs", "..\source2\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Plugs", "Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.GDB", "..\source2\Debug\Cosmos.Debug.GDB\Cosmos.Debug.GDB.csproj", "{3370FC04-B669-46A4-A4AA-A89540318F8D}"
 EndProject
@@ -107,7 +107,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "..\Docs", "{67E7DEF
 		SlnRelativePath = "..\Docs\"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.DebugStub", "..\source2\Compiler\Cosmos.Compiler.DebugStub\Cosmos.Debug.DebugStub.csproj", "{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.DebugStub", "Cosmos.Debug.DebugStub\Cosmos.Debug.DebugStub.csproj", "{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Assembler", "..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj", "{1116130E-28E0-428A-A597-F4B3B676C0CA}"
 EndProject
@@ -139,7 +139,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "File2ByteArray Converter",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Windows.Test", "..\source2\VSIP\Cosmos.VS.Windows.Test\Cosmos.VS.Windows.Test.csproj", "{EA63FDF9-057F-4E67-9060-74F4E7A09AE0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Profiler", "..\source2\IL2CPU\Cosmos.IL2CPU.Profiler\Cosmos.IL2CPU.Profiler.csproj", "{F708C866-1C9B-4579-8C28-0728ECCFC1ED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Profiler", "Cosmos.IL2CPU.Profiler\Cosmos.IL2CPU.Profiler.csproj", "{F708C866-1C9B-4579-8C28-0728ECCFC1ED}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.Compiler", "XSharp.Compiler\XSharp.Compiler.csproj", "{A281A1B1-C718-4BCB-A7BE-ED840A70449A}"
 EndProject
@@ -225,15 +225,15 @@ Global
 		SccProjectTopLevelParentUniqueName6 = Cosmos.sln
 		SccProjectName6 = Cosmos/Cosmos.Sys.Plugs
 		SccLocalPath6 = Cosmos\\Cosmos.Sys.Plugs
-		SccProjectUniqueName7 = ..\\source2\\Build\\Cosmos.Build.Common\\Cosmos.Build.Common.csproj
+		SccProjectUniqueName7 = Cosmos.Build.Common\\Cosmos.Build.Common.csproj
 		SccProjectTopLevelParentUniqueName7 = Cosmos.sln
-		SccProjectName7 = ../source2/Build/Cosmos.Build.Common
+		SccProjectName7 = Cosmos.Build.Common
 		SccAuxPath7 = https://tfs.codeplex.com/tfs/TFS04
-		SccLocalPath7 = ..\\source2\\Build\\Cosmos.Build.Common
-		SccProjectUniqueName8 = ..\\source2\\Build\\Cosmos.Build.MSBuild\\Cosmos.Build.MSBuild.csproj
+		SccLocalPath7 = Cosmos.Build.Common
+		SccProjectUniqueName8 = Cosmos.Build.MSBuild\\Cosmos.Build.MSBuild.csproj
 		SccProjectTopLevelParentUniqueName8 = Cosmos.sln
-		SccProjectName8 = ../source2/Build/Cosmos.Build.MSBuild
-		SccLocalPath8 = ..\\source2\\Build\\Cosmos.Build.MSBuild
+		SccProjectName8 = Cosmos.Build.MSBuild
+		SccLocalPath8 = Cosmos.Build.MSBuild
 		SccProjectUniqueName9 = ..\\source2\\Debug\\Cosmos.Debug.Common\\Cosmos.Debug.Common.csproj
 		SccProjectTopLevelParentUniqueName9 = Cosmos.sln
 		SccProjectName9 = ../source2/Debug/Cosmos.Debug.Common
@@ -250,18 +250,18 @@ Global
 		SccProjectTopLevelParentUniqueName12 = Cosmos.sln
 		SccProjectName12 = Cosmos.Hardware.SMBIOS
 		SccLocalPath12 = Cosmos.Hardware.SMBIOS
-		SccProjectUniqueName13 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
+		SccProjectUniqueName13 = Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
 		SccProjectTopLevelParentUniqueName13 = Cosmos.sln
-		SccProjectName13 = ../source2/IL2CPU/Cosmos.IL2CPU.Plugs
-		SccLocalPath13 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs
+		SccProjectName13 = Cosmos.IL2CPU.Plugs
+		SccLocalPath13 = Cosmos.IL2CPU.Plugs
 		SccProjectUniqueName14 = ..\\source2\\Debug\\Cosmos.Debug.GDB\\Cosmos.Debug.GDB.csproj
 		SccProjectTopLevelParentUniqueName14 = Cosmos.sln
 		SccProjectName14 = ../source2/Debug/Cosmos.Debug.GDB
 		SccLocalPath14 = ..\\source2\\Debug\\Cosmos.Debug.GDB
-		SccProjectUniqueName15 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Debug.DebugStub.csproj
+		SccProjectUniqueName15 = Cosmos.Debug.DebugStub\\Cosmos.Debug.DebugStub.csproj
 		SccProjectTopLevelParentUniqueName15 = Cosmos.sln
-		SccProjectName15 = ../source2/Compiler/Cosmos.Compiler.DebugStub
-		SccLocalPath15 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
+		SccProjectName15 = Cosmos.Debug.DebugStub
+		SccLocalPath15 = Cosmos.Debug.DebugStub
 		SccProjectUniqueName16 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core\\Cosmos.Core.csproj
 		SccProjectTopLevelParentUniqueName16 = Cosmos.sln
 		SccProjectName16 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core
@@ -318,18 +318,18 @@ Global
 		SccProjectTopLevelParentUniqueName29 = Cosmos.sln
 		SccProjectName29 = ../source2/Cosmos.Assembler
 		SccLocalPath29 = ..\\source2\\Cosmos.Assembler
-		SccProjectUniqueName30 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU\\Cosmos.IL2CPU.csproj
+		SccProjectUniqueName30 = Cosmos.IL2CPU\\Cosmos.IL2CPU.csproj
 		SccProjectTopLevelParentUniqueName30 = Cosmos.sln
-		SccProjectName30 = ../source2/IL2CPU/Cosmos.IL2CPU
-		SccLocalPath30 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU
+		SccProjectName30 = Cosmos.IL2CPU
+		SccLocalPath30 = Cosmos.IL2CPU
 		SccProjectUniqueName31 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test\\Cosmos.VS.Windows.Test.csproj
 		SccProjectTopLevelParentUniqueName31 = Cosmos.sln
 		SccProjectName31 = ../source2/VSIP/Cosmos.VS.Windows.Test
 		SccLocalPath31 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test
-		SccProjectUniqueName32 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Profiler\\Cosmos.IL2CPU.Profiler.csproj
+		SccProjectUniqueName32 = Cosmos.IL2CPU.Profiler\\Cosmos.IL2CPU.Profiler.csproj
 		SccProjectTopLevelParentUniqueName32 = Cosmos.sln
-		SccProjectName32 = ../source2/IL2CPU/Cosmos.IL2CPU.Profiler
-		SccLocalPath32 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Profiler
+		SccProjectName32 = Cosmos.IL2CPU.Profiler
+		SccLocalPath32 = Cosmos.IL2CPU.Profiler
 		SccProjectUniqueName33 = ..\\source2\\VMWareLib\\VMWareLib.csproj
 		SccProjectTopLevelParentUniqueName33 = Cosmos.sln
 		SccProjectName33 = ../source2/VMWareLib
diff --git a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
index de1dec3d2..9406eb8ef 100644
--- a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
+++ b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
@@ -96,11 +96,11 @@
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\source2\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\source2\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
+    <ProjectReference Include="..\..\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
       <Project>{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}</Project>
       <Name>Cosmos.IL2CPU</Name>
     </ProjectReference>
diff --git a/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj b/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
index e47ed3632..014698587 100644
--- a/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
+++ b/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
@@ -91,11 +91,11 @@
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\source2\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\source2\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
+    <ProjectReference Include="..\..\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
       <Project>{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}</Project>
       <Name>Cosmos.IL2CPU</Name>
     </ProjectReference>
diff --git a/source/XSharp.Test/XSharp.Test.csproj b/source/XSharp.Test/XSharp.Test.csproj
index 23563bf16..cf41bb8ee 100644
--- a/source/XSharp.Test/XSharp.Test.csproj
+++ b/source/XSharp.Test/XSharp.Test.csproj
@@ -63,7 +63,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\source2\Build\Cosmos.Build.Common\CosmosPaths.cs">
+    <Compile Include="..\..\source\Cosmos.Build.Common\CosmosPaths.cs">
       <Link>CosmosPaths.cs</Link>
     </Compile>
     <Compile Include="MainForm.cs">
diff --git a/source2/Cosmos.Assembler/Cosmos.Assembler.csproj b/source2/Cosmos.Assembler/Cosmos.Assembler.csproj
index 76ebdb50e..fe791cb4f 100644
--- a/source2/Cosmos.Assembler/Cosmos.Assembler.csproj
+++ b/source2/Cosmos.Assembler/Cosmos.Assembler.csproj
@@ -316,7 +316,7 @@
       <Project>{841A734E-9606-4AAB-9C4A-74E7E303FF5D}</Project>
       <Name>XSharp.Nasm</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
diff --git a/source2/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj b/source2/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj
index c5b372430..45e8ff396 100644
--- a/source2/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj
+++ b/source2/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj
@@ -107,7 +107,7 @@
     <Resource Include="Cosmos.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
diff --git a/source2/Debug/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj b/source2/Debug/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
index 57eeb3273..c5babe40e 100644
--- a/source2/Debug/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
+++ b/source2/Debug/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
@@ -140,7 +140,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
diff --git a/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj b/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj
index b71e9f70f..c6a664f56 100644
--- a/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj
+++ b/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj
@@ -215,7 +215,7 @@
     <Content Include="ToDo.html" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
index 5af27419e..10f762510 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
@@ -172,7 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
diff --git a/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj b/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
index 43108028d..868f25c3c 100644
--- a/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
+++ b/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
@@ -82,11 +82,11 @@
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
+    <ProjectReference Include="..\..\..\..\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
       <Project>{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}</Project>
       <Name>Cosmos.IL2CPU</Name>
     </ProjectReference>
diff --git a/source2/Kernel/System/Cosmos.System.Plugs.System/Cosmos.System.Plugs.System.csproj b/source2/Kernel/System/Cosmos.System.Plugs.System/Cosmos.System.Plugs.System.csproj
index b4407fe7d..63bd7ef6a 100644
--- a/source2/Kernel/System/Cosmos.System.Plugs.System/Cosmos.System.Plugs.System.csproj
+++ b/source2/Kernel/System/Cosmos.System.Plugs.System/Cosmos.System.Plugs.System.csproj
@@ -86,7 +86,7 @@
     <Compile Include="TypeImpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj b/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
index 1a8eb8cd3..56da0f4f3 100644
--- a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
+++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
@@ -111,7 +111,7 @@
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core/Cosmos.Core.csproj b/source2/Kernel/System/Hardware/Core/Cosmos.Core/Cosmos.Core.csproj
index d76eaf865..e1c375d09 100644
--- a/source2/Kernel/System/Hardware/Core/Cosmos.Core/Cosmos.Core.csproj
+++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core/Cosmos.Core.csproj
@@ -109,7 +109,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
diff --git a/source2/Kernel/System/Hardware/Cosmos.Hardware/Cosmos.Hardware.csproj b/source2/Kernel/System/Hardware/Cosmos.Hardware/Cosmos.Hardware.csproj
index b02a61ae2..6073cc2cc 100644
--- a/source2/Kernel/System/Hardware/Cosmos.Hardware/Cosmos.Hardware.csproj
+++ b/source2/Kernel/System/Hardware/Cosmos.Hardware/Cosmos.Hardware.csproj
@@ -95,7 +95,7 @@
     <Compile Include="TextScreen.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
diff --git a/source2/Tools/PlugsInspector/PlugsInspector.csproj b/source2/Tools/PlugsInspector/PlugsInspector.csproj
index ff6075132..ee24c2cd8 100644
--- a/source2/Tools/PlugsInspector/PlugsInspector.csproj
+++ b/source2/Tools/PlugsInspector/PlugsInspector.csproj
@@ -83,11 +83,11 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\IL2CPU\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj">
       <Project>{c801f19c-a9d3-42d5-9a57-9ffdf9b4d05e}</Project>
       <Name>Cosmos.IL2CPU.Plugs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\IL2CPU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
       <Project>{239e33a7-f0c3-4801-85ca-4d8f89a31dc0}</Project>
       <Name>Cosmos.IL2CPU</Name>
     </ProjectReference>
diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
index ac5ca5a96..c6480dff0 100644
--- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
+++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
@@ -273,11 +273,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Build\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj">
+    <ProjectReference Include="..\..\..\source\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj">
       <Project>{BC6AE974-1F18-4A19-A956-5062E4D3FD53}</Project>
       <Name>Cosmos.Build.MSBuild</Name>
     </ProjectReference>