#281 Reorganise files, namespaces for internal and features.

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;

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>

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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.

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
     {

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
     {

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

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
     {

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.

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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.

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
     {

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.

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>
     {

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>
     {

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.

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.

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
     {

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

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
     {

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
 {

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;
 

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 :

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
 {

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
 {

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
 {

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

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;
 

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

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;
 

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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

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