diff --git a/Microsoft.Extensions.AspNet.sln b/Microsoft.Extensions.AspNet.sln
index 2eca9d6..f8a92d5 100644
--- a/Microsoft.Extensions.AspNet.sln
+++ b/Microsoft.Extensions.AspNet.sln
@@ -32,7 +32,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Hosting.Sy
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Hosting.SystemWeb.WebApi", "src\Microsoft.AspNet.Hosting.SystemWeb.WebApi\Microsoft.AspNet.Hosting.SystemWeb.WebApi.csproj", "{556F5E46-6510-41FA-9EA6-A72834BAAC2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Hosting", "src\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.csproj", "{1B29EA7F-229D-463D-9227-4D7AE99B3FFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Hosting.Abstractions", "src\Microsoft.AspNet.Hosting.Abstractions\Microsoft.AspNet.Hosting.Abstractions.csproj", "{1B29EA7F-229D-463D-9227-4D7AE99B3FFA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/README.md b/README.md
index 22e4987..0c69b3f 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ This is untested code.
 ## What's included?
 
 * Hosting
-  * [Hosting Abstractions for ASP.NET](src/Microsoft.AspNet.Hosting.HttpRuntime.Abstractions)
-  * [Hosting implementations for ASP.NET](src/Microsoft.AspNet.Hosting.HttpRuntime)
+  * [Hosting Abstractions for ASP.NET](src/Microsoft.AspNet.Hosting.Abstractions)
+  * [Hosting implementations for ASP.NET](src/Microsoft.AspNet.Hosting.SystemWeb)
     * Supports
       * Web Forms
       * Master Pages
@@ -22,11 +22,11 @@ This is untested code.
       * Configuration
       * Logging
 * MVC
-  * [Hosting Abstractions for ASP.NET MVC](src/Microsoft.AspNet.Hosting.HttpRuntime.Mvc.Abstractions)
-  * [Hosting implementations for ASP.NET MVC](src/Microsoft.AspNet.Hosting.HttpRuntime.Mvc)
+  * [Hosting Abstractions for ASP.NET MVC](src/Microsoft.AspNet.Hosting.SystemWeb.Mvc.Abstractions)
+  * [Hosting implementations for ASP.NET MVC](src/Microsoft.AspNet.Hosting.SystemWeb.Mvc)
 * Web API
-  * [Hosting Abstractions for ASP.NET Web API](src/Microsoft.AspNet.Hosting.HttpRuntime.WebApi.Abstractions)
-  * [Hosting implementations for ASP.NET Web API](src/Microsoft.AspNet.Hosting.HttpRuntime.WebApi)
+  * [Hosting Abstractions for ASP.NET Web API](src/Microsoft.AspNet.Hosting.SystemWeb.WebApi.Abstractions)
+  * [Hosting implementations for ASP.NET Web API](src/Microsoft.AspNet.Hosting.SystemWeb.WebApi)
 
 # Demo application
 
diff --git a/demo/SampleWebApplication/SampleWebApplication.csproj b/demo/SampleWebApplication/SampleWebApplication.csproj
index 5a62b28..1febdd7 100644
--- a/demo/SampleWebApplication/SampleWebApplication.csproj
+++ b/demo/SampleWebApplication/SampleWebApplication.csproj
@@ -427,7 +427,7 @@
       <Project>{ff7a9ce8-19bb-4dc9-81d0-ff5eb309db72}</Project>
       <Name>Microsoft.AspNet.Hosting.SystemWeb</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.csproj">
+    <ProjectReference Include="..\..\src\Microsoft.AspNet.Hosting.Abstractions\Microsoft.AspNet.Hosting.Abstractions.csproj">
       <Project>{1b29ea7f-229d-463d-9227-4d7ae99b3ffa}</Project>
       <Name>Microsoft.AspNet.Hosting</Name>
     </ProjectReference>
diff --git a/src/Microsoft.AspNet.Hosting/IWebHostEnvironment.cs b/src/Microsoft.AspNet.Hosting.Abstractions/IWebHostEnvironment.cs
similarity index 100%
rename from src/Microsoft.AspNet.Hosting/IWebHostEnvironment.cs
rename to src/Microsoft.AspNet.Hosting.Abstractions/IWebHostEnvironment.cs
diff --git a/src/Microsoft.AspNet.Hosting/Microsoft.AspNet.Hosting.csproj b/src/Microsoft.AspNet.Hosting.Abstractions/Microsoft.AspNet.Hosting.Abstractions.csproj
similarity index 100%
rename from src/Microsoft.AspNet.Hosting/Microsoft.AspNet.Hosting.csproj
rename to src/Microsoft.AspNet.Hosting.Abstractions/Microsoft.AspNet.Hosting.Abstractions.csproj
diff --git a/src/Microsoft.AspNet.Hosting.SystemWeb.Mvc/Microsoft.AspNet.Hosting.SystemWeb.Mvc.csproj b/src/Microsoft.AspNet.Hosting.SystemWeb.Mvc/Microsoft.AspNet.Hosting.SystemWeb.Mvc.csproj
index e0ca76d..527187b 100644
--- a/src/Microsoft.AspNet.Hosting.SystemWeb.Mvc/Microsoft.AspNet.Hosting.SystemWeb.Mvc.csproj
+++ b/src/Microsoft.AspNet.Hosting.SystemWeb.Mvc/Microsoft.AspNet.Hosting.SystemWeb.Mvc.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNet.Hosting.SystemWeb.Mvc.Abstractiions\Microsoft.AspNet.Hosting.SystemWeb.Mvc.Abstractiions.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNet.Hosting.SystemWeb.WebApi/Microsoft.AspNet.Hosting.SystemWeb.WebApi.csproj b/src/Microsoft.AspNet.Hosting.SystemWeb.WebApi/Microsoft.AspNet.Hosting.SystemWeb.WebApi.csproj
index c859010..fe0b721 100644
--- a/src/Microsoft.AspNet.Hosting.SystemWeb.WebApi/Microsoft.AspNet.Hosting.SystemWeb.WebApi.csproj
+++ b/src/Microsoft.AspNet.Hosting.SystemWeb.WebApi/Microsoft.AspNet.Hosting.SystemWeb.WebApi.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNet.Hosting.SystemWeb.WebApi.Abstractiions\Microsoft.AspNet.Hosting.SystemWeb.WebApi.Abstractiions.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNet.Hosting.SystemWeb/Microsoft.AspNet.Hosting.SystemWeb.csproj b/src/Microsoft.AspNet.Hosting.SystemWeb/Microsoft.AspNet.Hosting.SystemWeb.csproj
index 43a1754..2e0af7c 100644
--- a/src/Microsoft.AspNet.Hosting.SystemWeb/Microsoft.AspNet.Hosting.SystemWeb.csproj
+++ b/src/Microsoft.AspNet.Hosting.SystemWeb/Microsoft.AspNet.Hosting.SystemWeb.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>