diff --git a/src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs b/src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/AuthenticationHandler.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/HeaderDictionary.cs b/src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/HeaderDictionary.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/Helpers.cs b/src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/Helpers.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/MessagePump.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.xproj b/src/Microsoft.AspNetCore.Server.WebListener/Microsoft.AspNetCore.Server.WebListener.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.xproj
rename to src/Microsoft.AspNetCore.Server.WebListener/Microsoft.AspNetCore.Server.WebListener.xproj
diff --git a/src/Microsoft.AspNet.Server.WebListener/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.WebListener/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerAddressesFeature.cs b/src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/ServerAddressesFeature.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/StandardFeatureCollection.cs b/src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/StandardFeatureCollection.cs
rename to src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs
diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Server.WebListener/project.json
rename to src/Microsoft.AspNetCore.Server.WebListener/project.json
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/DummyApplication.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/DummyApplication.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Microsoft.AspNetCore.Server.WebListener.FunctionalTests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.xproj
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Microsoft.AspNetCore.Server.WebListener.FunctionalTests.xproj
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseCachingTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseCachingTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Utilities.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json
rename to test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json