diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/ClientCertificateMode.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/ClientCertificateMode.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/HttpsConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/HttpsConnectionFilter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/Microsoft.AspNet.Server.Kestrel.Https.xproj b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/Microsoft.AspNet.Server.Kestrel.Https.xproj
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/project.json b/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel.Https/project.json
rename to src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/ConnectionFilterContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/ConnectionFilterContext.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/FilteredStreamAdapter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/FilteredStreamAdapter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/IConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/IConnectionFilter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/LibuvStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/LibuvStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingConnectionFilter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/LoggingStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/NoOpConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/NoOpConnectionFilter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/SocketInputStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/SocketInputStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/StreamExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/StreamExtensions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Filter/StreamSocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Filter/StreamSocketOutput.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ChunkWriter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ChunkWriter.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ConnectionContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ConnectionContext.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/DateHeaderValueManager.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/DateHeaderValueManager.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/Frame.FeatureCollection.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/Frame.Generated.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameContext.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.Generated.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameOfT.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameOfT.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestHeaders.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseHeaders.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseStream.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameStreamState.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/FrameStreamState.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/IConnectionControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/IConnectionControl.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/IFrameControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/IFrameControl.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ISocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ISocketOutput.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/PipeListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/PipeListener.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/PipeListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/PipeListenerPrimary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/PipeListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/PipeListenerSecondary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ProduceEndType.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ProduceEndType.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ReasonPhrases.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/ReasonPhrases.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketInput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/SocketInput.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketInputExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/SocketInputExtensions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/TcpListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/TcpListener.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/TcpListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/TcpListenerPrimary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/TcpListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/TcpListenerSecondary.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/UrlPathDecoder.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Http/UrlPathDecoder.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/IKestrelServerInformation.cs b/src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/IKestrelServerInformation.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/Constants.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/Constants.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/Disposable.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/Disposable.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/IKestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/IKestrelTrace.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/ISystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/ISystemClock.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/IThreadPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/IThreadPool.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelTrace.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/LoggingThreadPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/LoggingThreadPool.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPool2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPool2.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/SystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/SystemClock.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/TaskUtilities.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Infrastructure/TaskUtilities.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/KestrelServer.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/KestrelServer.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/KestrelServerInformation.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/KestrelServerInformation.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Microsoft.AspNet.Server.Kestrel.xproj b/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Microsoft.AspNet.Server.Kestrel.xproj
rename to src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.xproj
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/Libuv.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/Libuv.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/SockAddr.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/SockAddr.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvAsyncHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvAsyncHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvException.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvException.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvLoopHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvLoopHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvMemory.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvMemory.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvPipeHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvPipeHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvRequest.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvShutdownReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvShutdownReq.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvTcpHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvTcpHandle.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/ServerAddress.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/ServerAddress.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/ServerFactory.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/ServerFactory.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/ServiceContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/ServiceContext.cs
rename to src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs
diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNetCore.Server.Kestrel/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Server.Kestrel/project.json
rename to src/Microsoft.AspNetCore.Server.Kestrel/project.json
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/Microsoft.AspNet.Server.Kestrel.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/Microsoft.AspNet.Server.Kestrel.FunctionalTests.xproj
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/project.json
rename to test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/AsciiDecoder.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/AsciiDecoder.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ChunkWriterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/ChunkWriterTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ChunkedResponseTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/ChunkedResponseTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/ConnectionFilterTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/CreateIPEndpointTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/CreateIPEndpointTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/DateHeaderValueManagerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/DateHeaderValueManagerTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/DummyApplication.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/DummyApplication.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/FrameFacts.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/FrameFacts.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/FrameResponseHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/FrameResponseHeadersTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/FrameTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/FrameTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/KestrelServerInformationTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/KestrelServerInformationTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/KestrelServerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/KestrelServerTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/LifetimeNotImplemented.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/LifetimeNotImplemented.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolBlock2Tests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolBlock2Tests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolExtensions.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolExtensions.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolIterator2Tests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/MemoryPoolIterator2Tests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MessageBodyTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/MessageBodyTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/Microsoft.AspNet.Server.KestrelTests.xproj b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/Microsoft.AspNet.Server.KestrelTests.xproj
rename to test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.xproj
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/Program.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/Program.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ServerAddressFacts.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/ServerAddressFacts.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/SocketInputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/SocketInputTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/SocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/SocketOutputTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/StreamSocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/StreamSocketOutputTests.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestConnection.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestDateHeaderValueManager.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestDateHeaderValueManager.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockLibuv.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockLibuv.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockSystemClock.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockSystemClock.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestInput.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestInput.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestLogger.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestLogger.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx b/test/Microsoft.AspNetCore.Server.KestrelTests/TestResources/testCert.pfx
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestResources/testCert.pfx
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestServiceContext.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestServiceContext.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/UrlPathDecoder.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/UrlPathDecoder.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/project.json b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Server.KestrelTests/project.json
rename to test/Microsoft.AspNetCore.Server.KestrelTests/project.json
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
rename to tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs
rename to tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj
rename to tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs
rename to tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json
rename to tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Microsoft.AspNet.Server.Kestrel.LibuvCopier.xproj b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Microsoft.AspNet.Server.Kestrel.LibuvCopier.xproj
rename to tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/Program.cs
rename to tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs
diff --git a/tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/project.json b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json
similarity index 100%
rename from tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier/project.json
rename to tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json