diff --git a/src/TypeSystem/src/Common/AlignmentHelper.cs b/src/Common/src/TypeSystem/Common/AlignmentHelper.cs
similarity index 100%
rename from src/TypeSystem/src/Common/AlignmentHelper.cs
rename to src/Common/src/TypeSystem/Common/AlignmentHelper.cs
diff --git a/src/TypeSystem/src/Common/ArrayType.cs b/src/Common/src/TypeSystem/Common/ArrayType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/ArrayType.cs
rename to src/Common/src/TypeSystem/Common/ArrayType.cs
diff --git a/src/TypeSystem/src/Common/ByRefType.cs b/src/Common/src/TypeSystem/Common/ByRefType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/ByRefType.cs
rename to src/Common/src/TypeSystem/Common/ByRefType.cs
diff --git a/src/TypeSystem/src/Common/FieldDesc.cs b/src/Common/src/TypeSystem/Common/FieldDesc.cs
similarity index 100%
rename from src/TypeSystem/src/Common/FieldDesc.cs
rename to src/Common/src/TypeSystem/Common/FieldDesc.cs
diff --git a/src/TypeSystem/src/Common/FieldForInstantiatedType.cs b/src/Common/src/TypeSystem/Common/FieldForInstantiatedType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/FieldForInstantiatedType.cs
rename to src/Common/src/TypeSystem/Common/FieldForInstantiatedType.cs
diff --git a/src/TypeSystem/src/Common/FieldLayout.cs b/src/Common/src/TypeSystem/Common/FieldLayout.cs
similarity index 100%
rename from src/TypeSystem/src/Common/FieldLayout.cs
rename to src/Common/src/TypeSystem/Common/FieldLayout.cs
diff --git a/src/TypeSystem/src/Common/InstantiatedMethod.cs b/src/Common/src/TypeSystem/Common/InstantiatedMethod.cs
similarity index 100%
rename from src/TypeSystem/src/Common/InstantiatedMethod.cs
rename to src/Common/src/TypeSystem/Common/InstantiatedMethod.cs
diff --git a/src/TypeSystem/src/Common/InstantiatedType.cs b/src/Common/src/TypeSystem/Common/InstantiatedType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/InstantiatedType.cs
rename to src/Common/src/TypeSystem/Common/InstantiatedType.cs
diff --git a/src/TypeSystem/src/Common/MetadataType.cs b/src/Common/src/TypeSystem/Common/MetadataType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/MetadataType.cs
rename to src/Common/src/TypeSystem/Common/MetadataType.cs
diff --git a/src/TypeSystem/src/Common/MethodDesc.cs b/src/Common/src/TypeSystem/Common/MethodDesc.cs
similarity index 100%
rename from src/TypeSystem/src/Common/MethodDesc.cs
rename to src/Common/src/TypeSystem/Common/MethodDesc.cs
diff --git a/src/TypeSystem/src/Common/MethodForInstantiatedType.cs b/src/Common/src/TypeSystem/Common/MethodForInstantiatedType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/MethodForInstantiatedType.cs
rename to src/Common/src/TypeSystem/Common/MethodForInstantiatedType.cs
diff --git a/src/TypeSystem/src/Common/ParameterizedType.cs b/src/Common/src/TypeSystem/Common/ParameterizedType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/ParameterizedType.cs
rename to src/Common/src/TypeSystem/Common/ParameterizedType.cs
diff --git a/src/TypeSystem/src/Common/PointerType.cs b/src/Common/src/TypeSystem/Common/PointerType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/PointerType.cs
rename to src/Common/src/TypeSystem/Common/PointerType.cs
diff --git a/src/TypeSystem/src/Common/SignatureVariable.cs b/src/Common/src/TypeSystem/Common/SignatureVariable.cs
similarity index 100%
rename from src/TypeSystem/src/Common/SignatureVariable.cs
rename to src/Common/src/TypeSystem/Common/SignatureVariable.cs
diff --git a/src/TypeSystem/src/Common/TargetDetails.cs b/src/Common/src/TypeSystem/Common/TargetDetails.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TargetDetails.cs
rename to src/Common/src/TypeSystem/Common/TargetDetails.cs
diff --git a/src/TypeSystem/src/Common/ThreadSafeFlags.cs b/src/Common/src/TypeSystem/Common/ThreadSafeFlags.cs
similarity index 100%
rename from src/TypeSystem/src/Common/ThreadSafeFlags.cs
rename to src/Common/src/TypeSystem/Common/ThreadSafeFlags.cs
diff --git a/src/TypeSystem/src/Common/TypeCast.cs b/src/Common/src/TypeSystem/Common/TypeCast.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeCast.cs
rename to src/Common/src/TypeSystem/Common/TypeCast.cs
diff --git a/src/TypeSystem/src/Common/TypeDesc.MethodImpls.cs b/src/Common/src/TypeSystem/Common/TypeDesc.MethodImpls.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeDesc.MethodImpls.cs
rename to src/Common/src/TypeSystem/Common/TypeDesc.MethodImpls.cs
diff --git a/src/TypeSystem/src/Common/TypeDesc.cs b/src/Common/src/TypeSystem/Common/TypeDesc.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeDesc.cs
rename to src/Common/src/TypeSystem/Common/TypeDesc.cs
diff --git a/src/TypeSystem/src/Common/TypeFlags.cs b/src/Common/src/TypeSystem/Common/TypeFlags.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeFlags.cs
rename to src/Common/src/TypeSystem/Common/TypeFlags.cs
diff --git a/src/TypeSystem/src/Common/TypeHashingAlgorithms.cs b/src/Common/src/TypeSystem/Common/TypeHashingAlgorithms.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeHashingAlgorithms.cs
rename to src/Common/src/TypeSystem/Common/TypeHashingAlgorithms.cs
diff --git a/src/TypeSystem/src/Common/TypeSystemContext.cs b/src/Common/src/TypeSystem/Common/TypeSystemContext.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeSystemContext.cs
rename to src/Common/src/TypeSystem/Common/TypeSystemContext.cs
diff --git a/src/TypeSystem/src/Common/TypeSystemHelpers.cs b/src/Common/src/TypeSystem/Common/TypeSystemHelpers.cs
similarity index 100%
rename from src/TypeSystem/src/Common/TypeSystemHelpers.cs
rename to src/Common/src/TypeSystem/Common/TypeSystemHelpers.cs
diff --git a/src/TypeSystem/src/Common/VirtualFunctionResolution.cs b/src/Common/src/TypeSystem/Common/VirtualFunctionResolution.cs
similarity index 99%
rename from src/TypeSystem/src/Common/VirtualFunctionResolution.cs
rename to src/Common/src/TypeSystem/Common/VirtualFunctionResolution.cs
index 1eb9af26b1e..7384311acc6 100644
--- a/src/TypeSystem/src/Common/VirtualFunctionResolution.cs
+++ b/src/Common/src/TypeSystem/Common/VirtualFunctionResolution.cs
@@ -7,7 +7,7 @@
 
 namespace Internal.TypeSystem
 {
-    static class VirtualFunctionResolution
+    public static class VirtualFunctionResolution
     {
         class UnificationGroup
         {
diff --git a/src/TypeSystem/src/Common/WellKnownType.cs b/src/Common/src/TypeSystem/Common/WellKnownType.cs
similarity index 100%
rename from src/TypeSystem/src/Common/WellKnownType.cs
rename to src/Common/src/TypeSystem/Common/WellKnownType.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaField.cs b/src/Common/src/TypeSystem/Ecma/EcmaField.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaField.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaField.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaGenericParameter.cs b/src/Common/src/TypeSystem/Ecma/EcmaGenericParameter.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaGenericParameter.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaGenericParameter.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaMethod.cs b/src/Common/src/TypeSystem/Ecma/EcmaMethod.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaMethod.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaMethod.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaModule.cs b/src/Common/src/TypeSystem/Ecma/EcmaModule.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaModule.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaModule.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaSignatureParser.cs b/src/Common/src/TypeSystem/Ecma/EcmaSignatureParser.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaSignatureParser.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaSignatureParser.cs
diff --git a/src/TypeSystem/src/Ecma/EcmaType.cs b/src/Common/src/TypeSystem/Ecma/EcmaType.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/EcmaType.cs
rename to src/Common/src/TypeSystem/Ecma/EcmaType.cs
diff --git a/src/TypeSystem/src/Ecma/IMetadataStringDecoderProvider.cs b/src/Common/src/TypeSystem/Ecma/IMetadataStringDecoderProvider.cs
similarity index 100%
rename from src/TypeSystem/src/Ecma/IMetadataStringDecoderProvider.cs
rename to src/Common/src/TypeSystem/Ecma/IMetadataStringDecoderProvider.cs
diff --git a/src/TypeSystem/src/IL/EcmaMethodIL.cs b/src/Common/src/TypeSystem/IL/EcmaMethodIL.cs
similarity index 100%
rename from src/TypeSystem/src/IL/EcmaMethodIL.cs
rename to src/Common/src/TypeSystem/IL/EcmaMethodIL.cs
diff --git a/src/TypeSystem/src/IL/ILImporter.cs b/src/Common/src/TypeSystem/IL/ILImporter.cs
similarity index 100%
rename from src/TypeSystem/src/IL/ILImporter.cs
rename to src/Common/src/TypeSystem/IL/ILImporter.cs
diff --git a/src/TypeSystem/src/IL/ILOpcode.cs b/src/Common/src/TypeSystem/IL/ILOpcode.cs
similarity index 100%
rename from src/TypeSystem/src/IL/ILOpcode.cs
rename to src/Common/src/TypeSystem/IL/ILOpcode.cs
diff --git a/src/TypeSystem/src/IL/ILProvider.cs b/src/Common/src/TypeSystem/IL/ILProvider.cs
similarity index 100%
rename from src/TypeSystem/src/IL/ILProvider.cs
rename to src/Common/src/TypeSystem/IL/ILProvider.cs
diff --git a/src/TypeSystem/src/IL/InstantiatedMethodIL.cs b/src/Common/src/TypeSystem/IL/InstantiatedMethodIL.cs
similarity index 100%
rename from src/TypeSystem/src/IL/InstantiatedMethodIL.cs
rename to src/Common/src/TypeSystem/IL/InstantiatedMethodIL.cs
diff --git a/src/TypeSystem/src/IL/MethodIL.cs b/src/Common/src/TypeSystem/IL/MethodIL.cs
similarity index 100%
rename from src/TypeSystem/src/IL/MethodIL.cs
rename to src/Common/src/TypeSystem/IL/MethodIL.cs
diff --git a/src/TypeSystem/src/IL/Stubs/ArrayMethodILEmitter.cs b/src/Common/src/TypeSystem/IL/Stubs/ArrayMethodILEmitter.cs
similarity index 100%
rename from src/TypeSystem/src/IL/Stubs/ArrayMethodILEmitter.cs
rename to src/Common/src/TypeSystem/IL/Stubs/ArrayMethodILEmitter.cs
diff --git a/src/TypeSystem/src/IL/Stubs/DelegateThunks.cs b/src/Common/src/TypeSystem/IL/Stubs/DelegateThunks.cs
similarity index 100%
rename from src/TypeSystem/src/IL/Stubs/DelegateThunks.cs
rename to src/Common/src/TypeSystem/IL/Stubs/DelegateThunks.cs
diff --git a/src/TypeSystem/src/IL/Stubs/ILEmitter.cs b/src/Common/src/TypeSystem/IL/Stubs/ILEmitter.cs
similarity index 100%
rename from src/TypeSystem/src/IL/Stubs/ILEmitter.cs
rename to src/Common/src/TypeSystem/IL/Stubs/ILEmitter.cs
diff --git a/src/ILToNative.TypeSystem/src/ILToNative.TypeSystem.csproj b/src/ILToNative.TypeSystem/src/ILToNative.TypeSystem.csproj
new file mode 100644
index 00000000000..fc22f7d6cb1
--- /dev/null
+++ b/src/ILToNative.TypeSystem/src/ILToNative.TypeSystem.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Internal.TypeSystem</RootNamespace>
+    <AssemblyName>ILToNative.TypeSystem</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <CLSCompliant>false</CLSCompliant>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ExcludeResourcesImport>true</ExcludeResourcesImport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(CommonPath)\TypeSystem\Common\AlignmentHelper.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\ArrayType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\ByRefType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\FieldForInstantiatedType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\FieldLayout.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\InstantiatedMethod.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\InstantiatedType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\MetadataType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\MethodForInstantiatedType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\ParameterizedType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\PointerType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\SignatureVariable.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TargetDetails.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\ThreadSafeFlags.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeCast.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeFlags.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeHashingAlgorithms.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeSystemContext.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeSystemHelpers.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\WellKnownType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\FieldDesc.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\MethodDesc.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\VirtualFunctionResolution.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeDesc.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Common\TypeDesc.MethodImpls.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaField.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaGenericParameter.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaMethod.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaModule.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaSignatureParser.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaType.cs" />
+    <Compile Include="$(CommonPath)\TypeSystem\Ecma\IMetadataStringDecoderProvider.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/TypeSystem.Ecma/src/project.json b/src/ILToNative.TypeSystem/src/project.json
similarity index 93%
rename from src/TypeSystem.Ecma/src/project.json
rename to src/ILToNative.TypeSystem/src/project.json
index 96cd130e9f1..822be1042b2 100644
--- a/src/TypeSystem.Ecma/src/project.json
+++ b/src/ILToNative.TypeSystem/src/project.json
@@ -14,7 +14,7 @@
     "System.Threading": "4.0.0",
     "System.Text.Encoding.Extensions": "4.0.0",
     "System.Reflection.Extensions": "4.0.0",
-    "System.Reflection.Metadata": "1.0.22"
+    "System.Reflection.Metadata": "1.0.22",
   },
   "frameworks": {
     "dotnet": {}
diff --git a/src/TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj b/src/ILToNative.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj
similarity index 100%
rename from src/TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj
rename to src/ILToNative.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj
diff --git a/src/TypeSystem/tests/CoreTestAssembly/InstanceFieldLayout.cs b/src/ILToNative.TypeSystem/tests/CoreTestAssembly/InstanceFieldLayout.cs
similarity index 100%
rename from src/TypeSystem/tests/CoreTestAssembly/InstanceFieldLayout.cs
rename to src/ILToNative.TypeSystem/tests/CoreTestAssembly/InstanceFieldLayout.cs
diff --git a/src/TypeSystem/tests/CoreTestAssembly/Platform.cs b/src/ILToNative.TypeSystem/tests/CoreTestAssembly/Platform.cs
similarity index 100%
rename from src/TypeSystem/tests/CoreTestAssembly/Platform.cs
rename to src/ILToNative.TypeSystem/tests/CoreTestAssembly/Platform.cs
diff --git a/src/TypeSystem/tests/CoreTestAssembly/StaticFieldLayout.cs b/src/ILToNative.TypeSystem/tests/CoreTestAssembly/StaticFieldLayout.cs
similarity index 100%
rename from src/TypeSystem/tests/CoreTestAssembly/StaticFieldLayout.cs
rename to src/ILToNative.TypeSystem/tests/CoreTestAssembly/StaticFieldLayout.cs
diff --git a/src/TypeSystem/tests/InstanceFieldLayoutTests.cs b/src/ILToNative.TypeSystem/tests/InstanceFieldLayoutTests.cs
similarity index 100%
rename from src/TypeSystem/tests/InstanceFieldLayoutTests.cs
rename to src/ILToNative.TypeSystem/tests/InstanceFieldLayoutTests.cs
diff --git a/src/TypeSystem/tests/StaticFieldLayoutTests.cs b/src/ILToNative.TypeSystem/tests/StaticFieldLayoutTests.cs
similarity index 100%
rename from src/TypeSystem/tests/StaticFieldLayoutTests.cs
rename to src/ILToNative.TypeSystem/tests/StaticFieldLayoutTests.cs
diff --git a/src/TypeSystem/tests/TestTypeSystemContext.cs b/src/ILToNative.TypeSystem/tests/TestTypeSystemContext.cs
similarity index 100%
rename from src/TypeSystem/tests/TestTypeSystemContext.cs
rename to src/ILToNative.TypeSystem/tests/TestTypeSystemContext.cs
diff --git a/src/TypeSystem/tests/TypeSystem.Tests.csproj b/src/ILToNative.TypeSystem/tests/TypeSystem.Tests.csproj
similarity index 86%
rename from src/TypeSystem/tests/TypeSystem.Tests.csproj
rename to src/ILToNative.TypeSystem/tests/TypeSystem.Tests.csproj
index b01fd936660..ed79dc5c56c 100644
--- a/src/TypeSystem/tests/TypeSystem.Tests.csproj
+++ b/src/ILToNative.TypeSystem/tests/TypeSystem.Tests.csproj
@@ -16,13 +16,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\TypeSystem.csproj">
+    <ProjectReference Include="..\src\ILToNative.TypeSystem.csproj">
       <Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
-      <Name>TypeSystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\TypeSystem.Ecma\src\TypeSystem.Ecma.csproj">
-      <Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
-      <Name>TypeSystem</Name>
+      <Name>ILToNative.TypeSystem</Name>
     </ProjectReference>
 
     <!-- Make sure the test data gets built -->
diff --git a/src/TypeSystem/tests/project.json b/src/ILToNative.TypeSystem/tests/project.json
similarity index 100%
rename from src/TypeSystem/tests/project.json
rename to src/ILToNative.TypeSystem/tests/project.json
diff --git a/src/ILToNative/ILToNative.sln b/src/ILToNative/ILToNative.sln
index 391aad9cf37..6e6e9e5eafe 100644
--- a/src/ILToNative/ILToNative.sln
+++ b/src/ILToNative/ILToNative.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILToNative", "src\ILToNativ
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "repro", "repro\repro.csproj", "{FBA029C3-B184-4457-AEEC-38D0C2523067}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILToNative.TypeSystem", "..\ILToNative.TypeSystem\src\ILToNative.TypeSystem.csproj", "{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/ILToNative/src/ILToNative.csproj b/src/ILToNative/src/ILToNative.csproj
index 81e15e1be9b..49541d09f9f 100644
--- a/src/ILToNative/src/ILToNative.csproj
+++ b/src/ILToNative/src/ILToNative.csproj
@@ -34,6 +34,12 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ILToNative.TypeSystem\src\ILToNative.TypeSystem.csproj">
+      <Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
+      <Name>ILToNative.TypeSystem</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Compiler\AsmWriter.cs" />
     <Compile Include="Compiler\Compilation.cs" />
@@ -59,131 +65,31 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\TypeSystem\src\Common\AlignmentHelper.cs">
-      <Link>TypeSystem\AlignmentHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\ArrayType.cs">
-      <Link>TypeSystem\ArrayType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\ByRefType.cs">
-      <Link>TypeSystem\ByRefType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\FieldForInstantiatedType.cs">
-      <Link>TypeSystem\FieldForInstantiatedType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\FieldLayout.cs">
-      <Link>TypeSystem\FieldLayout.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\InstantiatedMethod.cs">
-      <Link>TypeSystem\InstantiatedMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\InstantiatedType.cs">
-      <Link>TypeSystem\InstantiatedType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\MetadataType.cs">
-      <Link>TypeSystem\MetadataType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\MethodForInstantiatedType.cs">
-      <Link>TypeSystem\MethodForInstantiatedType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\ParameterizedType.cs">
-      <Link>TypeSystem\ParameterizedType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\PointerType.cs">
-      <Link>TypeSystem\PointerType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\SignatureVariable.cs">
-      <Link>TypeSystem\SignatureVariable.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TargetDetails.cs">
-      <Link>TypeSystem\TargetDetails.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\ThreadSafeFlags.cs">
-      <Link>TypeSystem\ThreadSafeFlags.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeCast.cs">
-      <Link>TypeSystem\TypeCast.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeFlags.cs">
-      <Link>TypeSystem\TypeFlags.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeHashingAlgorithms.cs">
-      <Link>TypeSystem\TypeHashingAlgorithms.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeSystemContext.cs">
-      <Link>TypeSystem\TypeSystemContext.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeSystemHelpers.cs">
-      <Link>TypeSystem\TypeSystemHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\WellKnownType.cs">
-      <Link>TypeSystem\WellKnownType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\FieldDesc.cs">
-      <Link>TypeSystem\FieldDesc.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\MethodDesc.cs">
-      <Link>TypeSystem\MethodDesc.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeDesc.cs">
-      <Link>TypeSystem\TypeDesc.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\TypeDesc.MethodImpls.cs">
-      <Link>TypeSystem\TypeDesc.MethodImpls.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Common\VirtualFunctionResolution.cs">
-      <Link>TypeSystem\VirtualFunctionResolution.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaField.cs">
-      <Link>TypeSystem.Ecma\EcmaField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaGenericParameter.cs">
-      <Link>TypeSystem.Ecma\EcmaGenericParameter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaMethod.cs">
-      <Link>TypeSystem.Ecma\EcmaMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaModule.cs">
-      <Link>TypeSystem.Ecma\EcmaModule.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaSignatureParser.cs">
-      <Link>TypeSystem.Ecma\EcmaSignatureParser.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaType.cs">
-      <Link>TypeSystem.Ecma\EcmaType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\TypeSystem\src\Ecma\IMetadataStringDecoderProvider.cs">
-      <Link>TypeSystem.Ecma\IMetadataStringDecoderProvider.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\TypeSystem\src\IL\EcmaMethodIL.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\EcmaMethodIL.cs">
       <Link>IL\EcmaMethodIL.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\ILOpcode.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\ILOpcode.cs">
       <Link>IL\ILOpcode.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\ILProvider.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\ILProvider.cs">
       <Link>IL\ILProvider.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\InstantiatedMethodIL.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\InstantiatedMethodIL.cs">
       <Link>IL\InstantiatedMethodIL.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\MethodIL.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\MethodIL.cs">
       <Link>IL\MethodIL.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\ILImporter.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\ILImporter.cs">
       <Link>IL\ILImporter.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\Stubs\ArrayMethodILEmitter.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\ArrayMethodILEmitter.cs">
       <Link>IL\Stubs\ArrayMethodILEmitter.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\Stubs\DelegateThunks.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\DelegateThunks.cs">
       <Link>IL\Stubs\DelegateThunks.cs</Link>
     </Compile>
-    <Compile Include="..\..\TypeSystem\src\IL\Stubs\ILEmitter.cs">
+    <Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\ILEmitter.cs">
       <Link>IL\Stubs\ILEmitter.cs</Link>
     </Compile>
   </ItemGroup>
diff --git a/src/TypeSystem.Ecma/src/TypeSystem.Ecma.csproj b/src/TypeSystem.Ecma/src/TypeSystem.Ecma.csproj
deleted file mode 100644
index 4901fefeb32..00000000000
--- a/src/TypeSystem.Ecma/src/TypeSystem.Ecma.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{05F88F48-EF79-4866-8CAF-870BD1949196}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Internal.TypeSystem.Ecma</RootNamespace>
-    <AssemblyName>TypeSystem.Ecma</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <CLSCompliant>false</CLSCompliant>
-    <ExcludeResourcesImport>true</ExcludeResourcesImport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaField.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaGenericParameter.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaMethod.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaModule.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaSignatureParser.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\EcmaType.cs" />
-    <Compile Include="..\..\TypeSystem\src\Ecma\IMetadataStringDecoderProvider.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\TypeSystem\src\TypeSystem.csproj">
-      <Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
-      <Name>TypeSystem</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/TypeSystem/src/TypeSystem.csproj b/src/TypeSystem/src/TypeSystem.csproj
deleted file mode 100644
index bde48dae4e8..00000000000
--- a/src/TypeSystem/src/TypeSystem.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Internal.TypeSystem</RootNamespace>
-    <AssemblyName>TypeSystem</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <CLSCompliant>false</CLSCompliant>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ExcludeResourcesImport>true</ExcludeResourcesImport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Common\AlignmentHelper.cs" />
-    <Compile Include="Common\ArrayType.cs" />
-    <Compile Include="Common\ByRefType.cs" />
-    <Compile Include="Common\FieldForInstantiatedType.cs" />
-    <Compile Include="Common\FieldLayout.cs" />
-    <Compile Include="Common\InstantiatedMethod.cs" />
-    <Compile Include="Common\InstantiatedType.cs" />
-    <Compile Include="Common\MetadataType.cs" />
-    <Compile Include="Common\MethodForInstantiatedType.cs" />
-    <Compile Include="Common\ParameterizedType.cs" />
-    <Compile Include="Common\PointerType.cs" />
-    <Compile Include="Common\SignatureVariable.cs" />
-    <Compile Include="Common\TargetDetails.cs" />
-    <Compile Include="Common\ThreadSafeFlags.cs" />
-    <Compile Include="Common\TypeCast.cs" />
-    <Compile Include="Common\TypeFlags.cs" />
-    <Compile Include="Common\TypeHashingAlgorithms.cs" />
-    <Compile Include="Common\TypeSystemContext.cs" />
-    <Compile Include="Common\TypeSystemHelpers.cs" />
-    <Compile Include="Common\WellKnownType.cs" />
-    <Compile Include="Common\FieldDesc.cs" />
-    <Compile Include="Common\MethodDesc.cs" />
-    <Compile Include="Common\VirtualFunctionResolution.cs" />
-    <Compile Include="Common\TypeDesc.cs" />
-    <Compile Include="Common\TypeDesc.MethodImpls.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/TypeSystem/src/project.json b/src/TypeSystem/src/project.json
deleted file mode 100644
index 5672802f953..00000000000
--- a/src/TypeSystem/src/project.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime": "4.0.0",
-    "System.Resources.ResourceManager": "4.0.0",
-    "System.Reflection.Primitives": "4.0.0",
-    "System.Diagnostics.Debug": "4.0.0",
-    "System.IO": "4.0.0",
-    "System.Collections.Immutable": "1.1.37",
-    "System.Collections": "4.0.0",
-    "System.Text.Encoding": "4.0.0",
-    "System.Runtime.InteropServices": "4.0.0",
-    "System.Reflection": "4.0.0",
-    "System.Runtime.Extensions": "4.0.0",
-    "System.Threading": "4.0.0",
-    "System.Text.Encoding.Extensions": "4.0.0",
-    "System.Reflection.Extensions": "4.0.0"
-  },
-  "frameworks": {
-    "dotnet": {}
-  }
-}
\ No newline at end of file