Merge pull request CosmosOS#2 from CosmosOS/master

u
mel-lotonin · Dec 16, 2017 · 68c357b · 68c357b
2 parents 0e8cdf2 + 3a0da1a
commit 68c357b
Show file tree

Hide file tree

Showing 155 changed files with 248 additions and 374 deletions.
diff --git a/Build.sln b/Build.sln
@@ -45,7 +45,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.USB", "source
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "source\Cosmos.Deploy.Pixie\Cosmos.Deploy.Pixie.csproj", "{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{F3025446-D2C7-4FEA-AB03-C707F7B48B43}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.Compiler", "..\IL2CPU\source\IL2CPU.Compiler\IL2CPU.Compiler.csproj", "{F3025446-D2C7-4FEA-AB03-C707F7B48B43}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{3C45A898-4AA9-476F-8302-63391D6ED044}"
 EndProject
@@ -79,7 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSha
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj", "{A9469897-4FD8-49E7-97F1-FE420A2B75B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.API", "..\IL2CPU\source\IL2CPU.API\IL2CPU.API.csproj", "{A9469897-4FD8-49E7-97F1-FE420A2B75B9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Common", "source\Cosmos.Common\Cosmos.Common.csproj", "{366C2EC6-B9D8-4676-9C88-98F041B8FC93}"
 EndProject

diff --git a/Kernel.sln b/Kernel.sln
@@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel", "sour
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj", "{31D48401-77B2-44AF-B6D3-27AB67C10759}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.API", "..\IL2CPU\source\IL2CPU.API\IL2CPU.API.csproj", "{31D48401-77B2-44AF-B6D3-27AB67C10759}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel.Plugs.Asm", "source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj", "{6C770E55-8EED-444C-AD4E-017E823E5BA3}"
 EndProject

diff --git a/Test.sln b/Test.sln
@@ -20,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.MSBuild", "sou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{4F903492-CCA6-4FD9-A1B6-5E4CC0CE7767}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj", "{34AEEB7C-FD5D-4B15-A830-B429681844BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.API", "..\IL2CPU\source\IL2CPU.API\IL2CPU.API.csproj", "{34AEEB7C-FD5D-4B15-A830-B429681844BD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Common", "source\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj", "{A97A1EF7-AEEC-43F3-8CB0-5C7269DC7E85}"
 EndProject
@@ -66,7 +66,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{65532163
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU.Compiler", "..\IL2CPU\source\IL2CPU.Compiler\IL2CPU.Compiler.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{ECEA7778-E786-4317-90B9-A2D4427CB91C}"
 EndProject

diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
@@ -35,7 +35,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
-        <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
+        <ProjectReference Include="..\..\..\IL2CPU\source\IL2CPU.API\IL2CPU.API.csproj" />
         <ProjectReference Include="..\..\..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Core_Asm\Cosmos.Core_Asm.csproj" />

diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs
@@ -223,7 +223,7 @@ private void RunIL2CPU(string kernelFileName, string outputFile)
             xArgs.AddRange(References.Select(aReference => "References:" + aReference));
 
             bool xUsingUserkit = false;
-            string xIL2CPUPath = Path.Combine(FindCosmosRoot(), "..", "IL2CPU", "source", "IL2CPU");
+            string xIL2CPUPath = Path.Combine(FindCosmosRoot(), "..", "IL2CPU", "source", "IL2CPU.Compiler");
             if (!Directory.Exists(xIL2CPUPath))
             {
                 xUsingUserkit = true;

diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\IL2CPU\source\IL2CPU\IL2CPU.csproj" />
+        <ProjectReference Include="..\..\..\IL2CPU\source\IL2CPU.Compiler\IL2CPU.Compiler.csproj" />
         <ProjectReference Include="..\..\source\TheRingMaster\TheRingMaster.csproj" />
         <ProjectReference Include="..\..\Tools\NASM\NASM.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj" />

diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+
+    <PropertyGroup>
+        <IsPackable Condition="'$(IsPackable)' == ''">False</IsPackable>
+    </PropertyGroup>
+
+</Project>
diff --git a/Tests/Directory.Build.targets b/Tests/Directory.Build.targets
diff --git a/Tools/PlugsInspector/PlugsInspector.csproj b/Tools/PlugsInspector/PlugsInspector.csproj
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
+        <ProjectReference Include="..\..\source\IL2CPU.API\IL2CPU.API.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
     </ItemGroup>
 

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/AssemblerMethod.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Cosmos.IL2CPU.API {
+namespace IL2CPU.API {
     public abstract class AssemblerMethod
     {
         public abstract void AssembleNew(object aAssembler, object aMethodInfo);

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{CDDAF88B-8726-469A-B906-16FD5EC99799}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cosmos.IL2CPU.API</RootNamespace>
-    <AssemblyName>Cosmos.IL2CPU.API</AssemblyName>
+    <RootNamespace>IL2CPU.API</RootNamespace>
+    <AssemblyName>IL2CPU.API</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/FieldAccessAttribute.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Cosmos.IL2CPU.API
+namespace IL2CPU.API
 {
 	[AttributeUsage(AttributeTargets.Parameter)]
 	public sealed class FieldAccessAttribute: Attribute {

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugAttribute.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Cosmos.IL2CPU.API
+namespace IL2CPU.API
 {
   [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
   public sealed class PlugAttribute : Attribute {

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugFieldAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Cosmos.IL2CPU.API
+namespace IL2CPU.API
 {
 	[AttributeUsage(AttributeTargets.Class, AllowMultiple=true)]
 	public sealed class PlugFieldAttribute: Attribute {

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/PlugMethodAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Cosmos.IL2CPU.API
+namespace IL2CPU.API
 {
   [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
   public sealed class PlugMethodAttribute: Attribute {

diff --git a/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs b/Users/Matthijs/Testing/Cosmos.IL2CPU.Plugs/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Cosmos.IL2CPU.API")]
+[assembly: AssemblyTitle("IL2CPU.API")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Cosmos.IL2CPU.API")]
+[assembly: AssemblyProduct("IL2CPU.API")]
 [assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

diff --git a/Users/Matthijs/Testing/MonoCecilToEcmaCil1/MonoCecilToEcmaCil1.csproj b/Users/Matthijs/Testing/MonoCecilToEcmaCil1/MonoCecilToEcmaCil1.csproj
@@ -90,9 +90,9 @@
     <None Include="_QueueItems\QueuedMethod.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{CDDAF88B-8726-469A-B906-16FD5EC99799}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\IRs\EcmaCil\EcmaCil.csproj">
       <Project>{AE684C98-F100-47AE-9C8C-E71BF8C9F8AA}</Project>

diff --git a/Users/Matthijs/Testing/MonoCecilToEcmaCil1/ReaderWithPlugSupport.cs b/Users/Matthijs/Testing/MonoCecilToEcmaCil1/ReaderWithPlugSupport.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using Mono.Cecil;
-using Cosmos.IL2CPU.API;
+using IL2CPU.API;
 
 namespace MonoCecilToEcmaCil1
 {

diff --git a/Users/Orvid/IL2CPURunner/IL2CPURunner.csproj b/Users/Orvid/IL2CPURunner/IL2CPURunner.csproj
@@ -84,9 +84,9 @@
       <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\..\..\IL2CPU\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU.X86\Cosmos.IL2CPU.X86.csproj">
       <Project>{63F7BFB9-419E-4965-B580-304B9C9FA7D8}</Project>

diff --git a/Users/Orvid/IL2CPURunner/Program.cs b/Users/Orvid/IL2CPURunner/Program.cs
@@ -26,7 +26,7 @@ static void Main(string[] args)
             System.Reflection.Assembly.Load("Cosmos.Debug.Kernel");
             System.Reflection.Assembly.Load("Cosmos.Debug.Kernel.Plugs");
             System.Reflection.Assembly.Load("Cosmos.IL2CPU");
-            System.Reflection.Assembly.Load("Cosmos.IL2CPU.API");
+            System.Reflection.Assembly.Load("IL2CPU.API");
             System.Reflection.Assembly.Load("Cosmos.IL2CPU.X86");
             System.Reflection.Assembly.Load("Cosmos.System");
             System.Reflection.Assembly.Load("Cosmos.System_Plugs");

diff --git a/Users/Orvid/Orvid.Graphics.Cosmos/GraphicsPlugs.cs b/Users/Orvid/Orvid.Graphics.Cosmos/GraphicsPlugs.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using Cosmos.IL2CPU.API;
+using IL2CPU.API;
 using CPUAll = Cosmos.Compiler.Assembler;
 using CPUx86 = Cosmos.Compiler.Assembler.X86;
 

diff --git a/Users/Orvid/Orvid.Graphics.Cosmos/Orvid.Graphics.Cosmos.csproj b/Users/Orvid/Orvid.Graphics.Cosmos/Orvid.Graphics.Cosmos.csproj
@@ -69,9 +69,9 @@
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Compiler.Assembler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\IL2CPU\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\..\..\IL2CPU\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Kernel\System\Cosmos.System\Cosmos.System.csproj">
       <Project>{DA50B9B2-0E95-4F0D-A3C8-79FC549301B5}</Project>

diff --git a/Users/Orvid/OrvidTestOS/AsmMouse.cs b/Users/Orvid/OrvidTestOS/AsmMouse.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Cosmos.IL2CPU.API;
+using IL2CPU.API;
 using Cosmos.Compiler.Assembler;
 using Cosmos.Compiler.Assembler.X86;
 using Cosmos.Core;

diff --git a/Users/Orvid/OrvidTestOS/OrvidKernel.csproj b/Users/Orvid/OrvidTestOS/OrvidKernel.csproj
@@ -55,9 +55,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\..\source\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System.csproj">
       <Project>{DA50B9B2-0E95-4F0D-A3C8-79FC549301B5}</Project>

diff --git a/Users/Orvid/OrvidTestOS/Plugs.cs b/Users/Orvid/OrvidTestOS/Plugs.cs
@@ -1,5 +1,5 @@
 using System;
-using Cosmos.IL2CPU.API;
+using IL2CPU.API;
 
 namespace GuessKernel
 {

diff --git a/Users/Orvid/PlugViewer/PlugTemplateDumper.cs b/Users/Orvid/PlugViewer/PlugTemplateDumper.cs
@@ -73,7 +73,7 @@ public static void Dump(Assembly asm)
                                 }
                                 strm.WriteLine("namespace Cosmos.Plugs");
                                 strm.WriteLine("{");
-                                strm.WriteLine("\t[Cosmos.IL2CPU.API.Plug(Target = typeof(" + t.Namespace + "." + t.Name + str + "), TargetFramework = Cosmos.IL2CPU.API.FrameworkVersion.v4_0)]");
+                                strm.WriteLine("\t[IL2CPU.API.Plug(Target = typeof(" + t.Namespace + "." + t.Name + str + "), TargetFramework = IL2CPU.API.FrameworkVersion.v4_0)]");
                                 strm.WriteLine("\tpublic static class " + t.FullName.Replace('.', '_') + "Impl" + genParams);
                                 strm.WriteLine("\t{");
                                 TypeNeedsPlugs = true;

diff --git a/Users/Pegasusplus/Cosmos.IL2CPU.Plugs/GeneralIntegerImpl/GeneralIntegerImpl.cs b/Users/Pegasusplus/Cosmos.IL2CPU.Plugs/GeneralIntegerImpl/GeneralIntegerImpl.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using System.Text;
-using Cosmos.IL2CPU.API;
+using IL2CPU.API;
 
 namespace Cosmos.IL2CPU.IL.CustomImplementations.System
 {

diff --git a/Users/Pegasusplus/Cosmos.IL2CPU.Plugs/GeneralIntegerImpl/GeneralIntegerImpl.csproj b/Users/Pegasusplus/Cosmos.IL2CPU.Plugs/GeneralIntegerImpl/GeneralIntegerImpl.csproj
@@ -24,9 +24,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\IL2CPU\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\..\..\..\IL2CPU\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Users/SSchocke/SSchockeTest/SSchockeTest.csproj b/Users/SSchocke/SSchockeTest/SSchockeTest.csproj
@@ -30,9 +30,9 @@
     <Compile Include="Map.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj">
+    <ProjectReference Include="..\..\source\IL2CPU.API\IL2CPU.API.csproj">
       <Project>{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}</Project>
-      <Name>Cosmos.IL2CPU.API</Name>
+      <Name>IL2CPU.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System.csproj">
       <Project>{DA50B9B2-0E95-4F0D-A3C8-79FC549301B5}</Project>

diff --git a/appveyor.yml b/appveyor.yml
@@ -35,7 +35,7 @@ build_script:
 
     dotnet publish source\Cosmos.Build.MSBuild -r win7-x86 -o "c:\CosmosRun\Build\VSIP\"
 
-    dotnet publish ..\IL2CPU\source\IL2CPU -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
+    dotnet publish ..\IL2CPU\source\IL2CPU.Compiler -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
 
 
     xcopy /Y "Build\VSIP\Cosmos.Debug.Kernel.*" "c:\CosmosRun\Kernel\"

diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -319,7 +319,7 @@ private void CompileCosmos() {
 
       Section("Publish Tools");
       Publish(Path.Combine(mSourcePath, "Cosmos.Build.MSBuild"), Path.Combine(xVsipDir, "MSBuild"));
-      Publish(Path.Combine(mSourcePath, "../../IL2CPU/source/IL2CPU"), Path.Combine(xVsipDir, "IL2CPU"));
+      Publish(Path.Combine(mSourcePath, "../../IL2CPU/source/IL2CPU.Compiler"), Path.Combine(xVsipDir, "IL2CPU"));
       Publish(Path.Combine(mCosmosPath, "Tools", "NASM"), Path.Combine(xVsipDir, "NASM"));
 
       Section("Pack Kernel");
@@ -338,7 +338,7 @@ private void CompileCosmos() {
       Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir);
       Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir);
       //
-      Pack(Path.Combine(mSourcePath, "../../IL2CPU/source/Cosmos.IL2CPU.API"), xNugetPkgDir);
+      Pack(Path.Combine(mSourcePath, "../../IL2CPU/source/IL2CPU.API"), xNugetPkgDir);
     }
 
     private void CopyTemplates() {

diff --git a/source/Cosmos.Common.ReadMe.html b/source/Cosmos.Common.ReadMe.html
diff --git a/source/Cosmos.Core/CPU.cs b/source/Cosmos.Core/CPU.cs
@@ -1,6 +1,6 @@
 using System;
 
-using Cosmos.IL2CPU.API.Attribs;
+using IL2CPU.API.Attribs;
 
 namespace Cosmos.Core
 {

diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-    <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
+    <ProjectReference Include="..\..\..\IL2CPU\source\IL2CPU.API\IL2CPU.API.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.Core/GCImplementation.cs b/source/Cosmos.Core/GCImplementation.cs
@@ -3,8 +3,8 @@
 #endif
 using System;
 using System.Diagnostics;
-using Cosmos.IL2CPU.API;
-using Cosmos.IL2CPU.API.Attribs;
+using IL2CPU.API;
+using IL2CPU.API.Attribs;
 
 namespace Cosmos.Core
 {

diff --git a/source/Cosmos.Core/INTs.cs b/source/Cosmos.Core/INTs.cs
@@ -1,6 +1,6 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-using Cosmos.IL2CPU.API.Attribs;
+using IL2CPU.API.Attribs;
 
 namespace Cosmos.Core {
     public class INTs {