diff --git a/src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs b/src/Microsoft.AspNet.FeatureModel/FeatureReference.cs
similarity index 90%
rename from src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs
rename to src/Microsoft.AspNet.FeatureModel/FeatureReference.cs
index 835d2b95f7..fba03637be 100644
--- a/src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs
+++ b/src/Microsoft.AspNet.FeatureModel/FeatureReference.cs
@@ -1,11 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.FeatureModel;
-
-namespace Microsoft.AspNet.Http.Infrastructure
+namespace Microsoft.AspNet.FeatureModel
 {
-    internal struct FeatureReference<T>
+    public struct FeatureReference<T>
     {
         private T _feature;
         private int _revision;
diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpResponseWritingExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/HttpResponseWritingExtensions.cs
rename to src/Microsoft.AspNet.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
index 3781736c58..68505962c2 100644
--- a/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
+++ b/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
-
 namespace Microsoft.AspNet.Http
 {
     /// <summary>
diff --git a/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs
index bad90b7cf8..3c5f183c53 100644
--- a/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs
+++ b/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Extensions;
+using Microsoft.AspNet.Http.Features;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Http
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
index e5d6fa8cb8..a259ce8489 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Security.Claims;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public class AuthenticateContext
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
index 30483c1325..592086e83c 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public class ChallengeContext
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
index a8d8523310..251d9dfb8c 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public class DescribeSchemesContext
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs b/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
index f026bcbbc4..9f551b8bdd 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public interface IAuthenticationHandler
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
index 90733cc815..0c76210a26 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public interface IHttpAuthenticationFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
index 68ca854a2c..0eade92638 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Security.Claims;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public class SignInContext
     {
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs b/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
index 55a7e32de3..d260afea84 100644
--- a/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication
 {
     public class SignOutContext
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
index 806aa3588b..947e77782b 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpBufferingFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
index 6a2b643b08..ef76d69815 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Net;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpConnectionFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
index 4a77d6f9c2..c80ca29b5f 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpRequestFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
index 825ace8bed..b30704650e 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Threading;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpRequestLifetimeFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
index bd74d2f7ff..e93a9d1c03 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpResponseFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
index a8957def8b..328d901903 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpSendFileFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
index 9a68578ed1..77d4ffa501 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpUpgradeFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
index fc59321032..674161abc1 100644
--- a/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
@@ -4,7 +4,7 @@
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface IHttpWebSocketFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs b/src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs
index f9fd6027ac..b34afe8f96 100644
--- a/src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     /// <summary>
     /// Feature to identify a request.
diff --git a/src/Microsoft.AspNet.Http.Features/ISession.cs b/src/Microsoft.AspNet.Http.Features/ISession.cs
index 8227616234..ba80fc7324 100644
--- a/src/Microsoft.AspNet.Http.Features/ISession.cs
+++ b/src/Microsoft.AspNet.Http.Features/ISession.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface ISession
     {
diff --git a/src/Microsoft.AspNet.Http.Features/ISessionFactory.cs b/src/Microsoft.AspNet.Http.Features/ISessionFactory.cs
index a026a2446f..441f96eeb5 100644
--- a/src/Microsoft.AspNet.Http.Features/ISessionFactory.cs
+++ b/src/Microsoft.AspNet.Http.Features/ISessionFactory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface ISessionFactory
     {
diff --git a/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs b/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
index bc97c7d175..bd3a66883e 100644
--- a/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     // TODO: Is there any reason not to flatten the Factory down into the Feature?
     public interface ISessionFeature
diff --git a/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs b/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
index 751a046461..f5d786f8b4 100644
--- a/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public interface ITlsConnectionFeature
     {
diff --git a/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs b/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
index 7115b2ef33..7b8535eb72 100644
--- a/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
+++ b/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     /// <summary>
     /// Provides information regarding TLS token binding parameters.
diff --git a/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
index 9ee15c929f..df11f93766 100644
--- a/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     public class WebSocketAcceptContext
     {
diff --git a/src/Microsoft.AspNet.Http/ApplicationBuilder.cs b/src/Microsoft.AspNet.Http/ApplicationBuilder.cs
index e400adae49..80041077c3 100644
--- a/src/Microsoft.AspNet.Http/ApplicationBuilder.cs
+++ b/src/Microsoft.AspNet.Http/ApplicationBuilder.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Internal;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNet.Builder.Internal
 {
     public class ApplicationBuilder : IApplicationBuilder
     {
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
index 863974c0fb..9f534a6ada 100644
--- a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
+++ b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -7,10 +7,12 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.AspNet.Http.Features.Authentication.Internal;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Authentication.Internal
 {
     public class DefaultAuthenticationManager : AuthenticationManager
     {
diff --git a/src/Microsoft.AspNet.Http/BufferingHelper.cs b/src/Microsoft.AspNet.Http/BufferingHelper.cs
index 3f95a169ad..3335203e29 100644
--- a/src/Microsoft.AspNet.Http/BufferingHelper.cs
+++ b/src/Microsoft.AspNet.Http/BufferingHelper.cs
@@ -6,7 +6,7 @@ using System.IO;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public static class BufferingHelper
     {
diff --git a/src/Microsoft.AspNet.Http/Infrastructure/Constants.cs b/src/Microsoft.AspNet.Http/Constants.cs
similarity index 91%
rename from src/Microsoft.AspNet.Http/Infrastructure/Constants.cs
rename to src/Microsoft.AspNet.Http/Constants.cs
index 00a2065274..376bb55abd 100644
--- a/src/Microsoft.AspNet.Http/Infrastructure/Constants.cs
+++ b/src/Microsoft.AspNet.Http/Constants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http.Infrastructure
+namespace Microsoft.AspNet.Http.Internal
 {
     internal static class Constants
     {
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
index b512c2a2eb..5237739aa9 100644
--- a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
+++ b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -6,9 +6,10 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultConnectionInfo : ConnectionInfo
     {
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
index cf9c3334c7..4c0174e5b1 100644
--- a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
+++ b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -7,10 +7,13 @@ using System.Security.Claims;
 using System.Threading;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Authentication.Internal;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.AspNet.Http.Features.Authentication.Internal;
+using Microsoft.AspNet.Http.Features.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpContext : HttpContext
     {
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
index 319d88ff26..f06e2d396e 100644
--- a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
+++ b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -6,11 +6,11 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpRequest : HttpRequest
     {
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
index 34ed6004a3..d264ff97a3 100644
--- a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
+++ b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -4,11 +4,11 @@
 using System;
 using System.IO;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpResponse : HttpResponse
     {
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
index 2fa8272dbc..c329ffe05e 100644
--- a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
+++ b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Features;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultWebSocketManager : WebSocketManager
     {
diff --git a/src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs
similarity index 89%
rename from src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs
rename to src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs
index 087da8544d..92713e1c87 100644
--- a/src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 
-namespace Microsoft.AspNet.Http.Authentication
+namespace Microsoft.AspNet.Http.Features.Authentication.Internal
 {
     public class HttpAuthenticationFeature : IHttpAuthenticationFeature
     {
diff --git a/src/Microsoft.AspNet.Http/FormFeature.cs b/src/Microsoft.AspNet.Http/Features/FormFeature.cs
similarity index 98%
rename from src/Microsoft.AspNet.Http/FormFeature.cs
rename to src/Microsoft.AspNet.Http/Features/FormFeature.cs
index a32e192504..593cd274c4 100644
--- a/src/Microsoft.AspNet.Http/FormFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/FormFeature.cs
@@ -7,12 +7,12 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Collections;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class FormFeature : IFormFeature
     {
diff --git a/src/Microsoft.AspNet.Http/FormFile.cs b/src/Microsoft.AspNet.Http/Features/FormFile.cs
similarity index 93%
rename from src/Microsoft.AspNet.Http/FormFile.cs
rename to src/Microsoft.AspNet.Http/Features/FormFile.cs
index d02ed1a7a0..557dc9d518 100644
--- a/src/Microsoft.AspNet.Http/FormFile.cs
+++ b/src/Microsoft.AspNet.Http/Features/FormFile.cs
@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
+using Microsoft.AspNet.Http.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class FormFile : IFormFile
     {
diff --git a/src/Microsoft.AspNet.Http/HttpConnectionFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs
similarity index 91%
rename from src/Microsoft.AspNet.Http/HttpConnectionFeature.cs
rename to src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs
index a5364d2acd..9f826d18c0 100644
--- a/src/Microsoft.AspNet.Http/HttpConnectionFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Net;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class HttpConnectionFeature : IHttpConnectionFeature
     {
diff --git a/src/Microsoft.AspNet.Http/HttpRequestFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs
similarity index 95%
rename from src/Microsoft.AspNet.Http/HttpRequestFeature.cs
rename to src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs
index fcb4054d37..bce7570916 100644
--- a/src/Microsoft.AspNet.Http/HttpRequestFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class HttpRequestFeature : IHttpRequestFeature
     {
diff --git a/src/Microsoft.AspNet.Http/HttpResponseFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs
similarity index 95%
rename from src/Microsoft.AspNet.Http/HttpResponseFeature.cs
rename to src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs
index 26e19b3a99..500f8e6e5b 100644
--- a/src/Microsoft.AspNet.Http/HttpResponseFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class HttpResponseFeature : IHttpResponseFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IFormFeature.cs b/src/Microsoft.AspNet.Http/Features/IFormFeature.cs
similarity index 95%
rename from src/Microsoft.AspNet.Http/IFormFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IFormFeature.cs
index 6b275ecf83..095c14a9e4 100644
--- a/src/Microsoft.AspNet.Http/IFormFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IFormFeature.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IFormFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IItemsFeature.cs b/src/Microsoft.AspNet.Http/Features/IItemsFeature.cs
similarity index 85%
rename from src/Microsoft.AspNet.Http/IItemsFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IItemsFeature.cs
index d37b2a9057..96b2ce78fe 100644
--- a/src/Microsoft.AspNet.Http/IItemsFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IItemsFeature.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IItemsFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IQueryFeature.cs b/src/Microsoft.AspNet.Http/Features/IQueryFeature.cs
similarity index 84%
rename from src/Microsoft.AspNet.Http/IQueryFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IQueryFeature.cs
index 7f6716f629..a1143fb8cd 100644
--- a/src/Microsoft.AspNet.Http/IQueryFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IQueryFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IQueryFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/IRequestCookiesFeature.cs
similarity index 84%
rename from src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IRequestCookiesFeature.cs
index 2b4f6b5eee..6b2f7c742e 100644
--- a/src/Microsoft.AspNet.Http/IRequestCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IRequestCookiesFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IRequestCookiesFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/IResponseCookiesFeature.cs
similarity index 84%
rename from src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IResponseCookiesFeature.cs
index f2ef604430..2d47300b79 100644
--- a/src/Microsoft.AspNet.Http/IResponseCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IResponseCookiesFeature.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IResponseCookiesFeature
     {
diff --git a/src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs
similarity index 87%
rename from src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs
rename to src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs
index 46b223c558..b5d192c503 100644
--- a/src/Microsoft.AspNet.Http/IServiceProvidersFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public interface IServiceProvidersFeature
     {
diff --git a/src/Microsoft.AspNet.Http/ItemsFeature.cs b/src/Microsoft.AspNet.Http/Features/ItemsFeature.cs
similarity index 82%
rename from src/Microsoft.AspNet.Http/ItemsFeature.cs
rename to src/Microsoft.AspNet.Http/Features/ItemsFeature.cs
index 5d278c2291..fc839357a7 100644
--- a/src/Microsoft.AspNet.Http/ItemsFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/ItemsFeature.cs
@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Http.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class ItemsFeature : IItemsFeature
     {
diff --git a/src/Microsoft.AspNet.Http/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
similarity index 93%
rename from src/Microsoft.AspNet.Http/QueryFeature.cs
rename to src/Microsoft.AspNet.Http/Features/QueryFeature.cs
index faf7612480..9fb2bd4a4b 100644
--- a/src/Microsoft.AspNet.Http/QueryFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -3,12 +3,11 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class QueryFeature : IQueryFeature
     {
diff --git a/src/Microsoft.AspNet.Http/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
similarity index 94%
rename from src/Microsoft.AspNet.Http/RequestCookiesFeature.cs
rename to src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
index 9796357057..eed8fc2d95 100644
--- a/src/Microsoft.AspNet.Http/RequestCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -5,12 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class RequestCookiesFeature : IRequestCookiesFeature
     {
diff --git a/src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
similarity index 89%
rename from src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs
rename to src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
index 38d7cfa615..410fce7a25 100644
--- a/src/Microsoft.AspNet.Http/ResponseCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Collections;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class ResponseCookiesFeature : IResponseCookiesFeature
     {
diff --git a/src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs
similarity index 88%
rename from src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs
rename to src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs
index 95f22d90cc..d9082df7a2 100644
--- a/src/Microsoft.AspNet.Http/ServiceProvidersFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class ServiceProvidersFeature : IServiceProvidersFeature
     {
diff --git a/src/Microsoft.AspNet.Http/TlsConnectionFeature.cs b/src/Microsoft.AspNet.Http/Features/TlsConnectionFeature.cs
similarity index 92%
rename from src/Microsoft.AspNet.Http/TlsConnectionFeature.cs
rename to src/Microsoft.AspNet.Http/Features/TlsConnectionFeature.cs
index 220c015540..9c7d75f483 100644
--- a/src/Microsoft.AspNet.Http/TlsConnectionFeature.cs
+++ b/src/Microsoft.AspNet.Http/Features/TlsConnectionFeature.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class TlsConnectionFeature : ITlsConnectionFeature
     {
diff --git a/src/Microsoft.AspNet.Http/Collections/FormCollection.cs b/src/Microsoft.AspNet.Http/FormCollection.cs
similarity index 94%
rename from src/Microsoft.AspNet.Http/Collections/FormCollection.cs
rename to src/Microsoft.AspNet.Http/FormCollection.cs
index a15e109093..ad829cd70c 100644
--- a/src/Microsoft.AspNet.Http/Collections/FormCollection.cs
+++ b/src/Microsoft.AspNet.Http/FormCollection.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     /// <summary>
     /// Contains the parsed form values.
diff --git a/src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs b/src/Microsoft.AspNet.Http/FormFileCollection.cs
similarity index 96%
rename from src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs
rename to src/Microsoft.AspNet.Http/FormFileCollection.cs
index df4175f312..bd624df355 100644
--- a/src/Microsoft.AspNet.Http/Collections/FormFileCollection.cs
+++ b/src/Microsoft.AspNet.Http/FormFileCollection.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     public class FormFileCollection : List<IFormFile>, IFormFileCollection
     {
diff --git a/src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs b/src/Microsoft.AspNet.Http/HeaderDictionary.cs
similarity index 99%
rename from src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs
rename to src/Microsoft.AspNet.Http/HeaderDictionary.cs
index 0cbe3e4ef3..04c2d556bd 100644
--- a/src/Microsoft.AspNet.Http/Collections/HeaderDictionary.cs
+++ b/src/Microsoft.AspNet.Http/HeaderDictionary.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Http.Infrastructure;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     /// <summary>
     /// Represents a wrapper for owin.RequestHeaders and owin.ResponseHeaders.
diff --git a/src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs b/src/Microsoft.AspNet.Http/ItemsDictionary.cs
similarity index 98%
rename from src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs
rename to src/Microsoft.AspNet.Http/ItemsDictionary.cs
index ac0e574af2..e191516849 100644
--- a/src/Microsoft.AspNet.Http/Collections/ItemsDictionary.cs
+++ b/src/Microsoft.AspNet.Http/ItemsDictionary.cs
@@ -4,7 +4,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class ItemsDictionary : IDictionary<object, object>
     {
diff --git a/src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs b/src/Microsoft.AspNet.Http/ParsingHelpers.cs
similarity index 99%
rename from src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs
rename to src/Microsoft.AspNet.Http/ParsingHelpers.cs
index c8a7c745db..45ac370eb4 100644
--- a/src/Microsoft.AspNet.Http/Infrastructure/ParsingHelpers.cs
+++ b/src/Microsoft.AspNet.Http/ParsingHelpers.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Infrastructure
+namespace Microsoft.AspNet.Http.Internal
 {
     internal struct HeaderSegment : IEquatable<HeaderSegment>
     {
diff --git a/src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs b/src/Microsoft.AspNet.Http/ReadableStringCollection.cs
similarity index 98%
rename from src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs
rename to src/Microsoft.AspNet.Http/ReadableStringCollection.cs
index cc4fe12d27..7a07ea603c 100644
--- a/src/Microsoft.AspNet.Http/Collections/ReadableStringCollection.cs
+++ b/src/Microsoft.AspNet.Http/ReadableStringCollection.cs
@@ -5,7 +5,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     /// <summary>
     /// Accessors for query, forms, etc.
diff --git a/src/Microsoft.AspNet.Http/ReferenceReadStream.cs b/src/Microsoft.AspNet.Http/ReferenceReadStream.cs
index 7d78b72847..6fa2c34f04 100644
--- a/src/Microsoft.AspNet.Http/ReferenceReadStream.cs
+++ b/src/Microsoft.AspNet.Http/ReferenceReadStream.cs
@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     /// <summary>
     /// A Stream that wraps another stream starting at a certain offset and reading for the given length.
diff --git a/src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs b/src/Microsoft.AspNet.Http/RequestCookiesCollection.cs
similarity index 98%
rename from src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs
rename to src/Microsoft.AspNet.Http/RequestCookiesCollection.cs
index 859a63b3ee..1dc603b518 100644
--- a/src/Microsoft.AspNet.Http/Collections/RequestCookiesCollection.cs
+++ b/src/Microsoft.AspNet.Http/RequestCookiesCollection.cs
@@ -6,7 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     public class RequestCookiesCollection : IReadableStringCollection
     {
diff --git a/src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs b/src/Microsoft.AspNet.Http/ResponseCookies.cs
similarity index 99%
rename from src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs
rename to src/Microsoft.AspNet.Http/ResponseCookies.cs
index d98decdb5a..b47b48d505 100644
--- a/src/Microsoft.AspNet.Http/Collections/ResponseCookies.cs
+++ b/src/Microsoft.AspNet.Http/ResponseCookies.cs
@@ -8,7 +8,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.WebEncoders;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     /// <summary>
     /// A wrapper for the response Set-Cookie header
diff --git a/src/Microsoft.AspNet.Http/Collections/SessionCollection.cs b/src/Microsoft.AspNet.Http/SessionCollection.cs
similarity index 95%
rename from src/Microsoft.AspNet.Http/Collections/SessionCollection.cs
rename to src/Microsoft.AspNet.Http/SessionCollection.cs
index c47095d3c5..8123e2fb0b 100644
--- a/src/Microsoft.AspNet.Http/Collections/SessionCollection.cs
+++ b/src/Microsoft.AspNet.Http/SessionCollection.cs
@@ -4,8 +4,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Microsoft.AspNet.Http.Features;
 
-namespace Microsoft.AspNet.Http.Collections
+namespace Microsoft.AspNet.Http.Internal
 {
     public class SessionCollection : ISessionCollection
     {
diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
index e664c9f080..96102f6bf4 100644
--- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
+++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
@@ -14,7 +14,9 @@ using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.AspNet.Http.Features.Authentication.Internal;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs
index 3ade1d3d1c..93b487006e 100644
--- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs
+++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder.Internal;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Owin;
 
diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
index 823e98bbea..7aee9b3c78 100644
--- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
+++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
@@ -15,12 +15,12 @@ using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Owin
 {
-    using Microsoft.Framework.Internal;
     using SendFileFunc = Func<string, long, long?, CancellationToken, Task>;
 
     public class OwinFeatureCollection :
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
index 2cb8b74c8d..a36e9377f3 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Features;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
index fd77da5841..9bdaa91588 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Features;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
index d175e49fa5..2da6ea7774 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Features;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
index 51224bc8ef..330b2867ea 100644
--- a/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
+++ b/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Http
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
index aa0a6d5ac7..cbdc1d9845 100644
--- a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder.Internal;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Shouldly;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
index d0cd1eacb3..0fcc04c997 100644
--- a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder.Internal;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Builder.Extensions
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
index c96508a4ea..fb2ef452f1 100644
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Http.Collections;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
index c123db4b09..ef8aa04c56 100644
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
@@ -3,6 +3,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Http.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Extensions.Tests
diff --git a/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs b/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs
index 7c28c99174..4284bb9c1d 100644
--- a/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Http;
 using Xunit;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNet.Builder.Internal
 {
     public class ApplicationBuilderTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs b/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs
index a618da3cfb..0728d65d80 100644
--- a/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class BufferingHelperTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs
index ea8699ee43..cffbc5c385 100644
--- a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs
@@ -2,15 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.AspNet.Http.Features.Authentication.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpContextTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs
index 9ddb91d9d5..a3115bf5ee 100644
--- a/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs
@@ -4,9 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Microsoft.AspNet.Http.Features;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpRequestTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs b/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs
index e26a4f0222..61dfda82f5 100644
--- a/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs
@@ -1,15 +1,15 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.WebUtilities;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class FormFeatureTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs b/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs
index 1e40ae0e8a..79cbac89c5 100644
--- a/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs
@@ -3,10 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Http.Collections;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Internal
 {
     public class HeaderDictionaryTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs
index 74b7cd37b0..5a1214338f 100644
--- a/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.FeatureModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class QueryFeatureTests
     {
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs
index 95c1d7fd81..3676fb2941 100644
--- a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs
+++ b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Owin
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
index eb05bd0dc5..03f2258a0c 100644
--- a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
+++ b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Features;
 using Xunit;
 
 namespace Microsoft.AspNet.Owin