diff --git a/src/Microsoft.AspNet.StaticFiles/AssemblyInfo.cs b/src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Constants.cs b/src/Microsoft.AspNetCore.StaticFiles/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Constants.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Constants.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/CustomDictionary.xml b/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/CustomDictionary.xml
rename to src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DefaultFilesOptions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/FileExtensionContentTypeProvider.cs b/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/FileExtensionContentTypeProvider.cs
rename to src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/FileServerOptions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Helpers.cs b/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Helpers.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Helpers.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
rename to src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/IContentTypeProvider.cs b/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/IContentTypeProvider.cs
rename to src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs b/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
rename to src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/RangeHelpers.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Infrastructure/RangeHelpers.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/LoggerExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/LoggerExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.xproj b/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.xproj
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.xproj
rename to src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.xproj
diff --git a/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Resources.Designer.cs b/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Resources.Designer.cs
rename to src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/Resources.resx b/src/Microsoft.AspNetCore.StaticFiles/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/Resources.resx
rename to src/Microsoft.AspNetCore.StaticFiles/Resources.resx
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
rename to src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
rename to src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs
rename to src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
rename to src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNetCore.StaticFiles/project.json
similarity index 100%
rename from src/Microsoft.AspNet.StaticFiles/project.json
rename to src/Microsoft.AspNetCore.StaticFiles/project.json
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/CacheHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/CacheHeaderTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/Microsoft.AspNet.StaticFiles.Tests.xproj b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/Microsoft.AspNet.StaticFiles.Tests.xproj
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.xproj
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/RangeHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/RangeHeaderTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/default.html b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/default.html
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/extra.xml b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/extra.xml
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/ranges.txt b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/SubFolder/ranges.txt
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/TestDocument.txt b/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/TestDocument.txt
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/project.json b/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.StaticFiles.Tests/project.json
rename to test/Microsoft.AspNetCore.StaticFiles.Tests/project.json