diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index 0004ca9851..429d775602 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -18,8 +18,8 @@
 using System;
 using System.IO;
 using Microsoft.AspNet;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
 namespace StaticFilesSample
diff --git a/samples/StaticFileSample/project.json b/samples/StaticFileSample/project.json
index a8fd0db0f5..b913a5bef4 100644
--- a/samples/StaticFileSample/project.json
+++ b/samples/StaticFileSample/project.json
@@ -3,7 +3,7 @@
     "Helios": "0.1-alpha-*",
     "Microsoft.AspNet.FileSystems": "0.1-alpha-*",
     "Microsoft.AspNet.StaticFiles": "",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*"
+    "Microsoft.AspNet.Http": "0.1-alpha-*"
   },
   "configurations": {
     "net45": {
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
index f6119cdcc4..1a28b16dc7 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
@@ -16,10 +16,10 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for the DefaultFilesMiddleware
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
index 6079d82751..8963222669 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
@@ -18,8 +18,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
index bfd0ce34f2..7892575dd0 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
@@ -16,10 +16,10 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for the DirectoryBrowserMiddleware
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
index 18434bbb71..d1907a3740 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -18,8 +18,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
index 776b158c27..b58dfbe999 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/HtmlDirectoryFormatter.cs
@@ -22,8 +22,8 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
index cb3faa2d9d..3ccf8d4f84 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryFormatters/IDirectoryFormatter.cs
@@ -17,8 +17,8 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles.DirectoryFormatters
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
index 33931fc25a..0b7ff96793 100644
--- a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
@@ -16,10 +16,10 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods that combine all of the static file middleware components:
diff --git a/src/Microsoft.AspNet.StaticFiles/Helpers.cs b/src/Microsoft.AspNet.StaticFiles/Helpers.cs
index b171f560ae..78aa1d2c9b 100644
--- a/src/Microsoft.AspNet.StaticFiles/Helpers.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Helpers.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Globalization;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
index 6b9b7ba9dd..5ee6652e9c 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
@@ -16,8 +16,8 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles.Infrastructure
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
index a372c32d04..9c72edd143 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
@@ -16,8 +16,8 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles.Infrastructure
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
index 3646108c54..1aec4a6397 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
index 29af99d462..8fcf0c8b1f 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
@@ -19,7 +19,8 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs
index f70465fa25..99197b1bc8 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
index e08779ef60..5157379419 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
@@ -20,10 +20,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.StaticFiles.Infrastructure;
 
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
index d980771e48..525ac1b144 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
@@ -16,10 +16,10 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for the StaticFileMiddleware
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
index 0305e9066c..91d06ceb44 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
@@ -17,8 +17,9 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
index 4d876a16dc..49fb8c38e9 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
@@ -15,9 +15,8 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using System;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json
index 143badedc2..886ba0f649 100644
--- a/src/Microsoft.AspNet.StaticFiles/project.json
+++ b/src/Microsoft.AspNet.StaticFiles/project.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
     "Microsoft.AspNet.FileSystems": "0.1-alpha-*"
   },