diff --git a/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationDescription.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationDescription.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationDescription.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationDescription.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationManager.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationManager.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationManager.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationProperties.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationProperties.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Authentication/AuthenticationProperties.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Authentication/AuthenticationProperties.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/ConnectionInfo.cs b/src/Microsoft.AspNetCore.Http.Abstractions/ConnectionInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/ConnectionInfo.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/ConnectionInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/CookieOptions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/CookieOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/CookieOptions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/CookieOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/HeaderDictionaryExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/HeaderDictionaryExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/HeaderDictionaryExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/HeaderDictionaryExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapMiddleware.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapOptions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapOptions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenMiddleware.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenMiddleware.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenOptions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/MapWhenOptions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/MapWhenOptions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/RunExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/RunExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/RunExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/RunExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/UseExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/UseExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/UseExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/FragmentString.cs b/src/Microsoft.AspNetCore.Http.Abstractions/FragmentString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/FragmentString.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/FragmentString.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/HostString.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HostString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/HostString.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/HostString.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HttpContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/HttpContext.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpRequest.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HttpRequest.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/HttpRequest.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/HttpRequest.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IApplicationBuilder.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IApplicationBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IApplicationBuilder.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IApplicationBuilder.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IFormCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IFormCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IFormFile.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IFormFile.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IFormFileCollection.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IFormFileCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IFormFileCollection.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IFormFileCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IHttpContextAccessor.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IHttpContextAccessor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IHttpContextAccessor.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IHttpContextAccessor.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IHttpContextFactory.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IHttpContextFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IHttpContextFactory.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IHttpContextFactory.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IQueryCollection.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IQueryCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IQueryCollection.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IQueryCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IRequestCookieCollection.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IRequestCookieCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IRequestCookieCollection.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IRequestCookieCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/IResponseCookies.cs b/src/Microsoft.AspNetCore.Http.Abstractions/IResponseCookies.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/IResponseCookies.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/IResponseCookies.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Internal/HeaderSegment.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Internal/HeaderSegment.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Internal/HeaderSegment.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Internal/HeaderSegment.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Internal/HeaderSegmentCollection.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Internal/HeaderSegmentCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Internal/HeaderSegmentCollection.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Internal/HeaderSegmentCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Internal/ParsingHelpers.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Internal/ParsingHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Internal/ParsingHelpers.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Internal/ParsingHelpers.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Microsoft.AspNet.Http.Abstractions.xproj b/src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Microsoft.AspNet.Http.Abstractions.xproj
rename to src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.xproj
diff --git a/src/Microsoft.AspNet.Http.Abstractions/PathString.cs b/src/Microsoft.AspNetCore.Http.Abstractions/PathString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/PathString.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/PathString.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Properties/Resources.Designer.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/QueryString.cs b/src/Microsoft.AspNetCore.Http.Abstractions/QueryString.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/QueryString.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/QueryString.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/RequestDelegate.cs b/src/Microsoft.AspNetCore.Http.Abstractions/RequestDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/RequestDelegate.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/RequestDelegate.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/Resources.resx b/src/Microsoft.AspNetCore.Http.Abstractions/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/Resources.resx
rename to src/Microsoft.AspNetCore.Http.Abstractions/Resources.resx
diff --git a/src/Microsoft.AspNet.Http.Abstractions/StatusCodes.cs b/src/Microsoft.AspNetCore.Http.Abstractions/StatusCodes.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/StatusCodes.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/StatusCodes.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/WebSocketManager.cs b/src/Microsoft.AspNetCore.Http.Abstractions/WebSocketManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/WebSocketManager.cs
rename to src/Microsoft.AspNetCore.Http.Abstractions/WebSocketManager.cs
diff --git a/src/Microsoft.AspNet.Http.Abstractions/project.json b/src/Microsoft.AspNetCore.Http.Abstractions/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http.Abstractions/project.json
rename to src/Microsoft.AspNetCore.Http.Abstractions/project.json
diff --git a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs b/src/Microsoft.AspNetCore.Http.Extensions/HeaderDictionaryTypeExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/HeaderDictionaryTypeExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/Microsoft.AspNet.Http.Extensions.xproj b/src/Microsoft.AspNetCore.Http.Extensions/Microsoft.AspNetCore.Http.Extensions.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/Microsoft.AspNet.Http.Extensions.xproj
rename to src/Microsoft.AspNetCore.Http.Extensions/Microsoft.AspNetCore.Http.Extensions.xproj
diff --git a/src/Microsoft.AspNet.Http.Extensions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Http.Extensions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs b/src/Microsoft.AspNetCore.Http.Extensions/QueryBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/QueryBuilder.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs b/src/Microsoft.AspNetCore.Http.Extensions/RequestHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/RequestHeaders.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/ResponseExtensions.cs b/src/Microsoft.AspNetCore.Http.Extensions/ResponseExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/ResponseExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/ResponseExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs b/src/Microsoft.AspNetCore.Http.Extensions/ResponseHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/ResponseHeaders.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs b/src/Microsoft.AspNetCore.Http.Extensions/SendFileResponseExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/SendFileResponseExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/SessionExtensions.cs b/src/Microsoft.AspNetCore.Http.Extensions/SessionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/SessionExtensions.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/SessionExtensions.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/StreamCopyOperation.cs b/src/Microsoft.AspNetCore.Http.Extensions/StreamCopyOperation.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/StreamCopyOperation.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/StreamCopyOperation.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/UriHelper.cs b/src/Microsoft.AspNetCore.Http.Extensions/UriHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/UriHelper.cs
rename to src/Microsoft.AspNetCore.Http.Extensions/UriHelper.cs
diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNetCore.Http.Extensions/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http.Extensions/project.json
rename to src/Microsoft.AspNetCore.Http.Extensions/project.json
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/AuthenticateContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/AuthenticateContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeBehavior.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/ChallengeBehavior.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/ChallengeBehavior.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/ChallengeBehavior.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/ChallengeContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/ChallengeContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/DescribeSchemesContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/DescribeSchemesContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/IAuthenticationHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/IAuthenticationHandler.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/IHttpAuthenticationFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/IHttpAuthenticationFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/SignInContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/SignInContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs b/src/Microsoft.AspNetCore.Http.Features/Authentication/SignOutContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/Authentication/SignOutContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs b/src/Microsoft.AspNetCore.Http.Features/FeatureCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/FeatureCollection.cs
rename to src/Microsoft.AspNetCore.Http.Features/FeatureCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Features/FeatureReference.cs b/src/Microsoft.AspNetCore.Http.Features/FeatureReference.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/FeatureReference.cs
rename to src/Microsoft.AspNetCore.Http.Features/FeatureReference.cs
diff --git a/src/Microsoft.AspNet.Http.Features/FeatureReferences.cs b/src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/FeatureReferences.cs
rename to src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs b/src/Microsoft.AspNetCore.Http.Features/IFeatureCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs
rename to src/Microsoft.AspNetCore.Http.Features/IFeatureCollection.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHeaderDictionary.cs b/src/Microsoft.AspNetCore.Http.Features/IHeaderDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHeaderDictionary.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHeaderDictionary.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpBufferingFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpBufferingFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpRequestFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpRequestFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpRequestIdentifierFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpRequestIdentifierFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpRequestIdentifierFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpRequestLifetimeFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpRequestLifetimeFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpResponseFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpResponseFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpSendFileFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpSendFileFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpUpgradeFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpUpgradeFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpWebSocketFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/IHttpWebSocketFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/ISession.cs b/src/Microsoft.AspNetCore.Http.Features/ISession.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/ISession.cs
rename to src/Microsoft.AspNetCore.Http.Features/ISession.cs
diff --git a/src/Microsoft.AspNet.Http.Features/ISessionFeature.cs b/src/Microsoft.AspNetCore.Http.Features/ISessionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/ISessionFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/ISessionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs b/src/Microsoft.AspNetCore.Http.Features/ITlsConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/ITlsConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs b/src/Microsoft.AspNetCore.Http.Features/ITlsTokenBindingFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs
rename to src/Microsoft.AspNetCore.Http.Features/ITlsTokenBindingFeature.cs
diff --git a/src/Microsoft.AspNet.Http.Features/Microsoft.AspNet.Http.Features.xproj b/src/Microsoft.AspNetCore.Http.Features/Microsoft.AspNetCore.Http.Features.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Microsoft.AspNet.Http.Features.xproj
rename to src/Microsoft.AspNetCore.Http.Features/Microsoft.AspNetCore.Http.Features.xproj
diff --git a/src/Microsoft.AspNet.Http.Features/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Http.Features/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Http.Features/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs b/src/Microsoft.AspNetCore.Http.Features/WebSocketAcceptContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs
rename to src/Microsoft.AspNetCore.Http.Features/WebSocketAcceptContext.cs
diff --git a/src/Microsoft.AspNet.Http.Features/project.json b/src/Microsoft.AspNetCore.Http.Features/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http.Features/project.json
rename to src/Microsoft.AspNetCore.Http.Features/project.json
diff --git a/src/Microsoft.AspNet.Http/ApplicationBuilder.cs b/src/Microsoft.AspNetCore.Http/ApplicationBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/ApplicationBuilder.cs
rename to src/Microsoft.AspNetCore.Http/ApplicationBuilder.cs
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNetCore.Http/Authentication/DefaultAuthenticationManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
rename to src/Microsoft.AspNetCore.Http/Authentication/DefaultAuthenticationManager.cs
diff --git a/src/Microsoft.AspNet.Http/BufferingHelper.cs b/src/Microsoft.AspNetCore.Http/BufferingHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/BufferingHelper.cs
rename to src/Microsoft.AspNetCore.Http/BufferingHelper.cs
diff --git a/src/Microsoft.AspNet.Http/Constants.cs b/src/Microsoft.AspNetCore.Http/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Constants.cs
rename to src/Microsoft.AspNetCore.Http/Constants.cs
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNetCore.Http/DefaultConnectionInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
rename to src/Microsoft.AspNetCore.Http/DefaultConnectionInfo.cs
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNetCore.Http/DefaultHttpContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/DefaultHttpContext.cs
rename to src/Microsoft.AspNetCore.Http/DefaultHttpContext.cs
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNetCore.Http/DefaultHttpRequest.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
rename to src/Microsoft.AspNetCore.Http/DefaultHttpRequest.cs
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNetCore.Http/DefaultHttpResponse.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
rename to src/Microsoft.AspNetCore.Http/DefaultHttpResponse.cs
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNetCore.Http/DefaultWebSocketManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
rename to src/Microsoft.AspNetCore.Http/DefaultWebSocketManager.cs
diff --git a/src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs b/src/Microsoft.AspNetCore.Http/Features/Authentication/HttpAuthenticationFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/Authentication/HttpAuthenticationFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/DefaultSessionFeature.cs b/src/Microsoft.AspNetCore.Http/Features/DefaultSessionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/DefaultSessionFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/DefaultSessionFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/FormFeature.cs b/src/Microsoft.AspNetCore.Http/Features/FormFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/FormFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/FormFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/FormFile.cs b/src/Microsoft.AspNetCore.Http/Features/FormFile.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/FormFile.cs
rename to src/Microsoft.AspNetCore.Http/Features/FormFile.cs
diff --git a/src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpRequestFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/HttpRequestFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/HttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpRequestIdentifierFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/HttpRequestIdentifierFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/HttpRequestIdentifierFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/HttpRequestLifetimeFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpRequestLifetimeFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/HttpRequestLifetimeFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/HttpRequestLifetimeFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpResponseFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/HttpResponseFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IFormFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IFormFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IFormFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IFormFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IItemsFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IItemsFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IItemsFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IItemsFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IQueryFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IQueryFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IQueryFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IQueryFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IRequestCookiesFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IRequestCookiesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IRequestCookiesFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IRequestCookiesFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IResponseCookiesFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IResponseCookiesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IResponseCookiesFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IResponseCookiesFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs b/src/Microsoft.AspNetCore.Http/Features/IServiceProvidersFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/IServiceProvidersFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/ItemsFeature.cs b/src/Microsoft.AspNetCore.Http/Features/ItemsFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/ItemsFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/ItemsFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNetCore.Http/Features/QueryFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/QueryFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/QueryFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNetCore.Http/Features/RequestCookiesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/RequestCookiesFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNetCore.Http/Features/ResponseCookiesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/ResponseCookiesFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs b/src/Microsoft.AspNetCore.Http/Features/ServiceProvidersFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/ServiceProvidersFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/TlsConnectionFeature.cs b/src/Microsoft.AspNetCore.Http/Features/TlsConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Features/TlsConnectionFeature.cs
rename to src/Microsoft.AspNetCore.Http/Features/TlsConnectionFeature.cs
diff --git a/src/Microsoft.AspNet.Http/FormCollection.cs b/src/Microsoft.AspNetCore.Http/FormCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/FormCollection.cs
rename to src/Microsoft.AspNetCore.Http/FormCollection.cs
diff --git a/src/Microsoft.AspNet.Http/FormFileCollection.cs b/src/Microsoft.AspNetCore.Http/FormFileCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/FormFileCollection.cs
rename to src/Microsoft.AspNetCore.Http/FormFileCollection.cs
diff --git a/src/Microsoft.AspNet.Http/HeaderDictionary.cs b/src/Microsoft.AspNetCore.Http/HeaderDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/HeaderDictionary.cs
rename to src/Microsoft.AspNetCore.Http/HeaderDictionary.cs
diff --git a/src/Microsoft.AspNet.Http/HttpContextAccessor.cs b/src/Microsoft.AspNetCore.Http/HttpContextAccessor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/HttpContextAccessor.cs
rename to src/Microsoft.AspNetCore.Http/HttpContextAccessor.cs
diff --git a/src/Microsoft.AspNet.Http/HttpContextFactory.cs b/src/Microsoft.AspNetCore.Http/HttpContextFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/HttpContextFactory.cs
rename to src/Microsoft.AspNetCore.Http/HttpContextFactory.cs
diff --git a/src/Microsoft.AspNet.Http/ItemsDictionary.cs b/src/Microsoft.AspNetCore.Http/ItemsDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/ItemsDictionary.cs
rename to src/Microsoft.AspNetCore.Http/ItemsDictionary.cs
diff --git a/src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj b/src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Http/Microsoft.AspNet.Http.xproj
rename to src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.xproj
diff --git a/src/Microsoft.AspNet.Http/ParsingHelpers.cs b/src/Microsoft.AspNetCore.Http/ParsingHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/ParsingHelpers.cs
rename to src/Microsoft.AspNetCore.Http/ParsingHelpers.cs
diff --git a/src/Microsoft.AspNet.Http/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Http/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Http/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Http/QueryCollection.cs b/src/Microsoft.AspNetCore.Http/QueryCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/QueryCollection.cs
rename to src/Microsoft.AspNetCore.Http/QueryCollection.cs
diff --git a/src/Microsoft.AspNet.Http/ReferenceReadStream.cs b/src/Microsoft.AspNetCore.Http/ReferenceReadStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/ReferenceReadStream.cs
rename to src/Microsoft.AspNetCore.Http/ReferenceReadStream.cs
diff --git a/src/Microsoft.AspNet.Http/RequestCookieCollection.cs b/src/Microsoft.AspNetCore.Http/RequestCookieCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/RequestCookieCollection.cs
rename to src/Microsoft.AspNetCore.Http/RequestCookieCollection.cs
diff --git a/src/Microsoft.AspNet.Http/ResponseCookies.cs b/src/Microsoft.AspNetCore.Http/ResponseCookies.cs
similarity index 100%
rename from src/Microsoft.AspNet.Http/ResponseCookies.cs
rename to src/Microsoft.AspNetCore.Http/ResponseCookies.cs
diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNetCore.Http/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Http/project.json
rename to src/Microsoft.AspNetCore.Http/project.json
diff --git a/src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.cs b/src/Microsoft.AspNetCore.Owin/DictionaryStringArrayWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.cs
rename to src/Microsoft.AspNetCore.Owin/DictionaryStringArrayWrapper.cs
diff --git a/src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.cs b/src/Microsoft.AspNetCore.Owin/DictionaryStringValuesWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.cs
rename to src/Microsoft.AspNetCore.Owin/DictionaryStringValuesWrapper.cs
diff --git a/src/Microsoft.AspNet.Owin/IOwinEnvironmentFeature.cs b/src/Microsoft.AspNetCore.Owin/IOwinEnvironmentFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/IOwinEnvironmentFeature.cs
rename to src/Microsoft.AspNetCore.Owin/IOwinEnvironmentFeature.cs
diff --git a/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.xproj b/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.xproj
rename to src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.xproj
diff --git a/src/Microsoft.AspNet.Owin/OwinConstants.cs b/src/Microsoft.AspNetCore.Owin/OwinConstants.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/OwinConstants.cs
rename to src/Microsoft.AspNetCore.Owin/OwinConstants.cs
diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/OwinEnvironment.cs
rename to src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironmentFeature.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironmentFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/OwinEnvironmentFeature.cs
rename to src/Microsoft.AspNetCore.Owin/OwinEnvironmentFeature.cs
diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNetCore.Owin/OwinExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/OwinExtensions.cs
rename to src/Microsoft.AspNetCore.Owin/OwinExtensions.cs
diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
rename to src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs
diff --git a/src/Microsoft.AspNet.Owin/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Owin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Owin/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Owin/Utilities.cs b/src/Microsoft.AspNetCore.Owin/Utilities.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/Utilities.cs
rename to src/Microsoft.AspNetCore.Owin/Utilities.cs
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
rename to src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
rename to src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAcceptContext.cs
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAdapter.cs
rename to src/Microsoft.AspNetCore.Owin/WebSockets/OwinWebSocketAdapter.cs
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAcceptAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
rename to src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAcceptAdapter.cs
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs
rename to src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNetCore.Owin/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Owin/project.json
rename to src/Microsoft.AspNetCore.Owin/project.json
diff --git a/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs b/src/Microsoft.AspNetCore.WebUtilities/BufferedReadStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs
rename to src/Microsoft.AspNetCore.WebUtilities/BufferedReadStream.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs b/src/Microsoft.AspNetCore.WebUtilities/FileBufferingReadStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs
rename to src/Microsoft.AspNetCore.WebUtilities/FileBufferingReadStream.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/FormReader.cs b/src/Microsoft.AspNetCore.WebUtilities/FormReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/FormReader.cs
rename to src/Microsoft.AspNetCore.WebUtilities/FormReader.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/HttpRequestStreamReader.cs b/src/Microsoft.AspNetCore.WebUtilities/HttpRequestStreamReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/HttpRequestStreamReader.cs
rename to src/Microsoft.AspNetCore.WebUtilities/HttpRequestStreamReader.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/HttpResponseStreamWriter.cs b/src/Microsoft.AspNetCore.WebUtilities/HttpResponseStreamWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/HttpResponseStreamWriter.cs
rename to src/Microsoft.AspNetCore.WebUtilities/HttpResponseStreamWriter.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs b/src/Microsoft.AspNetCore.WebUtilities/KeyValueAccumulator.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs
rename to src/Microsoft.AspNetCore.WebUtilities/KeyValueAccumulator.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/Microsoft.AspNet.WebUtilities.xproj b/src/Microsoft.AspNetCore.WebUtilities/Microsoft.AspNetCore.WebUtilities.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/Microsoft.AspNet.WebUtilities.xproj
rename to src/Microsoft.AspNetCore.WebUtilities/Microsoft.AspNetCore.WebUtilities.xproj
diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs b/src/Microsoft.AspNetCore.WebUtilities/MultipartReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/MultipartReader.cs
rename to src/Microsoft.AspNetCore.WebUtilities/MultipartReader.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs b/src/Microsoft.AspNetCore.WebUtilities/MultipartReaderStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs
rename to src/Microsoft.AspNetCore.WebUtilities/MultipartReaderStream.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartSection.cs b/src/Microsoft.AspNetCore.WebUtilities/MultipartSection.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/MultipartSection.cs
rename to src/Microsoft.AspNetCore.WebUtilities/MultipartSection.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.WebUtilities/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.WebUtilities/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs b/src/Microsoft.AspNetCore.WebUtilities/QueryHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs
rename to src/Microsoft.AspNetCore.WebUtilities/QueryHelpers.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/ReasonPhrases.cs b/src/Microsoft.AspNetCore.WebUtilities/ReasonPhrases.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/ReasonPhrases.cs
rename to src/Microsoft.AspNetCore.WebUtilities/ReasonPhrases.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/Resources.Designer.cs b/src/Microsoft.AspNetCore.WebUtilities/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/Resources.Designer.cs
rename to src/Microsoft.AspNetCore.WebUtilities/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/Resources.resx b/src/Microsoft.AspNetCore.WebUtilities/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/Resources.resx
rename to src/Microsoft.AspNetCore.WebUtilities/Resources.resx
diff --git a/src/Microsoft.AspNet.WebUtilities/StreamHelperExtensions.cs b/src/Microsoft.AspNetCore.WebUtilities/StreamHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/StreamHelperExtensions.cs
rename to src/Microsoft.AspNetCore.WebUtilities/StreamHelperExtensions.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/WebEncoders.cs b/src/Microsoft.AspNetCore.WebUtilities/WebEncoders.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/WebEncoders.cs
rename to src/Microsoft.AspNetCore.WebUtilities/WebEncoders.cs
diff --git a/src/Microsoft.AspNet.WebUtilities/project.json b/src/Microsoft.AspNetCore.WebUtilities/project.json
similarity index 100%
rename from src/Microsoft.AspNet.WebUtilities/project.json
rename to src/Microsoft.AspNetCore.WebUtilities/project.json
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/HttpResponseWritingExtensionsTests.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/MapPathMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/MapPredicateMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/Microsoft.AspNet.Http.Abstractions.Tests.xproj b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/Microsoft.AspNet.Http.Abstractions.Tests.xproj
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.xproj
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/PathStringTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/PathStringTests.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/QueryStringTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/QueryStringTests.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/UseMiddlewareTest.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/UseMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Http.Abstractions.Tests/project.json
rename to test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs b/test/Microsoft.AspNetCore.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/HeaderDictionaryTypeExtensionsTest.cs
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj b/test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/Microsoft.AspNet.Http.Extensions.Tests.xproj
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.xproj
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/QueryBuilderTests.cs b/test/Microsoft.AspNetCore.Http.Extensions.Tests/QueryBuilderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/QueryBuilderTests.cs
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/QueryBuilderTests.cs
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.cs b/test/Microsoft.AspNetCore.Http.Extensions.Tests/ResponseExtensionTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.cs
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/ResponseExtensionTests.cs
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs b/test/Microsoft.AspNetCore.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/UriHelperTests.cs b/test/Microsoft.AspNetCore.Http.Extensions.Tests/UriHelperTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/UriHelperTests.cs
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/UriHelperTests.cs
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Http.Extensions.Tests/project.json
rename to test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/FeatureCollectionTests.cs b/test/Microsoft.AspNetCore.Http.Features.Tests/FeatureCollectionTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/FeatureCollectionTests.cs
rename to test/Microsoft.AspNetCore.Http.Features.Tests/FeatureCollectionTests.cs
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/IThing.cs b/test/Microsoft.AspNetCore.Http.Features.Tests/IThing.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/IThing.cs
rename to test/Microsoft.AspNetCore.Http.Features.Tests/IThing.cs
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/Microsoft.AspNet.Http.Features.Tests.xproj b/test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/Microsoft.AspNet.Http.Features.Tests.xproj
rename to test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.xproj
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.Http.Features.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/Properties/AssemblyInfo.cs
rename to test/Microsoft.AspNetCore.Http.Features.Tests/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/Thing.cs b/test/Microsoft.AspNetCore.Http.Features.Tests/Thing.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/Thing.cs
rename to test/Microsoft.AspNetCore.Http.Features.Tests/Thing.cs
diff --git a/test/Microsoft.AspNet.Http.Features.Tests/project.json b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Http.Features.Tests/project.json
rename to test/Microsoft.AspNetCore.Http.Features.Tests/project.json
diff --git a/test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs b/test/Microsoft.AspNetCore.Http.Tests/ApplicationBuilderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/ApplicationBuilderTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/ApplicationBuilderTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/Authentication/DefaultAuthenticationManagerTests.cs b/test/Microsoft.AspNetCore.Http.Tests/Authentication/DefaultAuthenticationManagerTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/Authentication/DefaultAuthenticationManagerTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/Authentication/DefaultAuthenticationManagerTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs b/test/Microsoft.AspNetCore.Http.Tests/BufferingHelperTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/BufferingHelperTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/BufferingHelperTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNetCore.Http.Tests/DefaultHttpContextTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/DefaultHttpContextTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNetCore.Http.Tests/DefaultHttpRequestTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/DefaultHttpRequestTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpResponseTests.cs b/test/Microsoft.AspNetCore.Http.Tests/DefaultHttpResponseTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/DefaultHttpResponseTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/DefaultHttpResponseTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs b/test/Microsoft.AspNetCore.Http.Tests/FormFeatureTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/FormFeatureTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs b/test/Microsoft.AspNetCore.Http.Tests/HeaderDictionaryTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/HeaderDictionaryTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/HttpContextFactoryTests.cs b/test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/HttpContextFactoryTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/HttpRequestIdentifierFeatureTests.cs b/test/Microsoft.AspNetCore.Http.Tests/HttpRequestIdentifierFeatureTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/HttpRequestIdentifierFeatureTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/HttpRequestIdentifierFeatureTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj b/test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/Microsoft.AspNet.Http.Tests.xproj
rename to test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.xproj
diff --git a/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs b/test/Microsoft.AspNetCore.Http.Tests/QueryFeatureTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs
rename to test/Microsoft.AspNetCore.Http.Tests/QueryFeatureTests.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/ResponseCookiesTest.cs b/test/Microsoft.AspNetCore.Http.Tests/ResponseCookiesTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/ResponseCookiesTest.cs
rename to test/Microsoft.AspNetCore.Http.Tests/ResponseCookiesTest.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/project.json b/test/Microsoft.AspNetCore.Http.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Http.Tests/project.json
rename to test/Microsoft.AspNetCore.Http.Tests/project.json
diff --git a/test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj b/test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Owin.Tests/Microsoft.AspNet.Owin.Tests.xproj
rename to test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.xproj
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNetCore.Owin.Tests/OwinEnvironmentTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs
rename to test/Microsoft.AspNetCore.Owin.Tests/OwinEnvironmentTests.cs
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs b/test/Microsoft.AspNetCore.Owin.Tests/OwinExtensionTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs
rename to test/Microsoft.AspNetCore.Owin.Tests/OwinExtensionTests.cs
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
rename to test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs
diff --git a/test/Microsoft.AspNet.Owin.Tests/project.json b/test/Microsoft.AspNetCore.Owin.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Owin.Tests/project.json
rename to test/Microsoft.AspNetCore.Owin.Tests/project.json
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/HttpRequestStreamReaderTest.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/HttpRequestStreamReaderTest.cs
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/HttpResponseStreamWriterTest.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/HttpResponseStreamWriterTest.cs
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj b/test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/Microsoft.AspNet.WebUtilities.Tests.xproj
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.xproj
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/MultipartReaderTests.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/MultipartReaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/MultipartReaderTests.cs
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/MultipartReaderTests.cs
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/QueryHelpersTests.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/QueryHelpersTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/QueryHelpersTests.cs
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/QueryHelpersTests.cs
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/WebEncodersTests.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/WebEncodersTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/WebEncodersTests.cs
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/WebEncodersTests.cs
diff --git a/test/Microsoft.AspNet.WebUtilities.Tests/project.json b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.WebUtilities.Tests/project.json
rename to test/Microsoft.AspNetCore.WebUtilities.Tests/project.json