diff --git a/StaticFiles.sln b/StaticFiles.sln
index 3c56c33e43..e25e61ad53 100644
--- a/StaticFiles.sln
+++ b/StaticFiles.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30327.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.21628.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40EE0889-960E-41B4-A3D3-9CE963EB0797}"
 EndProject
@@ -22,6 +22,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Any CPU.Build.0 = Debug|x86
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|x86.ActiveCfg = Debug|x86
@@ -32,6 +33,7 @@ Global
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|x86.ActiveCfg = Release|x86
 		{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|x86.Build.0 = Release|x86
 		{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Any CPU.Build.0 = Debug|x86
 		{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|x86.ActiveCfg = Debug|x86
 		{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|x86.Build.0 = Debug|x86
diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index 429d775602..161685e3e8 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -15,11 +15,8 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using System;
-using System.IO;
-using Microsoft.AspNet;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
-using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
 namespace StaticFilesSample
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs
index 9cbee9cebd..266c002a9e 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserOptions.cs
@@ -15,7 +15,6 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.StaticFiles.DirectoryFormatters;
 using Microsoft.AspNet.StaticFiles.Infrastructure;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/ContentTypes/FileExtensionContentTypeProvider.cs b/src/Microsoft.AspNet.StaticFiles/FileExtensionContentTypeProvider.cs
similarity index 99%
rename from src/Microsoft.AspNet.StaticFiles/ContentTypes/FileExtensionContentTypeProvider.cs
rename to src/Microsoft.AspNet.StaticFiles/FileExtensionContentTypeProvider.cs
index 67245112be..e90acc165c 100644
--- a/src/Microsoft.AspNet.StaticFiles/ContentTypes/FileExtensionContentTypeProvider.cs
+++ b/src/Microsoft.AspNet.StaticFiles/FileExtensionContentTypeProvider.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.StaticFiles.ContentTypes
+namespace Microsoft.AspNet.StaticFiles
 {
     /// <summary>
     /// Provides a mapping between file extensions and MIME types.
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
similarity index 99%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
rename to src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
index b58dfbe999..c972f61e89 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
@@ -25,7 +25,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.FileSystems;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
+namespace Microsoft.AspNet.StaticFiles
 {
     /// <summary>
     /// Generates an HTML view for a directory.
diff --git a/src/Microsoft.AspNet.StaticFiles/ContentTypes/IContentTypeProvider.cs b/src/Microsoft.AspNet.StaticFiles/IContentTypeProvider.cs
similarity index 95%
rename from src/Microsoft.AspNet.StaticFiles/ContentTypes/IContentTypeProvider.cs
rename to src/Microsoft.AspNet.StaticFiles/IContentTypeProvider.cs
index 3fc637117b..e3991b6731 100644
--- a/src/Microsoft.AspNet.StaticFiles/ContentTypes/IContentTypeProvider.cs
+++ b/src/Microsoft.AspNet.StaticFiles/IContentTypeProvider.cs
@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-namespace Microsoft.AspNet.StaticFiles.ContentTypes
+namespace Microsoft.AspNet.StaticFiles
 {
     /// <summary>
     /// Used to look up MIME types given a file path
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
similarity index 95%
rename from src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
rename to src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
index 3ccf8d4f84..aaa91b5f81 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
@@ -20,7 +20,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.FileSystems;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
+namespace Microsoft.AspNet.StaticFiles
 {
     /// <summary>
     /// Generates the view for a directory
diff --git a/src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.kproj b/src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.kproj
index 14a9bded03..7209cfe074 100644
--- a/src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.kproj
+++ b/src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.kproj
@@ -23,23 +23,22 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants.cs" />
-    <Compile Include="ContentTypes\FileExtensionContentTypeProvider.cs" />
-    <Compile Include="ContentTypes\IContentTypeProvider.cs" />
     <Compile Include="DefaultFilesExtensions.cs" />
     <Compile Include="DefaultFilesMiddleware.cs" />
     <Compile Include="DefaultFilesOptions.cs" />
     <Compile Include="DirectoryBrowserExtensions.cs" />
     <Compile Include="DirectoryBrowserMiddleware.cs" />
     <Compile Include="DirectoryBrowserOptions.cs" />
-    <Compile Include="DirectoryFormatters\HtmlDirectoryFormatter.cs" />
-    <Compile Include="DirectoryFormatters\IDirectoryFormatter.cs" />
+    <Compile Include="FileExtensionContentTypeProvider.cs" />
     <Compile Include="FileServerExtensions.cs" />
     <Compile Include="FileServerOptions.cs" />
     <Compile Include="Helpers.cs" />
+    <Compile Include="HtmlDirectoryFormatter.cs" />
+    <Compile Include="IContentTypeProvider.cs" />
+    <Compile Include="IDirectoryFormatter.cs" />
     <Compile Include="Infrastructure\RangeHelpers.cs" />
     <Compile Include="Infrastructure\SharedOptions.cs" />
     <Compile Include="Infrastructure\SharedOptionsBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.Designer.cs" />
     <Compile Include="SendFileExtensions.cs" />
     <Compile Include="SendFileMiddleware.cs" />
diff --git a/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1c032c7f02..0000000000
--- a/src/Microsoft.AspNet.StaticFiles/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc.
-// All Rights Reserved
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
-// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF
-// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR
-// NON-INFRINGEMENT.
-// See the Apache 2 License for the specific language governing
-// permissions and limitations under the License.
-
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("Microsoft.AspNet.StaticFiles")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("310c92f5-1719-4616-9ca8-a5788fcb86f8")]
-[assembly: NeutralResourcesLanguage("en-US")]
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs
index fd66863dc6..5a6c55b3e9 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileOptions.cs
@@ -16,7 +16,6 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.StaticFiles.ContentTypes;
 using Microsoft.AspNet.StaticFiles.Infrastructure;
 
 namespace Microsoft.AspNet.StaticFiles