diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index a5526ab..9bb8d3e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -3,8 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="IvAt.CommonFramework" Version="2.1.5" />
-    <PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.5" />
+    <PackageVersion Include="IvAt.CommonFramework" Version="2.1.6" />
+    <PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.6" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
diff --git a/src/GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj b/src/GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj
index 5ab8840..982009d 100644
--- a/src/GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj
+++ b/src/GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\GenericQueryable.EntityFramework\GenericQueryable.EntityFramework.csproj" />
-    <ProjectReference Include="..\GenericQueryable\GenericQueryable.csproj" />
   </ItemGroup>
 
 
diff --git a/src/GenericQueryable/Fetching/FetchRuleHeader.cs b/src/GenericQueryable.Runtime/Fetching/FetchRuleHeader.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/FetchRuleHeader.cs
rename to src/GenericQueryable.Runtime/Fetching/FetchRuleHeader.cs
diff --git a/src/GenericQueryable/Fetching/FetchRuleHeaderExpander.cs b/src/GenericQueryable.Runtime/Fetching/FetchRuleHeaderExpander.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/FetchRuleHeaderExpander.cs
rename to src/GenericQueryable.Runtime/Fetching/FetchRuleHeaderExpander.cs
diff --git a/src/GenericQueryable/Fetching/FetchRuleHeaderInfo.cs b/src/GenericQueryable.Runtime/Fetching/FetchRuleHeaderInfo.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/FetchRuleHeaderInfo.cs
rename to src/GenericQueryable.Runtime/Fetching/FetchRuleHeaderInfo.cs
diff --git a/src/GenericQueryable/Fetching/IFetchRuleExpander.cs b/src/GenericQueryable.Runtime/Fetching/IFetchRuleExpander.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/IFetchRuleExpander.cs
rename to src/GenericQueryable.Runtime/Fetching/IFetchRuleExpander.cs
diff --git a/src/GenericQueryable/Fetching/RootFetchRuleExpander.cs b/src/GenericQueryable.Runtime/Fetching/RootFetchRuleExpander.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/RootFetchRuleExpander.cs
rename to src/GenericQueryable.Runtime/Fetching/RootFetchRuleExpander.cs
diff --git a/src/GenericQueryable.Runtime/GenericQueryable.Runtime.csproj b/src/GenericQueryable.Runtime/GenericQueryable.Runtime.csproj
new file mode 100644
index 0000000..6b15324
--- /dev/null
+++ b/src/GenericQueryable.Runtime/GenericQueryable.Runtime.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageId>IvAt.GenericQueryable.Runtime</PackageId>
+    <RootNamespace>GenericQueryable</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/GenericQueryable.slnx b/src/GenericQueryable.slnx
index b5ca9cf..b8e647b 100644
--- a/src/GenericQueryable.slnx
+++ b/src/GenericQueryable.slnx
@@ -6,6 +6,7 @@
     <File Path="__SolutionItems/CommonAssemblyInfo.cs" />
   </Folder>
   <Project Path="GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj" />
+  <Project Path="GenericQueryable.Runtime/GenericQueryable.Runtime.csproj" />
   <Project Path="GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj" />
   <Project Path="GenericQueryable/GenericQueryable.csproj" />
   <Project Path="GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj" />
diff --git a/src/GenericQueryable/GenericQueryable.csproj b/src/GenericQueryable/GenericQueryable.csproj
index 5b18b6a..9bd2156 100644
--- a/src/GenericQueryable/GenericQueryable.csproj
+++ b/src/GenericQueryable/GenericQueryable.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
+    <ProjectReference Include="..\GenericQueryable.Runtime\GenericQueryable.Runtime.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
index 8637ea4..5e111df 100644
--- a/src/__SolutionItems/CommonAssemblyInfo.cs
+++ b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -3,7 +3,7 @@
 [assembly: AssemblyProduct("GenericQueryable")]
 [assembly: AssemblyCompany("IvAt")]
 
-[assembly: AssemblyVersion("2.1.5.0")]
+[assembly: AssemblyVersion("2.1.6.0")]
 [assembly: AssemblyInformationalVersion("changes at build")]
 
 #if DEBUG