diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln
index 18c4d05c9f..aa66e840ca 100644
--- a/HttpAbstractions.sln
+++ b/HttpAbstractions.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.22807.0
+VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5A15F1C-885A-452A-A731-B0173DDBD913}"
EndProject
@@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F31FF137-3
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http", "src\Microsoft.AspNet.Http\Microsoft.AspNet.Http.xproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core", "src\Microsoft.AspNet.Http.Core\Microsoft.AspNet.Http.Core.xproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Abstractions", "src\Microsoft.AspNet.Http.Abstractions\Microsoft.AspNet.Http.Abstractions.xproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Interfaces", "src\Microsoft.AspNet.Http.Interfaces\Microsoft.AspNet.Http.Interfaces.xproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Features", "src\Microsoft.AspNet.Http.Features\Microsoft.AspNet.Http.Features.xproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel", "src\Microsoft.AspNet.FeatureModel\Microsoft.AspNet.FeatureModel.xproj", "{32A4C918-30EE-41DB-8E26-8A3BB88ED231}"
EndProject
@@ -19,7 +19,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Tests
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel.Tests", "test\Microsoft.AspNet.FeatureModel.Tests\Microsoft.AspNet.FeatureModel.Tests.xproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core.Tests", "test\Microsoft.AspNet.Http.Core.Tests\Microsoft.AspNet.Http.Core.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Abstractions.Tests", "test\Microsoft.AspNet.Http.Abstractions.Tests\Microsoft.AspNet.Http.Abstractions.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Owin", "src\Microsoft.AspNet.Owin\Microsoft.AspNet.Owin.xproj", "{59BED991-F207-48ED-B24C-0A1D9C986C01}"
EndProject
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateResult.cs b/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticateResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateResult.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticateResult.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs b/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationDescription.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationDescription.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationManager.cs b/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationManager.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationManager.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs b/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationProperties.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationProperties.cs
diff --git a/src/Microsoft.AspNet.Http.Core/ConnectionInfo.cs b/src/Microsoft.AspNet.Http.Abstractions/ConnectionInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/ConnectionInfo.cs
rename to src/Microsoft.AspNet.Http.Abstractions/ConnectionInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Core/CookieOptions.cs b/src/Microsoft.AspNet.Http.Abstractions/CookieOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/CookieOptions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/CookieOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapMiddleware.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapOptions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapOptions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapWhenExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapWhenMiddleware.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenMiddleware.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/MapWhenOptions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/MapWhenOptions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/RunExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/RunExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/RunExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Extensions/UseExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Extensions/UseExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/UseExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/FragmentString.cs b/src/Microsoft.AspNet.Http.Abstractions/FragmentString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/FragmentString.cs
rename to src/Microsoft.AspNet.Http.Abstractions/FragmentString.cs
diff --git a/src/Microsoft.AspNet.Http.Core/HostString.cs b/src/Microsoft.AspNet.Http.Abstractions/HostString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/HostString.cs
rename to src/Microsoft.AspNet.Http.Abstractions/HostString.cs
diff --git a/src/Microsoft.AspNet.Http.Core/HttpContext.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/HttpContext.cs
rename to src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
diff --git a/src/Microsoft.AspNet.Http.Core/HttpRequest.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpRequest.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/HttpRequest.cs
rename to src/Microsoft.AspNet.Http.Abstractions/HttpRequest.cs
diff --git a/src/Microsoft.AspNet.Http.Core/HttpResponse.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/HttpResponse.cs
rename to src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs
diff --git a/src/Microsoft.AspNet.Http.Core/HttpResponseWritingExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpResponseWritingExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/HttpResponseWritingExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/HttpResponseWritingExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IApplicationBuilder.cs b/src/Microsoft.AspNet.Http.Abstractions/IApplicationBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IApplicationBuilder.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IApplicationBuilder.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IFormCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IFormCollection.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IFormFile.cs b/src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IFormFile.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IFormFileCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/IFormFileCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IFormFileCollection.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IFormFileCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IHeaderDictionary.cs b/src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IHeaderDictionary.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IReadableStringCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IReadableStringCollection.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Core/IResponseCookies.cs b/src/Microsoft.AspNet.Http.Abstractions/IResponseCookies.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/IResponseCookies.cs
rename to src/Microsoft.AspNet.Http.Abstractions/IResponseCookies.cs
diff --git a/src/Microsoft.AspNet.Http.Core/ISessionCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/ISessionCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/ISessionCollection.cs
rename to src/Microsoft.AspNet.Http.Abstractions/ISessionCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj b/src/Microsoft.AspNet.Http.Abstractions/Microsoft.AspNet.Http.Abstractions.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Microsoft.AspNet.Http.Core.xproj
rename to src/Microsoft.AspNet.Http.Abstractions/Microsoft.AspNet.Http.Abstractions.xproj
diff --git a/src/Microsoft.AspNet.Http.Core/PathString.cs b/src/Microsoft.AspNet.Http.Abstractions/PathString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/PathString.cs
rename to src/Microsoft.AspNet.Http.Abstractions/PathString.cs
diff --git a/src/Microsoft.AspNet.Http.Core/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Core/QueryString.cs b/src/Microsoft.AspNet.Http.Abstractions/QueryString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/QueryString.cs
rename to src/Microsoft.AspNet.Http.Abstractions/QueryString.cs
diff --git a/src/Microsoft.AspNet.Http.Core/RequestDelegate.cs b/src/Microsoft.AspNet.Http.Abstractions/RequestDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/RequestDelegate.cs
rename to src/Microsoft.AspNet.Http.Abstractions/RequestDelegate.cs
diff --git a/src/Microsoft.AspNet.Http.Core/WebSocketManager.cs b/src/Microsoft.AspNet.Http.Abstractions/WebSocketManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/WebSocketManager.cs
rename to src/Microsoft.AspNet.Http.Abstractions/WebSocketManager.cs
diff --git a/src/Microsoft.AspNet.Http.Core/project.json b/src/Microsoft.AspNet.Http.Abstractions/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http.Core/project.json
rename to src/Microsoft.AspNet.Http.Abstractions/project.json
diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json
index 4055d3b43d..2656106881 100644
--- a/src/Microsoft.AspNet.Http.Extensions/project.json
+++ b/src/Microsoft.AspNet.Http.Extensions/project.json
@@ -2,8 +2,8 @@
"version": "1.0.0-*",
"description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.",
"dependencies": {
- "Microsoft.AspNet.Http.Core": "1.0.0-*",
- "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
+ "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
+ "Microsoft.AspNet.Http.Features": "1.0.0-*",
"Microsoft.Framework.DependencyInjection.Interfaces": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Framework.WebEncoders.Core": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/AuthenticateContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/AuthenticateContext.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/ChallengeContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/ChallengeContext.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/DescribeSchemesContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/DescribeSchemesContext.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/IAuthenticationHandler.cs b/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/IAuthenticationHandler.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/IHttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/IHttpAuthenticationFeature.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/SignInContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/SignInContext.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Authentication/SignOutContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Authentication/SignOutContext.cs
rename to src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/IRequestIdentifierFeature.cs b/src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/IRequestIdentifierFeature.cs
rename to src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISession.cs b/src/Microsoft.AspNet.Http.Features/ISession.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/ISession.cs
rename to src/Microsoft.AspNet.Http.Features/ISession.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs b/src/Microsoft.AspNet.Http.Features/ISessionFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs
rename to src/Microsoft.AspNet.Http.Features/ISessionFactory.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs b/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs
rename to src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/ITlsConnectionFeature.cs b/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/ITlsConnectionFeature.cs
rename to src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs b/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs
rename to src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Microsoft.AspNet.Http.Interfaces.xproj b/src/Microsoft.AspNet.Http.Features/Microsoft.AspNet.Http.Features.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Microsoft.AspNet.Http.Interfaces.xproj
rename to src/Microsoft.AspNet.Http.Features/Microsoft.AspNet.Http.Features.xproj
diff --git a/src/Microsoft.AspNet.Http.Interfaces/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Http.Features/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNet.Http.Features/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/WebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/WebSocketAcceptContext.cs
rename to src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
diff --git a/src/Microsoft.AspNet.Http.Interfaces/project.json b/src/Microsoft.AspNet.Http.Features/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http.Interfaces/project.json
rename to src/Microsoft.AspNet.Http.Features/project.json
diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json
index b554c9eabe..0188f4ff3d 100644
--- a/src/Microsoft.AspNet.Http/project.json
+++ b/src/Microsoft.AspNet.Http/project.json
@@ -3,8 +3,8 @@
"description": "ASP.NET 5 HTTP feature implementations.",
"dependencies": {
"Microsoft.AspNet.FeatureModel": "1.0.0-*",
- "Microsoft.AspNet.Http.Core": "1.0.0-*",
- "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
+ "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
+ "Microsoft.AspNet.Http.Features": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Net.Http.Headers": "1.0.0-*"
diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj b/test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj
index 6bd0b3bd59..0e9350ca4e 100644
--- a/test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj
+++ b/test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/HttpResponseWritingExtensionsTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Core.Tests/HttpResponseWritingExtensionsTests.cs
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Core.Tests/MapPathMiddlewareTests.cs
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Core.Tests/MapPredicateMiddlewareTests.cs
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj b/test/Microsoft.AspNet.Http.Abstractions.Tests/Microsoft.AspNet.Http.Abstractions.Tests.xproj
similarity index 91%
rename from test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/Microsoft.AspNet.Http.Abstractions.Tests.xproj
index 424d3a7f9b..7989ec74c0 100644
--- a/test/Microsoft.AspNet.Http.Core.Tests/Microsoft.AspNet.Http.Core.Tests.xproj
+++ b/test/Microsoft.AspNet.Http.Abstractions.Tests/Microsoft.AspNet.Http.Abstractions.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/PathStringTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/PathStringTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Core.Tests/PathStringTests.cs
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/PathStringTests.cs
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/project.json b/test/Microsoft.AspNet.Http.Abstractions.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Http.Core.Tests/project.json
rename to test/Microsoft.AspNet.Http.Abstractions.Tests/project.json
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj b/test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj
index 38294666a7..258c09d86a 100644
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj b/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj
index c438cb7050..278ef825da 100644
--- a/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj
+++ b/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj b/test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj
index 0a5d033908..a923e01d9a 100644
--- a/test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj
+++ b/test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj b/test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj
index 8476f5e9a6..0042456e89 100644
--- a/test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj
+++ b/test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj b/test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj
index d456c7e180..9b0698e3cc 100644
--- a/test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj
+++ b/test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.xproj b/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.xproj
index a0a2089ec3..819024d5ea 100644
--- a/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.xproj
+++ b/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.xproj
@@ -13,5 +13,8 @@
2.0
+
+
+
\ No newline at end of file