diff --git a/samples/MvcSample.Web/Controllers/JsonPatchController.cs b/samples/MvcSample.Web/Controllers/JsonPatchController.cs
index d52db85cdb..aba1583ec1 100644
--- a/samples/MvcSample.Web/Controllers/JsonPatchController.cs
+++ b/samples/MvcSample.Web/Controllers/JsonPatchController.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.JsonPatch;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace MvcSample.Web.Controllers
 {
diff --git a/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs b/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
index 7deb56be41..6525d6f0c4 100644
--- a/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
+++ b/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web.Filters
 {
diff --git a/samples/MvcSample.Web/Filters/BlockAnonymous.cs b/samples/MvcSample.Web/Filters/BlockAnonymous.cs
index c78dba881a..65399d8ea0 100644
--- a/samples/MvcSample.Web/Filters/BlockAnonymous.cs
+++ b/samples/MvcSample.Web/Filters/BlockAnonymous.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web.Filters
 {
diff --git a/samples/MvcSample.Web/Filters/DelayAttribute.cs b/samples/MvcSample.Web/Filters/DelayAttribute.cs
index b395637c07..a47f191204 100644
--- a/samples/MvcSample.Web/Filters/DelayAttribute.cs
+++ b/samples/MvcSample.Web/Filters/DelayAttribute.cs
@@ -3,7 +3,8 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web.Filters
 {
diff --git a/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs b/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs
index 1ca581d59b..1f5f10f24e 100644
--- a/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs
+++ b/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs
@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Net.Http.Headers;
 
 namespace MvcSample.Web
diff --git a/samples/MvcSample.Web/Filters/FakeUserAttribute.cs b/samples/MvcSample.Web/Filters/FakeUserAttribute.cs
index 546dba2783..33e39e6a87 100644
--- a/samples/MvcSample.Web/Filters/FakeUserAttribute.cs
+++ b/samples/MvcSample.Web/Filters/FakeUserAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Security.Claims;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web
 {
diff --git a/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs b/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs
index c3f2b2ce75..8e0c801cc4 100644
--- a/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs
+++ b/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs
@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using MvcSample.Web.Models;
 
 namespace MvcSample.Web.Filters
diff --git a/samples/MvcSample.Web/Filters/PassThroughAttribute.cs b/samples/MvcSample.Web/Filters/PassThroughAttribute.cs
index 898801c17c..1c1823007e 100644
--- a/samples/MvcSample.Web/Filters/PassThroughAttribute.cs
+++ b/samples/MvcSample.Web/Filters/PassThroughAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web
 {
diff --git a/samples/MvcSample.Web/Filters/UserNameProvider.cs b/samples/MvcSample.Web/Filters/UserNameProvider.cs
index 7646e124fb..04165edd7e 100644
--- a/samples/MvcSample.Web/Filters/UserNameProvider.cs
+++ b/samples/MvcSample.Web/Filters/UserNameProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web.Filters
 {
diff --git a/samples/MvcSample.Web/FiltersController.cs b/samples/MvcSample.Web/FiltersController.cs
index cce8a847f1..98f6f1d4c1 100644
--- a/samples/MvcSample.Web/FiltersController.cs
+++ b/samples/MvcSample.Web/FiltersController.cs
@@ -3,6 +3,8 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using MvcSample.Web.Filters;
 using MvcSample.Web.Models;
 
diff --git a/samples/MvcSample.Web/Home2Controller.cs b/samples/MvcSample.Web/Home2Controller.cs
index eb213a2b1f..c776041bc7 100644
--- a/samples/MvcSample.Web/Home2Controller.cs
+++ b/samples/MvcSample.Web/Home2Controller.cs
@@ -4,6 +4,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using MvcSample.Web.Models;
 
 namespace MvcSample.Web.RandomNameSpace
diff --git a/samples/MvcSample.Web/HomeController.cs b/samples/MvcSample.Web/HomeController.cs
index 09c3790ba0..def7e46f31 100644
--- a/samples/MvcSample.Web/HomeController.cs
+++ b/samples/MvcSample.Web/HomeController.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.Rendering;
 using MvcSample.Web.Models;
 
diff --git a/samples/MvcSample.Web/OverloadController.cs b/samples/MvcSample.Web/OverloadController.cs
index d94dd891e2..0793320998 100644
--- a/samples/MvcSample.Web/OverloadController.cs
+++ b/samples/MvcSample.Web/OverloadController.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.WebApiCompatShim;
 using MvcSample.Web.Models;
 
diff --git a/samples/MvcSample.Web/SimplePocoController.cs b/samples/MvcSample.Web/SimplePocoController.cs
index 75bd02cbd7..a3724e6552 100644
--- a/samples/MvcSample.Web/SimplePocoController.cs
+++ b/samples/MvcSample.Web/SimplePocoController.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace MvcSample.Web
 {
diff --git a/samples/TagHelperSample.Web/Controllers/MoviesController.cs b/samples/TagHelperSample.Web/Controllers/MoviesController.cs
index b59a34bd7b..c960a02b34 100644
--- a/samples/TagHelperSample.Web/Controllers/MoviesController.cs
+++ b/samples/TagHelperSample.Web/Controllers/MoviesController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using TagHelperSample.Web.Services;
 
 namespace TagHelperSample.Web.Controllers
@@ -18,14 +19,14 @@ namespace TagHelperSample.Web.Controllers
         // Sample exhibiting the use of nested cache tag helpers with custom user expiration triggers.
         // Trigger expirations cascade, expiration of the inner tag helper's content either due to absolute or sliding
         // expiration or due to a user specified expiration trigger would cause the outer cache tag helper to also expire.
-        public ViewResult Index()
+        public IActionResult Index()
         {
             ViewData["Title"] = "Movies";
             return View();
         }
 
         [HttpPost]
-        public ViewResult UpdateMovieRatings()
+        public IActionResult UpdateMovieRatings()
         {
             _moviesService.UpdateMovieRating();
 
@@ -34,7 +35,7 @@ namespace TagHelperSample.Web.Controllers
         }
 
         [HttpPost]
-        public ViewResult UpdateCriticsQuotes()
+        public IActionResult UpdateCriticsQuotes()
         {
             _moviesService.UpdateCriticsQuotes();
 
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
index fa4c9dcc41..1b066ef80a 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNet.Routing;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// Context for <see cref="IActionConstraint"/> execution.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintItem.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintItem.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintProviderContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
index 686d68b46e..4e78170c49 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraintProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ActionConstraints
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionSelectorCandidate.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionSelectorCandidate.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
index ab7cb5ad59..b1ed6b92c0 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionSelectorCandidate.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// A candidate action for action selection.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraint.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
index 52268fd3f3..f8ff814344 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// Supports conditional logic to determine whether or not an associated action is valid to be selected
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintFactory.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintFactory.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintMetadata.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintMetadata.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
index 497bb18ca7..6180afde65 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintMetadata.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// A marker interface that identifies a type as metadata for an <see cref="IActionConstraint"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintProvider.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IActionConstraintProvider.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs
index b9b7e65fc7..27b8120958 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Internal;
@@ -42,7 +43,7 @@ namespace Microsoft.AspNet.Mvc
         /// </summary>
         /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
         /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
-        /// <param name="actionDescriptor">The <see cref="Mvc.ActionDescriptor"/> for the selected action.</param>
+        /// <param name="actionDescriptor">The <see cref="Actions.ActionDescriptor"/> for the selected action.</param>
         public ActionContext(
             [NotNull] HttpContext httpContext,
             [NotNull] RouteData routeData,
@@ -56,7 +57,7 @@ namespace Microsoft.AspNet.Mvc
         /// </summary>
         /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
         /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
-        /// <param name="actionDescriptor">The <see cref="Mvc.ActionDescriptor"/> for the selected action.</param>
+        /// <param name="actionDescriptor">The <see cref="Actions.ActionDescriptor"/> for the selected action.</param>
         /// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
         public ActionContext(
             [NotNull] HttpContext httpContext,
@@ -71,7 +72,7 @@ namespace Microsoft.AspNet.Mvc
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="Mvc.ActionDescriptor"/> for the selected action.
+        /// Gets or sets the <see cref="Actions.ActionDescriptor"/> for the selected action.
         /// </summary>
         /// <remarks>
         /// The property setter is provided for unit test purposes only.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs
index 6e99cff263..ab8c38906f 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Routing;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionDescriptor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ParameterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ParameterDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs
index fb8d068201..48cc6dfd3a 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ParameterDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ParameterDescriptor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/RouteDataActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Abstractions/RouteDataActionConstraint.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs
index 752a10a283..5e3e905aba 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/RouteDataActionConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Constraints an action to a route key and value.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/RouteKeyHandling.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/RouteKeyHandling.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs
index 6b37c6e03d..487a2a5283 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/RouteKeyHandling.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public enum RouteKeyHandling
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutedContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs
index 86174e8b22..000e3e61ea 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutedContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs
@@ -4,9 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ActionExecutedContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs
similarity index 92%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutingContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs
index d62a61ba5e..2445f979b7 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutingContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ActionExecutingContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutionDelegate.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
similarity index 87%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutionDelegate.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
index 6f96c2de47..c8ba0330a8 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionExecutionDelegate.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public delegate Task<ActionExecutedContext> ActionExecutionDelegate();
 }
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/AuthorizationContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Abstractions/AuthorizationContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs
index 45b79bb3b7..11a6bb7cde 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/AuthorizationContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class AuthorizationContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ExceptionContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ExceptionContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs
index 3c7945b482..4d8ca31506 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ExceptionContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs
@@ -4,9 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ExceptionContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/FilterContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Abstractions/FilterContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs
index a033983b63..e0cfbe77c6 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/FilterContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public abstract class FilterContext : ActionContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/FilterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterDescriptor.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Abstractions/FilterDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterDescriptor.cs
index a8327938fc..9e2e75034a 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/FilterDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterDescriptor.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// Descriptor for an <see cref="IFilterMetadata"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/FilterItem.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterItem.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/FilterItem.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterItem.cs
index d0458116bc..b8142c9a55 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/FilterItem.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterItem.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     // Used to flow filters back from the FilterProviderContext
     [DebuggerDisplay("FilterItem: {Filter}")]
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/FilterProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Abstractions/FilterProviderContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs
index 71040173af..d9c64394a4 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/FilterProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class FilterProviderContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IActionFilter.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IActionFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IActionFilter.cs
index edc5036116..498865f69b 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IActionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IActionFilter.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IActionFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncActionFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAsyncActionFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
index 1097643660..d9d2e814e5 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncActionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAsyncActionFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAsyncAuthorizationFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
index 3007a7d42c..a8655ac4d6 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAsyncAuthorizationFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncExceptionFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAsyncExceptionFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
index 0d8c9925f7..7f0ac76aab 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncExceptionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAsyncExceptionFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResourceFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResourceFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
index fdb3d7fab5..0b864095f0 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResourceFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A filter which surrounds execution of model binding, the action (and filters) and the action result
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResultFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResultFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
index 6a0a5a1292..4637fa172e 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAsyncResultFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAsyncResultFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IAuthorizationFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
index 20eb70c425..e8bd2b96ca 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAuthorizationFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IExceptionFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IExceptionFilter.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IExceptionFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IExceptionFilter.cs
index 2b5954aee4..3dc4e2d649 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IExceptionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IExceptionFilter.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IExceptionFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterContainer.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterContainer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IFilterContainer.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterContainer.cs
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterFactory.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterFactory.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IFilterFactory.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterFactory.cs
index 3cef633871..c6be40aa1c 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IFilterFactory : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterMetadata.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterMetadata.cs
similarity index 84%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IFilterMetadata.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterMetadata.cs
index 4af92c7959..dad964eef7 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterMetadata.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterMetadata.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterProvider.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IFilterProvider.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterProvider.cs
index fed2209fd1..0352adfe58 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IFilterProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IFilterProvider.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IFilterProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IOrderedFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IOrderedFilter.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IOrderedFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IOrderedFilter.cs
index d025f02d50..c0b8924dfa 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IOrderedFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IOrderedFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IOrderedFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IResourceFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResourceFilter.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IResourceFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResourceFilter.cs
index 22fa619dcc..dbc83cb2d2 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IResourceFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResourceFilter.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A filter which surrounds execution of model binding, the action (and filters) and the action result
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IResultFilter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResultFilter.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IResultFilter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResultFilter.cs
index ab5b3d6100..32ede1eb4c 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IResultFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/IResultFilter.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IResultFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutedContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
index 80a408dbc5..b82f114ba9 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutedContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
@@ -4,8 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
+using Microsoft.AspNet.Mvc.Actions;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A context for resource filters.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutingContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
index fd2748124f..2fc9015924 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutingContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
@@ -2,10 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A context for resource filters. Allows modification of services and values used for
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutionDelegate.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
similarity index 92%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutionDelegate.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
index cd302076b0..dbae488e09 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResourceExecutionDelegate.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A delegate which asyncronously returns a <see cref="ResourceExecutedContext"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutedContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs
index 4cf8d5328d..c94197ac77 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutedContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs
@@ -4,9 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ResultExecutedContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutingContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs
index 8b566444f2..6b7d7b01ea 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutingContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ResultExecutingContext : FilterContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutionDelegate.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
similarity index 87%
rename from src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutionDelegate.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
index 9fc8517315..c235a2bd80 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ResultExecutionDelegate.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public delegate Task<ResultExecutedContext> ResultExecutionDelegate();
 }
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IInputFormatter.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IInputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IInputFormatter.cs
index 3d9a47792f..42a2e9b037 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IInputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IInputFormatter.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Reads an object from the request body.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IOutputFormatter.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Abstractions/IOutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IOutputFormatter.cs
index a5ef39400d..4b4d8863a4 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/IOutputFormatter.cs
@@ -1,12 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Writes an object to the output stream.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/InputFormatterContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/InputFormatterContext.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Abstractions/InputFormatterContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Formatters/InputFormatterContext.cs
index 92e7c0b180..55e2f78ab1 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/InputFormatterContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/InputFormatterContext.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// A context object used by an input formatter for deserializing the request body into an object.
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/OutputFormatterContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/OutputFormatterContext.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Abstractions/OutputFormatterContext.cs
rename to src/Microsoft.AspNet.Mvc.Abstractions/Formatters/OutputFormatterContext.cs
index 2c7ab76fe2..ecf5d302ae 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/OutputFormatterContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/Formatters/OutputFormatterContext.cs
@@ -6,7 +6,7 @@ using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Represents information used by a formatter for participating in
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs b/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs
index e2fc5dfc27..25e27a2f4f 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc
 {
diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/OperationBindingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/OperationBindingContext.cs
index 0928417905..599f922d54 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/OperationBindingContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/OperationBindingContext.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs
index 6386c5872d..bb17c41e12 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace Microsoft.AspNet.Mvc.ApiExplorer
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
index 748f835837..b067eb60be 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc.ApiExplorer
 {
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs
index c598cc0db9..8ca05885b1 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ApiExplorer
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs
index 3f7e80e653..dad272f440 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc.ApiExplorer
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
index 1496cfe292..7c71cbc962 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
@@ -6,6 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Template;
diff --git a/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs
index 74e7d58f8f..dc484e9af6 100644
--- a/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs
index 72bf1dd423..cee05eebd1 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Specifies that a controller property should be set with the current
-    /// <see cref="ActionBindingContext"/> when creating the controller. The property must have a public
+    /// <see cref="Actions.ActionBindingContext"/> when creating the controller. The property must have a public
     /// set method.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionMethodSelectorAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/ActionMethodSelectorAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
index 7cc59c8473..5cea3aaa35 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionMethodSelectorAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// Base class for attributes which can implement conditional logic to enable or disable an action
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultActionConstraintProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultActionConstraintProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/HttpMethodConstraint.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionConstraints/HttpMethodConstraint.cs
index 9578de7981..d1d988ee8e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/HttpMethodConstraint.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Primitives;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     public class HttpMethodConstraint : IActionConstraint
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IConsumesActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Core/IConsumesActionConstraint.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
index a2f5ce6139..cc02ecb153 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IConsumesActionConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionConstraints
 {
     /// <summary>
     /// An <see cref="IActionConstraint"/> constraint that identifies a type which can be used to select an action
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs
index b135421a79..93408325f4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc
 {
diff --git a/src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs
index 4bc0e869dd..342548a0b5 100644
--- a/src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed will produce a Bad Request (400) response.
diff --git a/src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs
index 40ca333848..6c5be81d5c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// A <see cref="HttpStatusCodeResult"/> that when
diff --git a/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs
index 8f1fa10735..6bbc7c16d7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs
@@ -4,9 +4,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ChallengeResult : ActionResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/ContentResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs
index b9b3acd84d..bd9c0904c3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ContentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs
@@ -4,10 +4,12 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ContentResult : ActionResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs
index 709d6b2558..b0e90b4e53 100644
--- a/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs
@@ -4,12 +4,13 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs
index 5131136bf1..1755888d1e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs
@@ -4,12 +4,13 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs
index af7148657f..4f630f15af 100644
--- a/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs
@@ -3,10 +3,11 @@
 
 using System;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
diff --git a/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs
index 26166d2d19..fb178e3aa8 100644
--- a/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs
@@ -1,9 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will
diff --git a/src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs
index 3fe9b2c578..2e9199adad 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will
diff --git a/src/Microsoft.AspNet.Mvc.Core/FileResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/FileResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs
index d33ce318c4..4e6be9a1d9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FileResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs
@@ -1,15 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will
diff --git a/src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs
index 68c932c227..5057329345 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs
index 01eaa85c6f..161c5584ce 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed will produce a Not Found (404) response.
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs
index 5f6c002e4c..f267239245 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="HttpStatusCodeResult"/> that when
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs
index 5efefa2173..f87d5ea3f8 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed performs content negotiation, formats the entity body, and
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs
index 51482ca450..fcce07ba94 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="HttpStatusCodeResult"/> that when executed will produce an empty
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs
index 5aedaa4035..d33a68c499 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs
@@ -1,9 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs
index 7e2cce0568..8342860c06 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="HttpUnauthorizedResult"/> that when
diff --git a/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs
index 3b7f140e9f..a18083a9eb 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// A marker interface for <see cref="IActionResult"/> types which need to have temp data saved.
diff --git a/src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
index 2d80819441..47586c3b31 100644
--- a/src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class NoContentResult : HttpStatusCodeResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
index ef4908a229..22aaf709cc 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
@@ -6,14 +6,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ObjectResult : ActionResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs
index 0f739898e3..d08f6f282e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// A <see cref="FileResult"/> on execution will write a file from disk to the response
diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs
index 53ece18a8b..1dbc161726 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs
@@ -2,11 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectResult : ActionResult, IKeepTempDataResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs
index 90187f94da..597beeabd1 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs
@@ -3,11 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectToActionResult : ActionResult, IKeepTempDataResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs
index d2658fc5b6..2e7031589d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs
@@ -3,11 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectToRouteResult : ActionResult, IKeepTempDataResult
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs
index 599ea1b432..50a8b5931f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// A <see cref="HttpStatusCodeResult"/> that when
diff --git a/src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs
rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs
index ffe39b03aa..be67a47a9d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs
@@ -14,7 +14,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// A <see cref="FileResult" /> that on execution writes the file specified using a virtual path to the response
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs
similarity index 89%
rename from src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs
index fc1e74da2b..ab61022005 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs
@@ -2,10 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionBindingContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAccessor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs
index 278ab08054..df335e8106 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs
@@ -8,7 +8,7 @@ using System.Runtime.Remoting.Messaging;
 using System.Threading;
 #endif
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionBindingContextAccessor : IActionBindingContextAccessor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/ActionContextAccessor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs
index 4feeb26838..bb17b7fad2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs
@@ -4,11 +4,12 @@
 #if DNX451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
+using Microsoft.AspNet.Mvc.Actions;
 #else
 using System.Threading;
 #endif
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionContextAccessor : IActionContextAccessor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/ActionDescriptorExtensions.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs
index 033b9b2225..5e30655d61 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Extension methods for <see cref="ActionDescriptor"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorProviderContext.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Core/ActionDescriptorProviderContext.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs
index 4454d29d5c..d3c7d849c5 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionDescriptorProviderContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorsCollection.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ActionDescriptorsCollection.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs
index 2f54d2c64f..0a79da8a36 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorsCollection.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A cached collection of <see cref="ActionDescriptor" />.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs
index 283ce6aa4c..60ec191345 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionInvokerFactory : IActionInvokerFactory
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProviderContext.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs
similarity index 92%
rename from src/Microsoft.AspNet.Mvc.Core/ActionInvokerProviderContext.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs
index 0e71100417..0627476223 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionInvokerProviderContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs
index c198fd3773..3a2adb250d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs
@@ -6,7 +6,7 @@ using System;
 using System.Runtime.Serialization;
 #endif
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// An exception which indicates multiple matches in action selection.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs
index a5d5688482..93d48b1dc1 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs
@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     [DebuggerDisplay("CA {DisplayName}(RC-{RouteConstraints.Count})")]
     public class ControllerActionDescriptor : ActionDescriptor
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs
index 48ffceedbb..1146896e13 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs
@@ -7,12 +7,14 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Routing;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Creates instances of <see cref="ControllerActionDescriptor"/> from <see cref="ApplicationModel"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs
index 303016558d..7c5581f962 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionDescriptorProvider : IActionDescriptorProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionExecutor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionExecutor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs
index f37fc5b1c5..3dedcab26f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionExecutor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public static class ControllerActionExecutor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs
index 895801a598..33021589cd 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs
@@ -6,13 +6,17 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Notification;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionInvoker : FilterActionInvoker
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs
index 8617f725fd..98abbb4f10 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
@@ -10,7 +12,7 @@ using Microsoft.Framework.Logging;
 using Microsoft.Framework.Notification;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionInvokerProvider : IActionInvokerProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerBoundPropertyDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerBoundPropertyDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs
index e055ffe224..5bf7cd59db 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerBoundPropertyDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A descriptor for model bound properties of a controller.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerParameterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerParameterDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs
index 100198d98a..1950c4537d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerParameterDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A descriptor for method parameters of an action method.
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultActionDescriptorsCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultActionDescriptorsCollectionProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs
index b541351692..d14d214012 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultActionDescriptorsCollectionProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Framework.DependencyInjection;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Default implementation for ActionDescriptors.
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs
index 0520911839..55873a1600 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs
@@ -7,12 +7,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultActionSelector : IActionSelector
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs
index c602af17f8..50fa221c6a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Dnx.Runtime;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultAssemblyProvider : IAssemblyProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs
index 65fbbe458e..c48230e017 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides a default implementation of <see cref="IControllerActionArgumentBinder"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerActivator.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs
index 0cef70d10f..ead1e3d13a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// <see cref="IControllerActivator"/> that uses type activation to create controllers.
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs
index 1172508a18..8d93e95d9d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs
@@ -8,7 +8,7 @@ using System.Reflection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Default implementation for <see cref="IControllerFactory"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerPropertyActivator.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs
index 32fbc6b93a..2338da2c34 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerPropertyActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultControllerPropertyActivator : IControllerPropertyActivator
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs
index c6828c6e38..aa2e27238f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A <see cref="IControllerTypeProvider"/> that identifies controller types from assemblies
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs
index e6faccdca0..dc7dde7896 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs
@@ -6,7 +6,7 @@ using System.Collections.Concurrent;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Caches <see cref="ObjectFactory"/> instances produced by 
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs
index 2550951b65..ffc54dc4d7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs
@@ -7,6 +7,10 @@ using System.Diagnostics;
 using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
@@ -14,7 +18,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Notification;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public abstract class FilterActionInvoker : IActionInvoker
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionBindingContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Core/IActionBindingContextAccessor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs
index a2ade26c90..b37dfe3dd6 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionBindingContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionBindingContextAccessor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs
similarity index 87%
rename from src/Microsoft.AspNet.Mvc.Core/IActionContextAccessor.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs
index ef4cc85cb6..658f3dca2a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionContextAccessor
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs
index 88a6eda28c..d32a71f114 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionDescriptorProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionDescriptorsCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/IActionDescriptorsCollectionProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs
index 56985f7e9e..8d04769270 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionDescriptorsCollectionProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides the currently cached collection of <see cref="ActionDescriptor"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionHttpMethodProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Core/IActionHttpMethodProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs
index d37751e86b..99d3117d21 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionHttpMethodProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionHttpMethodProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs
similarity index 87%
rename from src/Microsoft.AspNet.Mvc.Core/IActionInvoker.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs
index 288124ad10..ef8bf148c5 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionInvoker
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Core/IActionInvokerFactory.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs
index 7f13db19c3..048f8e2f77 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionInvokerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionInvokerFactory
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs
index f00f03d915..e97bf65508 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionInvokerProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Core/IActionSelector.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs
index 159d7247d4..c1103bb87f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IActionSelector.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Routing;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IActionSelector
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs
index d6ef592e57..e128b79846 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Specifies the contract for discovering assemblies that may contain Mvc specific types such as controllers,
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerActionArgumentBinder.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerActionArgumentBinder.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs
index 590c9a3675..5e6d980b6b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerActionArgumentBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides a dictionary of action arguments.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerActivator.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs
index 4259155dc4..73c70dcd19 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides methods to create a controller.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs
index 90f05cc620..52de6ed529 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides methods for creation and disposal of controllers.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs
similarity index 88%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerPropertyActivator.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs
index c67453413c..2677b5476c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerPropertyActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public interface IControllerPropertyActivator
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerTypeProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs
index 08b0f6755f..04e6c85e1b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerTypeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Provides methods for discovery of controller types.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IRouteConstraintProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/IRouteConstraintProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs
index 7a835bc993..854772d60b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IRouteConstraintProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// An interface for metadata which provides <see cref="RouteDataActionConstraint"/> values
diff --git a/src/Microsoft.AspNet.Mvc.Core/ITypeActivatorCache.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ITypeActivatorCache.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs
index 5eb5c5e52d..13963f142b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ITypeActivatorCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// Caches <see cref="Microsoft.Framework.DependencyInjection.ObjectFactory"/> instances produced by 
diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs
index 4246fb3e90..a5186ebe14 100644
--- a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs
@@ -12,7 +12,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Notification;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class MvcRouteHandler : IRouter
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/RouteConstraintAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/RouteConstraintAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs
index cb3ffa9597..d67a010890 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RouteConstraintAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// An attribute which specifies a required route value for an action or controller.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ServiceBasedControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/ServiceBasedControllerActivator.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs
index 1ad9300d27..ccd5beeaf3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ServiceBasedControllerActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A <see cref="IControllerActivator"/> that retrieves controllers as services from the request's
diff --git a/src/Microsoft.AspNet.Mvc.Core/FixedSetAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs
similarity index 86%
rename from src/Microsoft.AspNet.Mvc.Core/FixedSetAssemblyProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs
index c5e3c4a7cc..ca4078a726 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FixedSetAssemblyProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs
@@ -4,12 +4,12 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A <see cref="IAssemblyProvider"/> with a fixed set of candidate assemblies. 
     /// </summary>
-    public class FixedSetAssemblyProvider : IAssemblyProvider
+    public class StaticAssemblyProvider : IAssemblyProvider
     {
         /// <summary>
         /// Gets the list of candidate assemblies.
diff --git a/src/Microsoft.AspNet.Mvc.Core/FixedSetControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs
similarity index 71%
rename from src/Microsoft.AspNet.Mvc.Core/FixedSetControllerTypeProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs
index c38d90588f..7a89b9a826 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FixedSetControllerTypeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs
@@ -6,26 +6,26 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     /// <summary>
     /// A <see cref="IControllerTypeProvider"/> with a fixed set of types that are used as controllers. 
     /// </summary>
-    public class FixedSetControllerTypeProvider : IControllerTypeProvider
+    public class StaticControllerTypeProvider : IControllerTypeProvider
     {
         /// <summary>
-        /// Initializes a new instance of <see cref="FixedSetControllerTypeProvider"/>.
+        /// Initializes a new instance of <see cref="StaticControllerTypeProvider"/>.
         /// </summary>
-        public FixedSetControllerTypeProvider()
+        public StaticControllerTypeProvider()
             : this(Enumerable.Empty<TypeInfo>())
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of <see cref="FixedSetControllerTypeProvider"/>.
+        /// Initializes a new instance of <see cref="StaticControllerTypeProvider"/>.
         /// </summary>
         /// <param name="controllerTypes">The sequence of controller <see cref="TypeInfo"/>.</param>
-        public FixedSetControllerTypeProvider([NotNull] IEnumerable<TypeInfo> controllerTypes)
+        public StaticControllerTypeProvider([NotNull] IEnumerable<TypeInfo> controllerTypes)
         {
             ControllerTypes = new List<TypeInfo>(controllerTypes);
         }
diff --git a/src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs
index e2854a6e20..6d33d72e51 100644
--- a/src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace Microsoft.AspNet.Mvc
 {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
index 1cc3f25459..aa97916807 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
@@ -5,7 +5,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer
 {
     /// <summary>
     /// Represents data used to build an <c>ApiDescription</c>, stored as part of the
-    /// <see cref="ActionDescriptor.Properties"/>.
+    /// <see cref="Actions.ActionDescriptor.Properties"/>.
     /// </summary>
     public class ApiDescriptionActionData
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs
index 77a46e54dc..ed91b2edb3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs
@@ -11,13 +11,13 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer
     /// Provides metadata information about the response format to an <c>IApiDescriptionProvider</c>.
     /// </summary>
     /// <remarks>
-    /// An <see cref="IOutputFormatter"/> should implement this interface to expose metadata information
+    /// An <see cref="Formatters.IOutputFormatter"/> should implement this interface to expose metadata information
     /// to an <c>IApiDescriptionProvider</c>.
     /// </remarks>
     public interface IApiResponseFormatMetadataProvider
     {
         /// <summary>
-        /// Gets a filtered list of content types which are supported by the <see cref="IOutputFormatter"/>
+        /// Gets a filtered list of content types which are supported by the <see cref="Formatters.IOutputFormatter"/>
         /// for the <paramref name="declaredType"/> and <paramref name="contentType"/>.
         /// </summary>
         /// <param name="declaredType">The declared type for which the supported content types are desired.</param>
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer
         /// The content type for which the supported content types are desired, or <c>null</c> if any content
         /// type can be used.
         /// </param>
-        /// <returns>Content types which are supported by the <see cref="IOutputFormatter"/>.</returns>
+        /// <returns>Content types which are supported by the <see cref="Formatters.IOutputFormatter"/>.</returns>
         IReadOnlyList<MediaTypeHeaderValue> GetSupportedContentTypes(
             Type declaredType,
             Type runtimeType,
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs
index bf626caeb8..9509e8c93c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs
@@ -5,6 +5,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs
index 41e41bf508..bd0deb6fe2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
 {
@@ -36,7 +37,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
 
         /// <summary>
         /// Gets a set of properties associated with all actions.
-        /// These properties will be copied to <see cref="ActionDescriptor.Properties"/>.
+        /// These properties will be copied to <see cref="Actions.ActionDescriptor.Properties"/>.
         /// </summary>
         public IDictionary<object, object> Properties { get; }
     }
diff --git a/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizationApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizationApplicationModelProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
index 90a7d6092a..cbbde2e527 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizationApplicationModelProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
@@ -3,11 +3,11 @@
 
 using System.Linq;
 using Microsoft.AspNet.Authorization;
-using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ApplicationModels
 {
     public class AuthorizationApplicationModelProvider : IApplicationModelProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs
index f97e644f56..5ee468d30f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs
@@ -5,6 +5,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
index eef1f60733..73d9e493b2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
diff --git a/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs
index 80a710ee70..2c26ea9cce 100644
--- a/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc
 {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
index cf222e1843..6618ae2546 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs
index a0a651ed7f..93899cd09c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs
@@ -4,7 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModelConventionExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/ApplicationModelConventionExtensions.cs
rename to src/Microsoft.AspNet.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
index c04f095013..38ccd4831f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModelConventionExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
@@ -5,10 +5,10 @@ using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.Framework.DependencyInjection
 {
     /// <summary>
-    /// Contains the extension methods for <see cref="MvcOptions.Conventions"/>.
+    /// Contains the extension methods for <see cref="AspNet.Mvc.MvcOptions.Conventions"/>.
     /// </summary>
     public static class ApplicationModelConventionExtensions
     {
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc
         /// Adds a <see cref="IControllerModelConvention"/> to all the controllers in the application.
         /// </summary>
         /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
-        /// in <see cref="MvcOptions"/>.</param>
+        /// in <see cref="AspNet.Mvc.MvcOptions"/>.</param>
         /// <param name="controllerModelConvention">The <see cref="IControllerModelConvention"/> which needs to be
         /// added.</param>
         public static void Add(
@@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Mvc
         /// Adds a <see cref="IActionModelConvention"/> to all the actions in the application.
         /// </summary>
         /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
-        /// in <see cref="MvcOptions"/>.</param>
+        /// in <see cref="AspNet.Mvc.MvcOptions"/>.</param>
         /// <param name="actionModelConvention">The <see cref="IActionModelConvention"/> which needs to be
         /// added.</param>
         public static void Add(
diff --git a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
index 47aa48dc4a..8355d80fdb 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
index 3df61d043f..a45633ef0b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
@@ -7,6 +7,7 @@ using System.Reflection;
 using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
index 35cb1d1603..fa5a63a5e2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
@@ -4,8 +4,8 @@
 using System;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
-using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/FilterCollectionExtensions.cs
index 2654ccdc63..c0d88cd0c3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/FilterCollectionExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterAttribute.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/ActionFilterAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterAttribute.cs
index 91a209371b..a1aaaacfaa 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public abstract class ActionFilterAttribute :
diff --git a/src/Microsoft.AspNet.Mvc.Core/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Core/AuthorizationFilterAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
index a6d66e138b..e07686500d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/AuthorizationFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
@@ -4,9 +4,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public abstract class AuthorizationFilterAttribute :
diff --git a/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizeFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizeFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs
index fa871f7140..9426f3f9b6 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizeFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs
@@ -5,10 +5,11 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Authorization;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// An implementation of <see cref="IAsyncAuthorizationFilter"/>
@@ -30,7 +31,7 @@ namespace Microsoft.AspNet.Mvc
         public AuthorizationPolicy Policy { get; private set; }
 
         /// <inheritdoc />
-        public virtual async Task OnAuthorizationAsync([NotNull] AuthorizationContext context)
+        public virtual async Task OnAuthorizationAsync([NotNull] Filters.AuthorizationContext context)
         {
             // Build a ClaimsPrincipal with the Policy's required authentication types
             if (Policy.ActiveAuthenticationSchemes != null && Policy.ActiveAuthenticationSchemes.Any())
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ControllerActionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerActionFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ControllerActionFilter.cs
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerResultFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ControllerResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Core/ControllerResultFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ControllerResultFilter.cs
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultFilterProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
diff --git a/src/Microsoft.AspNet.Mvc.Core/ExceptionFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ExceptionFilterAttribute.cs
similarity index 91%
rename from src/Microsoft.AspNet.Mvc.Core/ExceptionFilterAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ExceptionFilterAttribute.cs
index a0a46fedb2..8f15789e03 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ExceptionFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ExceptionFilterAttribute.cs
@@ -3,9 +3,10 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public abstract class ExceptionFilterAttribute : Attribute, IAsyncExceptionFilter, IExceptionFilter, IOrderedFilter
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterDescriptorOrderComparer.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/FilterDescriptorOrderComparer.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
index e765bea2b6..99e593d83f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterDescriptorOrderComparer.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class FilterDescriptorOrderComparer : IComparer<FilterDescriptor>
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterItemOrderComparer.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterItemOrderComparer.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/FilterItemOrderComparer.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/FilterItemOrderComparer.cs
index e7a6ff4a08..bcdf75efa0 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterItemOrderComparer.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterItemOrderComparer.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class FilterItemOrderComparer : IComparer<FilterItem>
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterScope.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterScope.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/FilterScope.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/FilterScope.cs
index 7a5ad69d62..ba16a74681 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterScope.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterScope.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// Contains constant values for known filter scopes.
diff --git a/src/Microsoft.AspNet.Mvc.Core/Authorization/IAllowAnonymous.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/IAllowAnonymous.cs
similarity index 85%
rename from src/Microsoft.AspNet.Mvc.Core/Authorization/IAllowAnonymous.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/IAllowAnonymous.cs
index 2f67fec442..9cc69c91a7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Authorization/IAllowAnonymous.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/IAllowAnonymous.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public interface IAllowAnonymous : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ICorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ICorsAuthorizationFilter.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Core/ICorsAuthorizationFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ICorsAuthorizationFilter.cs
index 8e8f396970..c39fad50aa 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ICorsAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ICorsAuthorizationFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// A filter which can be used to enable/disable cors support for a resource.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IResponseCacheFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/IResponseCacheFilter.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Core/IResponseCacheFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/IResponseCacheFilter.cs
index 4ed616c55e..47b1991598 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IResponseCacheFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/IResponseCacheFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// An <see cref="IActionFilter"/> which sets the appropriate headers related to Response caching.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ResponseCacheFilter.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ResponseCacheFilter.cs
index dd45ce54b0..1f5d8686ec 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ResponseCacheFilter.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     /// <summary>
     /// An <see cref="ActionFilterAttribute"/> which sets the appropriate headers related to response caching.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ResultFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ResultFilterAttribute.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/ResultFilterAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Filters/ResultFilterAttribute.cs
index 8a83439f4a..dc73c5fc54 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ResultFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ResultFilterAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public abstract class ResultFilterAttribute : Attribute, IResultFilter, IAsyncResultFilter, IOrderedFilter
diff --git a/src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs
index 04216921df..e06459459e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
@@ -9,7 +11,7 @@ namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// A filter which will use the format value in the route data or query string to set the content type on an
-    /// <see cref="ObjectResult" /> returned from an action.
+    /// <see cref="ActionResults.ObjectResult" /> returned from an action.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public class FormatFilterAttribute : Attribute, IFilterFactory
diff --git a/src/Microsoft.AspNet.Mvc.Core/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Core/FormatFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs
index 374a4c0232..62eddc78c4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FormatFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs
@@ -3,13 +3,15 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApiExplorer;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// A filter which will use the format value in the route data or query string to set the content type on an 
diff --git a/src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatterMappings.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/FormatterMappings.cs
index f0924268cb..79b688fc65 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatterMappings.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Used to specify mapping between the URL Format and corresponding <see cref="MediaTypeHeaderValue"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpNoContentOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/HttpNoContentOutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
index 5aa08c8619..b8fc01fc56 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpNoContentOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Sets the status code to 204 if the content is null.
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpNotAcceptableOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/HttpNotAcceptableOutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
index 703aac7ce0..c8d37710f1 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpNotAcceptableOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// A formatter which selects itself when content-negotiation has failed and writes a 406 Not Acceptable response.
diff --git a/src/Microsoft.AspNet.Mvc.Core/IFormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/IFormatFilter.cs
similarity index 92%
rename from src/Microsoft.AspNet.Mvc.Core/IFormatFilter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/IFormatFilter.cs
index 43d817d346..78377cde4a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IFormatFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/IFormatFilter.cs
@@ -1,9 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     ///  A filter which produces a desired content type for the current request. 
diff --git a/src/Microsoft.AspNet.Mvc.Core/InputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/InputFormatter.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/InputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/InputFormatter.cs
index cdf8d971ce..1a63311c2a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/InputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/InputFormatter.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Reads an object from the request body.
diff --git a/src/Microsoft.AspNet.Mvc.Core/OutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Core/OutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs
index 339e88d808..980b297976 100644
--- a/src/Microsoft.AspNet.Mvc.Core/OutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Writes an object to the output stream.
diff --git a/src/Microsoft.AspNet.Mvc.Core/StreamOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/StreamOutputFormatter.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/StreamOutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/StreamOutputFormatter.cs
index cc95b11473..a500943796 100644
--- a/src/Microsoft.AspNet.Mvc.Core/StreamOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/StreamOutputFormatter.cs
@@ -1,14 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Always copies the stream to the response, regardless of requested content type.
diff --git a/src/Microsoft.AspNet.Mvc.Core/StringOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/StringOutputFormatter.cs
rename to src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
index 64fe5db833..ee819fb64e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/StringOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
@@ -4,9 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// Always writes a string value to the response, regardless of requested content type.
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpDeleteAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpDeleteAttribute.cs
index 76cd8316a6..9e057f114c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpDeleteAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpDeleteAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpGetAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpGetAttribute.cs
index 633038b254..f5eef5d654 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpGetAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpGetAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpHeadAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpHeadAttribute.cs
index 9fb36c4f23..0dedeec95d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpHeadAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpHeadAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpPatchAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpPatchAttribute.cs
index 949270a96f..ea8fcab8b6 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpPatchAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpPatchAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpPostAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpPostAttribute.cs
index ccb6226b35..bfc8f20827 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpPostAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpPostAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpPutAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/HttpPutAttribute.cs
index 42ba6f7c7d..a70ed6c8b7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpPutAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/HttpPutAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs
index 52f95d8902..c1dee32923 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Extensions;
 
@@ -14,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Internal
     {
         public static void AddControllersAsServices(IServiceCollection services, IEnumerable<Type> types)
         {
-            var controllerTypeProvider = new FixedSetControllerTypeProvider();
+            var controllerTypeProvider = new StaticControllerTypeProvider();
             foreach (var type in types)
             {
                 services.TryAddTransient(type, type);
@@ -27,7 +28,7 @@ namespace Microsoft.AspNet.Mvc.Internal
 
         public static void AddControllersAsServices(IServiceCollection services, IEnumerable<Assembly> assemblies)
         {
-            var assemblyProvider = new FixedSetAssemblyProvider();
+            var assemblyProvider = new StaticAssemblyProvider();
             foreach (var assembly in assemblies)
             {
                 assemblyProvider.CandidateAssemblies.Add(assembly);
diff --git a/src/Microsoft.AspNet.Mvc.Core/TaskCache.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Core/TaskCache.cs
rename to src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
index cde5ab7b5a..41f1f955a9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/TaskCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public static class TaskCache
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/BodyModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/BodyModelBinder.cs
index 325aedd2bc..c29cc298be 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/BodyModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/BodyModelBinder.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultPropertyBindingPredicateProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DefaultPropertyBindingPredicateProvider.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultPropertyBindingPredicateProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/ModelBinding/DefaultPropertyBindingPredicateProvider.cs
index f1d9a40513..1a1c97f19e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultPropertyBindingPredicateProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DefaultPropertyBindingPredicateProvider.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ModelBinding
 {
     /// <summary>
     /// Default implementation for <see cref="IPropertyBindingPredicateProvider"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBindingHelper.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBindingHelper.cs
index a0c8104610..efd271518f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBindingHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBindingHelper.cs
@@ -13,6 +13,7 @@ using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs
index aee892991d..cedec6ef75 100644
--- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs
index 99b077ba6d..d963d1295e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs b/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
index 290c64c1b2..33300eefda 100644
--- a/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs
index bd82f9e6c5..970a08fbb9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs
@@ -4,8 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs
index e6747956da..f0195be961 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs
@@ -3,13 +3,14 @@
 
 using System;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
-    public class RequireHttpsAttribute :
-        Attribute, IAuthorizationFilter, IOrderedFilter
+    public class RequireHttpsAttribute : Attribute, IAuthorizationFilter, IOrderedFilter
     {
         public int Order { get; set; }
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs
index 5fc1ddd2c1..5ef5feae50 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
index 641ed7b3e3..d57a7b57ca 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 #endif
 using System.Diagnostics;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Internal.DecisionTree;
 
 namespace Microsoft.AspNet.Mvc.Routing
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs
index e267d6f984..4d1b9633de 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 
 namespace Microsoft.AspNet.Mvc.Routing
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs
index fb605e456c..ab8002992e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Template;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
index e9ef55be81..41a14d4ab9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpMethodAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Core/HttpMethodAttribute.cs
rename to src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs
index 278346234a..6ce0c55a13 100644
--- a/src/Microsoft.AspNet.Mvc.Core/HttpMethodAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc.Routing;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// Identifies an action that only supports a given set of HTTP methods.
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs
index 3bbe6c2c5e..348e3986cd 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc.Routing
 {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs
index b4d9c08efb..c0adf6544e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs
@@ -5,12 +5,12 @@ namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// Stores an <see cref="ActionSelectionDecisionTree"/> for the current value of
-    /// <see cref="IActionDescriptorsCollectionProvider.ActionDescriptors"/>.
+    /// <see cref="Actions.IActionDescriptorsCollectionProvider.ActionDescriptors"/>.
     /// </summary>
     public interface IActionSelectorDecisionTreeProvider
     {
         /// <summary>
-        /// Gets the <see cref="IActionDescriptorsCollectionProvider"/>.
+        /// Gets the <see cref="Actions.IActionDescriptorsCollectionProvider"/>.
         /// </summary>
         IActionSelectionDecisionTree DecisionTree
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs
index 3e642871cf..69ce478dd5 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs
@@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Mvc.Routing
 
         /// <summary>
         /// Gets the version of this route. This corresponds to the value of
-        /// <see cref="ActionDescriptorsCollection.Version"/> when this route was created.
+        /// <see cref="Actions.ActionDescriptorsCollection.Version"/> when this route was created.
         /// </summary>
         public int Version { get; }
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/KnownRouteValueConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/KnownRouteValueConstraint.cs
rename to src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs
index 703e3f3332..988ad45362 100644
--- a/src/Microsoft.AspNet.Mvc.Core/KnownRouteValueConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs
@@ -5,12 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Routing
 {
     public class KnownRouteValueConstraint : IRouteConstraint
     {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ServiceFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ServiceFilterAttribute.cs
index ff30446671..f312a35ed9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ServiceFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ServiceFilterAttribute.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/TypeFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/TypeFilterAttribute.cs
index 10dd538e01..8a4fb6f8e7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/TypeFilterAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/TypeFilterAttribute.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs
index c9118f1b2a..b7821eb28f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs
index 04618c3b3d..e37fab5b00 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNet.Cors.Core;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Cors
 {
     public class CorsApplicationModelProvider : IApplicationModelProvider
     {
diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs
index c10cb92288..4881856cc8 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs
@@ -5,12 +5,15 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Cors.Core;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Primitives;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Cors
 {
     /// <summary>
     /// A filter which applies the given <see cref="CorsPolicy"/> and adds appropriate response headers.
@@ -47,7 +50,7 @@ namespace Microsoft.AspNet.Mvc
 
 
         /// <inheritdoc />
-        public async Task OnAuthorizationAsync([NotNull] AuthorizationContext context)
+        public async Task OnAuthorizationAsync([NotNull] Filters.AuthorizationContext context)
         {
             // If this filter is not closest to the action, it is not applicable.
             if (!IsClosestToAction(context.Filters))
diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs
index 367ef8d797..dc9ca83024 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs
@@ -2,10 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Cors
 {
     /// <summary>
     /// A filter factory which creates a new instance of <see cref="CorsAuthorizationFilter"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
index d81205cf5b..8e8541255c 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
@@ -3,8 +3,8 @@
 
 using System;
 using Microsoft.AspNet.Cors.Core;
-using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Cors;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs
index 90b25b4057..4c4d62d948 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs
@@ -5,10 +5,12 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Cors.Core;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Primitives;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Cors
 {
     /// <summary>
     /// An <see cref="ICorsAuthorizationFilter"/> which ensures that an action does not run for a pre-flight request.
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs
rename to src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs
index cf731d0481..07405d31c3 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs
@@ -3,13 +3,14 @@
 
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An action result which formats the given object as JSON.
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs
index 3f910e0a2b..70dc862207 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs
@@ -10,7 +10,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class JsonInputFormatter : InputFormatter
     {
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs
index 352b7fa091..d768cb64b8 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs
@@ -6,10 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
-using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// An output formatter that specializes in writing JSON content.
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
index 20b6846855..011efc4dcf 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
@@ -5,11 +5,10 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.JsonPatch;
 using Microsoft.Framework.Internal;
-using Microsoft.Net.Http.Headers;
 using Microsoft.AspNet.Mvc.Internal;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class JsonPatchInputFormatter : JsonInputFormatter
     {
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs
index be527a5899..9da3be2615 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs
index c3470aaf7c..04866f7397 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
index b5efe9d62c..3aa982edbd 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-
 namespace Microsoft.AspNet.Mvc.Formatters.Xml
 {
     /// <summary>
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs
rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
index 40cd76e1ab..6797884b3a 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
@@ -6,7 +6,7 @@ using System.Runtime.Serialization;
 #endif
 using System.Xml;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     /// <summary>
     /// Contains methods which are used by Xml input formatters.
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
similarity index 90%
rename from src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
index 1ec742f1f1..9f40a5afc6 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     internal static class MediaTypeHeaderValues
     {
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DataMemberRequiredBindingMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Formatters.Xml/DataMemberRequiredBindingMetadataProvider.cs
rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs
index f54e6c79c8..477cce7120 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs
index 954cb584d7..47f9a951a1 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
index e9a66b05ee..3f265d58ce 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.Formatters.Xml
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
index 2015cc7c77..12720d48f1 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
@@ -9,11 +9,13 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// This class handles deserialization of input XML data
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
index 55d9ec0e1e..dee73b0020 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
@@ -9,10 +9,11 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.Framework.Internal;
-using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// This class handles serialization of objects
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
index 7c629cfed1..6fa5b9a202 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
@@ -9,11 +9,13 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
+using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// This class handles deserialization of input XML data
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
index 9d7ce304a5..e9369aeb3c 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
@@ -9,10 +9,11 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
+using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.Framework.Internal;
-using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     /// <summary>
     /// This class handles serialization of objects
diff --git a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs
index 45ac1b9fd4..dfa783eaf4 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
index eb7efd26d9..205206bca2 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Antiforgery;
 using Microsoft.AspNet.Html.Abstractions;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.PageExecutionInstrumentation;
diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
index bb8ca27767..ff00ab8284 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
diff --git a/src/Microsoft.AspNet.Mvc.Razor/ViewLocationExpanderContext.cs b/src/Microsoft.AspNet.Mvc.Razor/ViewLocationExpanderContext.cs
index 66af624d79..86bab84e67 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/ViewLocationExpanderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/ViewLocationExpanderContext.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs
index c66dfd131e..740d7b9e5a 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs
@@ -9,8 +9,9 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 using Microsoft.Net.Http.Headers;
 using Microsoft.Framework.OptionsModel;
+using Microsoft.AspNet.Mvc.Actions;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that renders a partial view to the response.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs
index 92057d9201..1517b29fd0 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewFeatures;
@@ -12,7 +13,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// An <see cref="IActionResult"/> which renders a view component to the response.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs
index d261e40ca9..c3e4fe9d9c 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs
@@ -10,8 +10,9 @@ using Microsoft.Framework.Logging;
 using Microsoft.Net.Http.Headers;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Framework.Notification;
+using Microsoft.AspNet.Mvc.Actions;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that renders a view to the response.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
index 9cdbe4b7e0..3161fe2694 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
@@ -8,6 +8,9 @@ using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Mvc.Rendering;
@@ -830,7 +833,9 @@ namespace Microsoft.AspNet.Mvc
         /// <returns>The created <see cref="PhysicalFileProviderResult"/> for the response.</returns>
         [NonAction]
         public virtual PhysicalFileProviderResult PhysicalFile(
-            string physicalPath, string contentType, string fileDownloadName)
+            string physicalPath,
+            string contentType,
+            string fileDownloadName)
         {
             return new PhysicalFileProviderResult(physicalPath, contentType) { FileDownloadName = fileDownloadName };
         }
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
index 805026572c..9e9df975e6 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
@@ -3,6 +3,8 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.Framework.DependencyInjection.Extensions;
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/IViewComponentHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentHelper.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/IViewComponentHelper.cs
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/IViewComponentResult.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentResult.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/IViewComponentResult.cs
index e581942e0c..375343248f 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/IViewComponentResult.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/FormContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/FormContext.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs
index 8bf8a953d0..1e2b6fb678 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/FormContext.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Rendering
 {
     public class FormContext
     {
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs
index ba84f76e5d..7418f4e25d 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Globalization;
 using System.IO;
 using Newtonsoft.Json;
 using Microsoft.Framework.Internal;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs
index 4ce440fb9f..fe0af4b398 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs
index 7a1a755912..8385e586e4 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Actions;
+
 namespace Microsoft.AspNet.Mvc.Rendering
 {
     /// <summary>
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
index 49b741fd09..d0573e883b 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
@@ -15,12 +16,12 @@ namespace Microsoft.AspNet.Mvc
     public class SkipStatusCodePagesAttribute : Attribute, IResourceFilter
     {
         /// <inheritdoc />
-        public void OnResourceExecuted([NotNull]ResourceExecutedContext context)
+        public void OnResourceExecuted([NotNull] ResourceExecutedContext context)
         {
         }
 
         /// <inheritdoc />
-        public void OnResourceExecuting([NotNull]ResourceExecutingContext context)
+        public void OnResourceExecuting([NotNull] ResourceExecutingContext context)
         {
             var statusCodeFeature = context.HttpContext.Features.Get<IStatusCodePagesFeature>();
             if (statusCodeFeature != null)
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs
index a3a9b13a6c..35e0b02973 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs
index f1d7216198..8bce68b8f6 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs
@@ -1,6 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+
 namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
index efb4eb8de9..f531f70ef2 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Antiforgery;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs
index 54da0e0667..8b81f0cf1a 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs
@@ -3,6 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Antiforgery;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponent.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponent.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs
index 58555799d3..b7266e18ee 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponent.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Security.Principal;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ModelBinding;
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentAttribute.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentAttribute.cs
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentHelperExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentHelperExtensions.cs
rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentHelperExtensions.cs
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
index e555805318..5f54d1e6c6 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ViewComponents
 {
     /// <summary>
     /// An <see cref="IViewComponentResult"/> which writes text when executed.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
index 4f42333fdf..ee1a7bcbea 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ViewComponents
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
index 8fd61362fb..c8e759d463 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
@@ -5,6 +5,7 @@ using System;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
index 41bbd98a87..6ff695a274 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.ViewComponents
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs
index f88ce44b3c..d9866d99cd 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs
@@ -7,7 +7,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ViewComponents
 {
     /// <summary>
     /// An <see cref="IViewComponentResult"/> which renders JSON text when executed.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
index c42e61018b..664a47e7d7 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
-using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ViewComponents
 {
     /// <summary>
     /// A context for View Components.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
index c7c8ad3ec1..da3ff4aab4 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
@@ -4,11 +4,12 @@
 using System;
 using System.Globalization;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ViewComponents
 {
     /// <summary>
     /// A <see cref="IViewComponentResult"/> that renders a partial view when executed.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs
index bb4d5a2734..251e161be8 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
@@ -86,7 +87,7 @@ namespace Microsoft.AspNet.Mvc
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="Mvc.FormContext"/> for the form element being rendered.
+        /// Gets or sets the <see cref="Rendering.FormContext"/> for the form element being rendered.
         /// A default context is returned if no form is currently being rendered.
         /// </summary>
         public virtual FormContext FormContext
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
index 66974be736..f6f08c3183 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs
index f9c176f574..affde70761 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs
@@ -3,6 +3,7 @@
 
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs
index a11a7376a6..2b84c34e72 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Framework.Internal;
 
 namespace System.Web.Http
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs
index 479eb93ef9..fc9bbdc67f 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace System.Web.Http
 {
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs
index 5d12a4107f..24f86b4788 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace System.Web.Http
 {
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs
index e3dec407dc..6c34cafea3 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace System.Web.Http
 {
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs
index eb8cde4e86..a2dcc3cce2 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs
@@ -4,6 +4,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs
index d34097de37..cf3a077cd3 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs
@@ -4,6 +4,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace System.Web.Http
 {
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs
index c75f54e621..73173318fe 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Net.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Framework.Internal;
 
 namespace System.Web.Http
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
index 778f8dc1a0..98e81f5e3c 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
@@ -7,6 +7,8 @@ using System.Security.Principal;
 using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Mvc.WebApiCompatShim;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
index 04aef61910..4e04954685 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 
 namespace Microsoft.AspNet.Mvc.WebApiCompatShim
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
index c43cdbd6eb..35d0aa52dd 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
@@ -7,6 +7,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc.WebApiCompatShim
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
index 71122cb608..a06741ebb1 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
@@ -3,6 +3,8 @@
 
 using System.Net.Http;
 using System.Web.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.WebApiCompatShim
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
index 520b709a4f..f1c386895d 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
@@ -7,6 +7,8 @@ using System.ComponentModel;
 using System.Linq;
 using System.Net.Http.Formatting;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
index f900b52f0a..dea74e2c37 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
@@ -3,6 +3,7 @@
 
 using System.Net.Http;
 using System.Net.Http.Formatting;
+using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Mvc.WebApiCompatShim
diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
index 262d4038e3..84a680090f 100644
--- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
@@ -7,7 +7,12 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApiExplorer;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs
index b6ebcc01ef..6615a2b065 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class BadRequestObjectResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs
similarity index 92%
rename from test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs
index 2b2aafca23..99a7574b55 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Http;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class BadRequestResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs
index abcd92cf68..e3dfd2e9d2 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs
@@ -4,11 +4,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ChallengeResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs
index 5fe62ab730..bb02604ba3 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs
@@ -6,12 +6,13 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ContentResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs
similarity index 95%
rename from test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs
index 4c3736a536..ca1b88525d 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs
@@ -7,6 +7,8 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Testing;
 using Microsoft.Framework.Logging;
@@ -14,7 +16,7 @@ using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class CreatedAtActionResultTests
     {
@@ -94,7 +96,7 @@ namespace Microsoft.AspNet.Mvc
             var services = new Mock<IServiceProvider>();
             httpContext.RequestServices = services.Object;
 
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter());
             optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter());
             services.Setup(p => p.GetService(typeof(IOptions<MvcOptions>)))
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs
index cec3d740ac..a01cd76602 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs
@@ -7,15 +7,16 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Testing;
-using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class CreatedAtRouteResultTests
     {
@@ -100,7 +101,7 @@ namespace Microsoft.AspNet.Mvc
 
             httpContext.Setup(o => o.Request)
                        .Returns(request);
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter());
             optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter());
             httpContext.Setup(o => o.RequestServices.GetService(typeof(IOptions<MvcOptions>)))
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs
similarity index 95%
rename from test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs
index 49d31674eb..358a140320 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs
@@ -5,6 +5,8 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.Logging;
@@ -12,7 +14,7 @@ using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class CreatedResultTests
     {
@@ -87,7 +89,7 @@ namespace Microsoft.AspNet.Mvc
                        .Returns(request);
             httpContext.Setup(o => o.Response)
                        .Returns(response);
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter());
             optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter());
             httpContext
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs
similarity index 91%
rename from test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs
index 73ee91a675..8516a2972c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs
@@ -2,11 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class EmptyResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/FileContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/FileContentResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs
index 0377bec3be..eb4af340bb 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/FileContentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs
@@ -4,11 +4,12 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class FileContentResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs
index ca852774dd..dbbfdbb941 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs
@@ -7,12 +7,13 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class FileResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs
index 0fcaa7d5e0..77540f17ce 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs
@@ -6,12 +6,13 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class FileStreamResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs
similarity index 87%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs
index 85f7930b55..3b65711e6a 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs
@@ -7,15 +7,16 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
-using Microsoft.AspNet.WebUtilities;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpNotFoundObjectResultTest
     {
@@ -64,11 +65,11 @@ namespace Microsoft.AspNet.Mvc
         }
 
         private static ActionContext CreateMockActionContext(
-                                                             HttpResponse response = null,
-                                                             string requestAcceptHeader = "application/*",
-                                                             string requestContentType = "application/json",
-                                                             string requestAcceptCharsetHeader = "",
-                                                             bool respectBrowserAcceptHeader = false)
+            HttpResponse response = null,
+            string requestAcceptHeader = "application/*",
+            string requestContentType = "application/json",
+            string requestAcceptCharsetHeader = "",
+            bool respectBrowserAcceptHeader = false)
         {
             var httpContext = new Mock<HttpContext>();
             if (response != null)
@@ -87,7 +88,7 @@ namespace Microsoft.AspNet.Mvc
 
             httpContext.Setup(o => o.Request).Returns(request);
             httpContext.Setup(o => o.RequestServices).Returns(GetServiceProvider());
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter());
             optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter());
             optionsAccessor.Options.RespectBrowserAcceptHeader = respectBrowserAcceptHeader;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs
similarity index 92%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs
index 05b7ecfdc3..d1c09d5229 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Http;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpNotFoundResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs
similarity index 94%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs
index 06bed410fe..a0e62d0b60 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs
@@ -5,6 +5,8 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Extensions;
@@ -13,7 +15,7 @@ using Microsoft.Framework.Logging.Testing;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpOkObjectResultTest
     {
@@ -73,7 +75,7 @@ namespace Microsoft.AspNet.Mvc
                 typeof(ILogger<ObjectResult>),
                 new Logger<ObjectResult>(NullLoggerFactory.Instance)));
 
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter());
             services.Add(new ServiceDescriptor(typeof(IOptions<MvcOptions>), optionsAccessor));
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs
similarity index 93%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs
index 5f59e26dce..a7044adf40 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs
@@ -4,10 +4,11 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpOkResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs
similarity index 92%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs
index 79781b9c2c..36fd475ba1 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs
@@ -3,10 +3,11 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpStatusCodeResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs
similarity index 92%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs
index 8a3ad20f44..53e45b5425 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Http;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class HttpUnauthorizedResultTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs
index 10d5cb2d38..0fc326f668 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs
@@ -9,6 +9,8 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Formatters.Xml;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Testing.xunit;
@@ -19,7 +21,7 @@ using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ObjectResultTests
     {
@@ -892,7 +894,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
             httpContext.Setup(o => o.Request).Returns(request);
             httpContext.Setup(o => o.RequestServices).Returns(GetServiceProvider());
 
-            var optionsAccessor = new MockMvcOptionsAccessor();
+            var optionsAccessor = new TestOptionsManager<MvcOptions>();
             foreach (var formatter in outputFormatters)
             {
                 optionsAccessor.Options.OutputFormatters.Add(formatter);
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs
index ff74a194f0..f200153c7d 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs
@@ -7,12 +7,13 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class PhysicalFileProviderResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs
index 27baa166cd..c9a977a867 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs
@@ -3,12 +3,13 @@
 
 using System;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs
similarity index 93%
rename from test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs
index abdbe225e0..6f96dc37f5 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs
@@ -3,12 +3,13 @@
 
 using System;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectToActionResultTest
     {
@@ -21,8 +22,6 @@ namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
             var httpContext = new Mock<HttpContext>();
             var httpResponse = new Mock<HttpResponse>();
             httpContext.Setup(o => o.Response).Returns(httpResponse.Object);
-            httpContext.Setup(o => o.RequestServices.GetService(typeof(ITempDataDictionary)))
-                .Returns(Mock.Of<ITempDataDictionary>());
 
             var actionContext = new ActionContext(httpContext.Object,
                                                   new RouteData(),
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs
similarity index 93%
rename from test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs
index b8abbb8c71..00b34db834 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs
@@ -6,13 +6,14 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Testing;
 using Microsoft.Framework.Internal;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class RedirectToRouteResultTest
     {
@@ -26,8 +27,6 @@ namespace Microsoft.AspNet.Mvc.Core
             var httpContext = new Mock<HttpContext>();
             var httpResponse = new Mock<HttpResponse>();
             httpContext.Setup(o => o.Response).Returns(httpResponse.Object);
-            httpContext.Setup(o => o.RequestServices.GetService(typeof(ITempDataDictionary)))
-                .Returns(Mock.Of<ITempDataDictionary>());
 
             var actionContext = new ActionContext(httpContext.Object,
                                                   new RouteData(),
@@ -88,8 +87,6 @@ namespace Microsoft.AspNet.Mvc.Core
             var serviceProvider = new Mock<IServiceProvider>();
             serviceProvider.Setup(sp => sp.GetService(typeof(IUrlHelper)))
                 .Returns(urlHelper.Object);
-            serviceProvider.Setup(sp => sp.GetService(typeof(ITempDataDictionary)))
-                .Returns(new Mock<ITempDataDictionary>().Object);
             var httpContext = new DefaultHttpContext();
             httpContext.RequestServices = serviceProvider.Object;
             var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs
index f9bf7ccb52..927dc3104a 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs
@@ -9,13 +9,14 @@ using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class VirtualFileProviderResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionExecutorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionExecutorTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs
index a437a31a83..89f25ef9e8 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionExecutorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ActionExecutorTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionArgumentBinderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionArgumentBinderTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs
index 06bcd6682f..73276d9bb8 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionArgumentBinderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionArgumentBinderTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorBuilderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorBuilderTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs
index da4aa2289f..4679814377 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorBuilderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionDescriptorBuilderTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs
similarity index 95%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs
index 0125b212de..ad06890d44 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs
@@ -5,16 +5,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.ApplicationModels;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.Internal;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionDescriptorProviderTests
     {
@@ -464,8 +465,8 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal(
                 new[]
                 {
-                    "Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+PersonController.GetPerson",
-                    "Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+PersonController.ListPeople",
+                    $"{typeof(PersonController).FullName}.GetPerson",
+                    $"{typeof(PersonController).FullName}.ListPeople",
                 },
                 displayNames);
         }
@@ -512,14 +513,12 @@ namespace Microsoft.AspNet.Mvc.Test
                 "The following errors occurred with attribute routing information:" + Environment.NewLine +
                 Environment.NewLine +
                 "Error 1:" + Environment.NewLine +
-                "For action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "MultipleErrorsController.Unknown'" + Environment.NewLine +
+                $"For action: '{typeof(MultipleErrorsController).FullName}.Unknown'" + Environment.NewLine +
                 "Error: While processing template 'stub/[action]/[unknown]', a replacement value for the token 'unknown' " +
                 "could not be found. Available tokens: 'action, controller'." + Environment.NewLine +
                 Environment.NewLine +
                 "Error 2:" + Environment.NewLine +
-                "For action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "MultipleErrorsController.Invalid'" + Environment.NewLine +
+                $"For action: '{typeof(MultipleErrorsController).FullName}.Invalid'" + Environment.NewLine +
                 "Error: The route template '[invalid/syntax' has invalid syntax. A replacement token is not closed.";
 
             // Act
@@ -750,15 +749,13 @@ namespace Microsoft.AspNet.Mvc.Test
                 "The following errors occurred with attribute routing information:" + Environment.NewLine +
                 Environment.NewLine +
                 "Error 1:" + Environment.NewLine +
-                "A method 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "AttributeAndNonAttributeRoutedActionsOnSameMethodController.Method'" +
+                $"A method '{typeof(AttributeAndNonAttributeRoutedActionsOnSameMethodController).FullName}.Method'" +
                 " must not define attribute routed actions and non attribute routed actions at the same time:" + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "AttributeAndNonAttributeRoutedActionsOnSameMethodController.Method' - Route Template: 'AttributeRouted' - " +
+                $"Action: '{typeof(AttributeAndNonAttributeRoutedActionsOnSameMethodController).FullName}.Method' " +
+                "- Route Template: 'AttributeRouted' - " +
                 "HTTP Verbs: 'GET'" + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "AttributeAndNonAttributeRoutedActionsOnSameMethodController.Method' - Route Template: '(none)' - " +
-                "HTTP Verbs: 'DELETE, PATCH, POST, PUT'" + Environment.NewLine +
+                $"Action: '{typeof(AttributeAndNonAttributeRoutedActionsOnSameMethodController).FullName}.Method' - " +
+                "Route Template: '(none)' - HTTP Verbs: 'DELETE, PATCH, POST, PUT'" + Environment.NewLine +
                 Environment.NewLine +
                 "Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a " +
                 "route, or set a route template in all attributes that constrain HTTP verbs.";
@@ -806,38 +803,28 @@ namespace Microsoft.AspNet.Mvc.Test
                 "Error 1:" + Environment.NewLine +
                 "Attribute routes with the same name 'Products' must have the same template:"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.Get' - Template: 'Products'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.Get' - Template: 'Products'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.Get' - Template: 'Products/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.Get' - Template: 'Products/{{id}}'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.Put' - Template: 'Products/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.Put' - Template: 'Products/{{id}}'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.Post' - Template: 'Products'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.Post' - Template: 'Products'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.Delete' - Template: 'Products/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.Delete' - Template: 'Products/{{id}}'"
                 + Environment.NewLine + Environment.NewLine +
                 "Error 2:" + Environment.NewLine +
                 "Attribute routes with the same name 'Items' must have the same template:"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.GetItems' - Template: 'Items/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.GetItems' - Template: 'Items/{{id}}'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.PostItems' - Template: 'Items'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.PostItems' - Template: 'Items'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.PutItems' - Template: 'Items/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.PutItems' - Template: 'Items/{{id}}'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.DeleteItems' - Template: 'Items/{id}'"
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.DeleteItems' - Template: 'Items/{{id}}'"
                 + Environment.NewLine +
-                "Action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "SameNameDifferentTemplatesController.PatchItems' - Template: 'Items'";
+                $"Action: '{typeof(SameNameDifferentTemplatesController).FullName}.PatchItems' - Template: 'Items'";
 
             // Act
             var ex = Assert.Throws<InvalidOperationException>(() => { provider.GetDescriptors(); });
@@ -938,8 +925,7 @@ namespace Microsoft.AspNet.Mvc.Test
                 "The following errors occurred with attribute routing information:" + Environment.NewLine +
                 Environment.NewLine +
                 "Error 1:" + Environment.NewLine +
-                "For action: 'Microsoft.AspNet.Mvc.Test.ControllerActionDescriptorProviderTests+" +
-                "RouteNameIncorrectTokenController.Get'" + Environment.NewLine +
+                $"For action: '{typeof(RouteNameIncorrectTokenController).FullName}.Get'" + Environment.NewLine +
                 "Error: While processing template 'Products_[unknown]', a replacement value for the token 'unknown' " +
                 "could not be found. Available tokens: 'action, controller'.";
 
@@ -1272,7 +1258,7 @@ namespace Microsoft.AspNet.Mvc.Test
                 .Setup(c => c.Apply(It.IsAny<ParameterModel>()))
                 .Callback(() => { Assert.Equal(3, sequence++); });
 
-            var options = new MockMvcOptionsAccessor();
+            var options = new TestOptionsManager<MvcOptions>();
             options.Options.Conventions.Add(applicationConvention.Object);
 
 
@@ -1449,7 +1435,7 @@ namespace Microsoft.AspNet.Mvc.Test
             TypeInfo controllerTypeInfo,
             IEnumerable<IFilterMetadata> filters = null)
         {
-            var options = new MockMvcOptionsAccessor();
+            var options = new TestOptionsManager<MvcOptions>();
             if (filters != null)
             {
                 foreach (var filter in filters)
@@ -1458,7 +1444,7 @@ namespace Microsoft.AspNet.Mvc.Test
                 }
             }
 
-            var controllerTypeProvider = new FixedSetControllerTypeProvider(new[] { controllerTypeInfo });
+            var controllerTypeProvider = new StaticControllerTypeProvider(new[] { controllerTypeInfo });
             var modelProvider = new DefaultApplicationModelProvider(options);
 
             var provider = new ControllerActionDescriptorProvider(
@@ -1472,9 +1458,9 @@ namespace Microsoft.AspNet.Mvc.Test
         private ControllerActionDescriptorProvider GetProvider(
             params TypeInfo[] controllerTypeInfos)
         {
-            var options = new MockMvcOptionsAccessor();
+            var options = new TestOptionsManager<MvcOptions>();
 
-            var controllerTypeProvider = new FixedSetControllerTypeProvider(controllerTypeInfos);
+            var controllerTypeProvider = new StaticControllerTypeProvider(controllerTypeInfos);
             var modelProvider = new DefaultApplicationModelProvider(options);
 
             var provider = new ControllerActionDescriptorProvider(
@@ -1489,10 +1475,10 @@ namespace Microsoft.AspNet.Mvc.Test
             TypeInfo controllerTypeInfo,
             IApplicationModelConvention convention)
         {
-            var options = new MockMvcOptionsAccessor();
+            var options = new TestOptionsManager<MvcOptions>();
             options.Options.Conventions.Add(convention);
 
-            var controllerTypeProvider = new FixedSetControllerTypeProvider(new[] { controllerTypeInfo });
+            var controllerTypeProvider = new StaticControllerTypeProvider(new[] { controllerTypeInfo });
             var modelProvider = new DefaultApplicationModelProvider(options);
 
             var provider = new ControllerActionDescriptorProvider(
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs
index 0cc1370996..029bd0c591 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs
@@ -9,7 +9,10 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Routing;
@@ -23,7 +26,7 @@ using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ControllerActionInvokerTest
     {
@@ -2079,8 +2082,6 @@ namespace Microsoft.AspNet.Mvc
             var context = new Mock<HttpContext>();
             context.SetupGet(c => c.Items)
                    .Returns(new Dictionary<object, object>());
-            context.Setup(c => c.RequestServices.GetService(typeof(ITempDataDictionary)))
-                       .Returns(new Mock<ITempDataDictionary>().Object);
             context.Setup(c => c.RequestServices.GetService(typeof(ILoggerFactory)))
                        .Returns(new NullLoggerFactory());
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs
index f847cb8a9e..8621c5eca7 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs
@@ -20,7 +20,7 @@ using Microsoft.Framework.Logging.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultActionSelectorTests
     {
@@ -668,9 +668,9 @@ namespace Microsoft.AspNet.Mvc
                 .Select(t => t.GetTypeInfo())
                 .ToList();
 
-            var options = new MockMvcOptionsAccessor();
+            var options = new TestOptionsManager<MvcOptions>();
 
-            var controllerTypeProvider = new FixedSetControllerTypeProvider(controllerTypes);
+            var controllerTypeProvider = new StaticControllerTypeProvider(controllerTypes);
             var modelProvider = new DefaultApplicationModelProvider(options);
 
             var provider = new ControllerActionDescriptorProvider(
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs
index 5419948de7..da2fbf02d0 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs
@@ -10,7 +10,7 @@ using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultAssemblyProviderTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs
index 957b444396..363c478145 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultControllerActivatorTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs
index 593795cff0..a20fb07a51 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs
@@ -12,7 +12,7 @@ using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultControllerFactoryTest
     {
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Core
         {
             // Arrange
             var expected =
-                "The action descriptor must be of type 'Microsoft.AspNet.Mvc.ControllerActionDescriptor'." +
+                $"The action descriptor must be of type '{typeof(ControllerActionDescriptor).FullName}'." +
                 Environment.NewLine + "Parameter name: actionContext";
             var actionDescriptor = new ActionDescriptor();
             var controllerFactory = CreateControllerFactory();
@@ -255,8 +255,6 @@ namespace Microsoft.AspNet.Mvc.Core
                     .Returns(metadataProvider);
             services.Setup(s => s.GetService(typeof(IObjectModelValidator)))
                     .Returns(new DefaultObjectValidator(new IExcludeTypeValidationFilter[0], metadataProvider));
-            services.Setup(s => s.GetService(typeof(ITempDataDictionary)))
-                       .Returns(new Mock<ITempDataDictionary>().Object);
             services.Setup(s => s.GetService(typeof(IActionBindingContextAccessor)))
                 .Returns(new ActionBindingContextAccessor());
             return services.Object;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerTypeProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerTypeProviderTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs
index 6dbd90c07d..d4fd2037c7 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerTypeProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs
@@ -7,7 +7,7 @@ using System.Reflection;
 using Microsoft.AspNet.Mvc.DefaultControllerTypeProviderControllers;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class DefaultControllerTypeProviderTest
     {
@@ -221,7 +221,7 @@ namespace Microsoft.AspNet.Mvc
 
         private static DefaultControllerTypeProvider GetControllerTypeProvider()
         {
-            var assemblyProvider = new FixedSetAssemblyProvider();
+            var assemblyProvider = new StaticAssemblyProvider();
             return new DefaultControllerTypeProvider(assemblyProvider);
         }
     }
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpMethodProviderAttributesTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/HttpMethodProviderAttributesTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs
index b4d37f000d..ccb1e2a37d 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpMethodProviderAttributesTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class HttpMethodProviderAttributesTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs
index e4d91d4c69..6f9782faac 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs
@@ -14,7 +14,7 @@ using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class MvcRouteHandlerTests
     {
@@ -240,7 +240,7 @@ namespace Microsoft.AspNet.Mvc
 
             if (optionsAccessor == null)
             {
-                optionsAccessor = new MockMvcOptionsAccessor();
+                optionsAccessor = new TestOptionsManager<MvcOptions>();
             }
 
             var notifier = new Notifier(new ProxyNotifierMethodAdapter());
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RouteDataActionConstraintTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/RouteDataActionConstraintTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs
index 3a58881b0d..766c068b6b 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RouteDataActionConstraintTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class RouteDataActionConstraintTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ServiceBasedControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ServiceBasedControllerActivatorTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs
index eda86766cd..cbc051d8c4 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ServiceBasedControllerActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class ServiceBasedControllerActivatorTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/TestController.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/TestController.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs
index 9278be0c8c..3497f9cae5 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/TestController.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs
@@ -5,7 +5,7 @@ using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Mvc.Core.Test
+namespace Microsoft.AspNet.Mvc.Actions
 {
     public class TestController
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
index 1a7d515893..3139d1245e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
@@ -4,6 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs
similarity index 95%
rename from test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs
index 025948104c..68f3ae2a9e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Authorization;
+using Microsoft.AspNet.Mvc.Filters;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
@@ -15,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
         {
             // Arrange
             var provider = new AuthorizationApplicationModelProvider(new TestOptionsManager<AuthorizationOptions>());
-            var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor());
+            var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager<MvcOptions>());
 
             var context = new ApplicationModelProviderContext(new[] { typeof(AccountController).GetTypeInfo() });
             defaultProvider.OnProvidersExecuting(context);
@@ -37,7 +38,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
             options.Options.AddPolicy("Derived", policy => policy.RequireClaim("Derived"));
 
             var provider = new AuthorizationApplicationModelProvider(options);
-            var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor());
+            var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager<MvcOptions>());
 
             var context = new ApplicationModelProviderContext(new[] { typeof(DerivedController).GetTypeInfo() });
             defaultProvider.OnProvidersExecuting(context);
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerApplicationModelConventionTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerApplicationModelConventionTest.cs
deleted file mode 100644
index a96f1dd820..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerApplicationModelConventionTest.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Reflection;
-using Microsoft.AspNet.Mvc;
-using Microsoft.Framework.Internal;
-using Xunit;
-
-namespace Microsoft.AspNet.Mvc.ApplicationModels
-{
-    public class ControllerApplicationModelConventionTest
-    {
-        [Fact]
-        public void DefaultControllerModelConvention_AppliesToAllControllers()
-        {
-            // Arrange
-            var options = new MvcOptions();
-            var app = new ApplicationModel();
-            app.Controllers.Add(new ControllerModel(typeof(HelloController).GetTypeInfo(), new List<object>()));
-            app.Controllers.Add(new ControllerModel(typeof(WorldController).GetTypeInfo(), new List<object>()));
-            options.Conventions.Add(new SimpleControllerConvention());
-
-            // Act
-            options.Conventions[0].Apply(app);
-
-            // Assert
-            foreach (var controller in app.Controllers)
-            {
-                Assert.True(controller.Properties.ContainsKey("TestProperty"));
-            }
-        }
-
-        private class HelloController { }
-        private class WorldController { }
-
-        private class SimpleControllerConvention : IControllerModelConvention
-        {
-            public void Apply([NotNull] ControllerModel controller)
-            {
-                controller.Properties.Add("TestProperty", "TestValue");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
index 52a4aec663..0f2ee4180b 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
@@ -4,6 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs
index 901874460f..511773bd71 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs
@@ -7,6 +7,8 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Cors.Core;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
@@ -1209,7 +1211,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
         private class TestApplicationModelProvider : DefaultApplicationModelProvider
         {
             public TestApplicationModelProvider()
-                : this(new MockMvcOptionsAccessor())
+                : this(new TestOptionsManager<MvcOptions>())
             {
             }
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs
index 1c54cec6f3..55112872e0 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs
@@ -5,6 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionApplicationModelConventionTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/ApplicationModelConventionExtensionsTest.cs
similarity index 58%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionApplicationModelConventionTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/ApplicationModelConventionExtensionsTest.cs
index 0836ceb6d2..7516d5271c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionApplicationModelConventionTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/ApplicationModelConventionExtensionsTest.cs
@@ -3,21 +3,24 @@
 
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.Framework.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.ApplicationModels
+namespace Microsoft.Framework.DependencyInjection
 {
-    public class ActionApplicationModelConventionTest
+    public class ApplicationModelConventionExtensionsTest
     {
         [Fact]
         public void DefaultActionModelConvention_AppliesToAllActionsInApp()
         {
             // Arrange
-            var options = new MvcOptions();
             var app = new ApplicationModel();
             app.Controllers.Add(new ControllerModel(typeof(HelloController).GetTypeInfo(), new List<object>()));
             app.Controllers.Add(new ControllerModel(typeof(WorldController).GetTypeInfo(), new List<object>()));
+
+            var options = new MvcOptions();
             options.Conventions.Add(new SimpleActionConvention());
 
             // Act
@@ -33,6 +36,26 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
             }
         }
 
+        [Fact]
+        public void DefaultControllerModelConvention_AppliesToAllControllers()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var app = new ApplicationModel();
+            app.Controllers.Add(new ControllerModel(typeof(HelloController).GetTypeInfo(), new List<object>()));
+            app.Controllers.Add(new ControllerModel(typeof(WorldController).GetTypeInfo(), new List<object>()));
+            options.Conventions.Add(new SimpleControllerConvention());
+
+            // Act
+            options.Conventions[0].Apply(app);
+
+            // Assert
+            foreach (var controller in app.Controllers)
+            {
+                Assert.True(controller.Properties.ContainsKey("TestProperty"));
+            }
+        }
+
         private class HelloController
         {
             public string GetHello()
@@ -56,5 +79,13 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
                 action.Properties.Add("TestProperty", "TestValue");
             }
         }
+
+        private class SimpleControllerConvention : IControllerModelConvention
+        {
+            public void Apply([NotNull] ControllerModel controller)
+            {
+                controller.Properties.Add("TestProperty", "TestValue");
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs
index bf4ecd332e..ef948cbf07 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers;
 using Microsoft.Framework.DependencyInjection;
 using Moq;
@@ -45,7 +46,7 @@ namespace Microsoft.AspNet.Mvc
             Assert.Equal(ServiceLifetime.Transient, services[2].Lifetime);
 
             Assert.Equal(typeof(IControllerTypeProvider), services[3].ServiceType);
-            var typeProvider = Assert.IsType<FixedSetControllerTypeProvider>(services[3].ImplementationInstance);
+            var typeProvider = Assert.IsType<StaticControllerTypeProvider>(services[3].ImplementationInstance);
             Assert.Equal(controllerTypes, typeProvider.ControllerTypes.OrderBy(c => c.Name));
             Assert.Equal(ServiceLifetime.Singleton, services[3].Lifetime);
         }
@@ -59,7 +60,7 @@ namespace Microsoft.AspNet.Mvc
 // independent.
 namespace Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers
 {
-    public class ControllerTypeA : Controller
+    public class ControllerTypeA : Microsoft.AspNet.Mvc.Controller
     {
 
     }
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ExcludeTypeValidationFilterExtensionsTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ExcludeTypeValidationFilterExtensionsTests.cs
deleted file mode 100644
index 00ab312801..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ExcludeTypeValidationFilterExtensionsTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.AspNet.Mvc.ModelBinding.Validation;
-using Xunit;
-
-namespace Microsoft.AspNet.Mvc
-{
-    public class ExcludeTypeValidationFilterExtensionsTests
-    {
-        [Fact]
-        public void InputFormatterDescriptors_AddsTypesAndTypeNames()
-        {
-            // Arrange
-            var type1 = typeof(BaseType);
-            var collection = new List<IExcludeTypeValidationFilter>();
-
-            // Act
-            collection.Add(type1);
-            collection.Add(type1.FullName);
-
-            // Assert
-            Assert.Collection(collection,
-                first =>
-                {
-                    var filter = Assert.IsType<DefaultTypeBasedExcludeFilter>(first);
-                    Assert.Equal(type1, filter.ExcludedType);
-                },
-                second =>
-                {
-                    var filter = Assert.IsType<DefaultTypeNameBasedExcludeFilter>(second);
-                    Assert.Equal(type1.FullName, filter.ExcludedTypeName);
-                });
-        }
-
-        private class BaseType
-        {
-        }
-    }
-}
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FilterCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FilterCollectionExtensionsTest.cs
index 3405f91b33..0947ac0f25 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FilterCollectionExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/FilterCollectionExtensionsTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.ObjectModel;
+using Microsoft.AspNet.Mvc.Filters;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
index de6e8f1c37..6aa6384e52 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ActionFilterAttributeTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
index 8c2c8246b2..d13cb4e00c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
@@ -8,12 +8,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class AuthorizeFilterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultFilterProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultFilterProviderTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs
index 91152b5ec1..436871a5f6 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultFilterProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Design;
 using System.Linq;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheFilterTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs
index 6e758e98a4..b869fe3a7c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs
@@ -4,10 +4,11 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class ResponseCacheFilterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
index 3a773c0cc4..36f63399e3 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Filters
 {
     // These tests share code with the ActionFilterAttribute tests because the IAsyncResultFilter
     // implementations need to behave the same way.
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FlushReportingStream.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FlushReportingStream.cs
index 716204413d..d7bb0231ac 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FlushReportingStream.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/FlushReportingStream.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Threading;
 using Moq;
 
-namespace Microsoft.AspNet.Mvc.Core
+namespace Microsoft.AspNet.Mvc
 {
     public static class FlushReportingStream
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/FormatFilterTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs
index 0ade1df1b3..55bab8570e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FormatFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs
@@ -9,13 +9,16 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Xunit;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 #if DNX451
 using Moq;
 using System.Net;
 #endif
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class FormatFilterTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FormatterMappingsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/FormatterMappingsTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
index 011eb8a477..db35cbc6bf 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/FormatterMappingsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
@@ -6,7 +6,7 @@ using Microsoft.Net.Http.Headers;
 using Xunit;
 
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class FormatterMappingsTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/NoContentFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/NoContentFormatterTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
index fff5aba081..d593da3c52 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/NoContentFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNet.Http.Internal;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class NoContentFormatterTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Core.Test/OutputFormatterTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
index 71abc7d07f..7b81d8eafb 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/OutputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
@@ -7,13 +7,12 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class OutputFormatterTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/StreamOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/StreamOutputFormatterTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
index e77866cccc..37fa0dff68 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/StreamOutputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
@@ -3,10 +3,11 @@
 
 using System;
 using System.IO;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class StreamOutputFormatterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/StringOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Core.Test/StringOutputFormatterTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
index 4668a81dff..f0161fd30e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/StringOutputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
@@ -6,11 +6,10 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class TextPlainFormatterTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs
deleted file mode 100644
index 7242656e6e..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Framework.OptionsModel;
-
-namespace Microsoft.AspNet.Mvc
-{
-    public class MockMvcOptionsAccessor : IOptions<MvcOptions>
-    {
-        public MockMvcOptionsAccessor()
-        {
-            Options = new MvcOptions();
-        }
-
-        public MvcOptions Options { get; private set; }
-
-        public MvcOptions GetNamedOptions(string name)
-        {
-            return Options;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/BodyModelBinderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/BodyModelBinderTests.cs
index 6b0a1da765..04499a1c7e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/BodyModelBinderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/BodyModelBinderTests.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 using Moq;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ExcludeTypeValidationFilterExtensionsTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ExcludeTypeValidationFilterExtensionsTests.cs
new file mode 100644
index 0000000000..2b6cc69528
--- /dev/null
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ExcludeTypeValidationFilterExtensionsTests.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNet.Mvc.ModelBinding
+{
+    public class ExcludeTypeValidationFilterExtensionsTests
+    {
+        [Fact]
+        public void AddFilter_ByType()
+        {
+            // Arrange
+            var type = typeof(BaseType);
+            var collection = new List<IExcludeTypeValidationFilter>();
+
+            // Act
+            collection.Add(type);
+
+            // Assert
+            var filter = Assert.IsType<DefaultTypeBasedExcludeFilter>(Assert.Single(collection));
+            Assert.Equal(type, filter.ExcludedType);
+        }
+
+        [Fact]
+        public void AddFilter_ByTypeName()
+        {
+            // Arrange
+            var type = typeof(BaseType);
+            var collection = new List<IExcludeTypeValidationFilter>();
+
+            // Act
+            collection.Add(type.FullName);
+
+            // Assert
+            var filter = Assert.IsType<DefaultTypeNameBasedExcludeFilter>(Assert.Single(collection));
+            Assert.Equal(type.FullName, filter.ExcludedTypeName);
+        }
+
+        private class BaseType
+        {
+        }
+    }
+}
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/SimpleTypeExcludeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/Validation/SimpleTypeExcludeFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.Core.Test/SimpleTypeExcludeFilterTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/Validation/SimpleTypeExcludeFilterTest.cs
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs
index 8a20e2efa3..5ca128ae95 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs
@@ -9,6 +9,7 @@ using System.Globalization;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Moq;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs
index 7ec7576328..a8da9c5d65 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs
index 0f7c3b5aa1..78d1d43885 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs
@@ -5,6 +5,10 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Net.Http.Headers;
 #if DNX451
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs
index eb781f7295..203f54fcff 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs
@@ -5,6 +5,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs
index a5465731bc..8ffa61423d 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs
index 2dfcee1564..80684ca447 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Logging.Testing;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
index cc4c4853c8..a2c89b0586 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Logging.Testing;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
index 9b6ac5f3bd..2433538582 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
@@ -6,11 +6,12 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Routing.Tests
+namespace Microsoft.AspNet.Mvc.Routing
 {
     public class KnownRouteValueConstraintTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RouteTemplateProviderAttributesTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
similarity index 94%
rename from test/Microsoft.AspNet.Mvc.Core.Test/RouteTemplateProviderAttributesTest.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
index 8f5c2cd666..c11949ffed 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/RouteTemplateProviderAttributesTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Routing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Routing
 {
     public class RouteTemplateProviderAttributesTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs
index 714ffd9975..42022378bf 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
index 6e7e2942ee..0660db93ea 100644
--- a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
@@ -4,9 +4,10 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Cors.Core;
+using Microsoft.AspNet.Mvc.ApplicationModels;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.ApplicationModels
+namespace Microsoft.AspNet.Mvc.Cors
 {
     public class CorsApplicationModelProviderTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
index 34fae4fec6..a842461c53 100644
--- a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
@@ -8,11 +8,13 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Cors.Core;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Cors
 {
     public class CorsAuthorizationFilterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs
index e22edf33f3..fa031c35d9 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs
@@ -8,13 +8,14 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class JsonResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
index 5cc22d017b..6e546e0f07 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
@@ -4,7 +4,6 @@
 #if DNX451
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -16,7 +15,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class JsonInputFormatterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
index a404393b94..0b1414f399 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Testing;
 using Microsoft.Net.Http.Headers;
 using Moq;
@@ -16,7 +17,7 @@ using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Core.Test.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class JsonOutputFormatterTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
index ddd9293a1d..abc7ca3758 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNet.Mvc.ModelBinding;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters
 {
     public class JsonPatchInputFormatterTest
     {
@@ -114,7 +114,7 @@ namespace Microsoft.AspNet.Mvc
         {
             // Arrange
             var exceptionMessage = "Cannot deserialize the current JSON array (e.g. [1,2,3]) into type " +
-                "'Microsoft.AspNet.Mvc.JsonPatchInputFormatterTest+Customer' because the type requires a JSON object ";
+                $"'{typeof(Customer).FullName}' because the type requires a JSON object ";
 
             var formatter = new JsonPatchInputFormatter();
             var content = "[{\"op\": \"add\", \"path\" : \"Customer/Name\", \"value\":\"John\"}]";
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
similarity index 95%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
index 7d2c58c6ff..07fe36cf61 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Linq;
-using System.Collections.Generic;
-using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class DelegatingEnumerableTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
index 7eec2a57fb..b0513587eb 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class DelegatingEnumeratorTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
index 1d8e173e85..41562a8a08 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
@@ -4,10 +4,9 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class EnumerableWrapperProviderFactoryTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
index c3e3a1ea5b..8e0870cd0e 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
@@ -4,11 +4,9 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Microsoft.AspNet.Mvc;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class EnumerableWrapperProviderTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
similarity index 93%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
index c67ea68f5f..251cb64e34 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class PersonWrapper : IUnwrappable
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
similarity index 91%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
index 257a3a9a0e..8111cc4519 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class PersonWrapperProvider : IWrapperProvider
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
similarity index 89%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
index f4fc6c6f18..08e98935b7 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class PersonWrapperProviderFactory : IWrapperProviderFactory
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
index 623d07e4ad..83dc779e12 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
@@ -3,9 +3,8 @@
 
 using System;
 using Xunit;
-using Microsoft.AspNet.Mvc;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class SerializableErrorWrapperProviderTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
index aa266921ec..39c377f68a 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
@@ -6,11 +6,10 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Xml;
 using Microsoft.AspNet.Mvc.ModelBinding;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
 using Microsoft.AspNet.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class SerializableErrorWrapperTests
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
index 724dcd8047..665961ddfc 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Formatters.Xml
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     public class SerializableWrapperProviderFactoryTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
index cca8b2273e..44480dd4c8 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Xml;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.AspNet.Testing;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Net.Http.Headers;
diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
index cb4e3e9304..40045f7c48 100644
--- a/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Xml.Serialization;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs
index cf178ef80c..40f57acec6 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs
@@ -7,11 +7,11 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc.ModelBinding;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Framework.DependencyInjection;
 using Newtonsoft.Json;
 using Xunit;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
@@ -650,8 +650,8 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         [ConditionalTheory]
         // Mono issue - https://github.com/aspnet/External/issues/18
         [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
-        [InlineData("Controller", "text/xml", "Microsoft.AspNet.Mvc.Formatters.Xml.XmlDataContractSerializerOutputFormatter")]
-        [InlineData("Action", "application/json", "Microsoft.AspNet.Mvc.JsonOutputFormatter")]
+        [InlineData("Controller", "text/xml", "Microsoft.AspNet.Mvc.Formatters.XmlDataContractSerializerOutputFormatter")]
+        [InlineData("Action", "application/json", "Microsoft.AspNet.Mvc.Formatters.JsonOutputFormatter")]
         public async Task ApiExplorer_ResponseContentType_OverrideOnAction(
             string action,
             string contentType,
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs
index e01dbaf904..46a0119f9e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ActionConstraintsWebSite;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Framework.DependencyInjection;
 using Newtonsoft.Json;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs
index cd77b32b8d..6adbcd2e1e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs
@@ -11,6 +11,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Dnx.Runtime;
 using Xunit;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs
index 3017dcac1e..aea3720adf 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs
@@ -6,10 +6,10 @@ using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc.ActionConstraints;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApiExplorer;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Razor;
-using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs
index 0f882b9a62..4e8fdc453e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Template;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
index 187f826734..478ac6ea50 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
@@ -10,6 +10,7 @@ using Microsoft.AspNet.TestHost;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Dnx.Runtime;
 using Microsoft.Dnx.Runtime.Infrastructure;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
@@ -144,7 +145,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             // Creates a service type that will limit MVC to only the controllers in the test site.
             // We only want this to happen when running in-process.
             var assembly = Assembly.Load(new AssemblyName(siteName));
-            var provider = new FixedSetAssemblyProvider
+            var provider = new StaticAssemblyProvider
             {
                 CandidateAssemblies =
                 {
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
index 4a9b1e1295..d19b9caf55 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
@@ -6,6 +6,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 using Newtonsoft.Json;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
index a789f6a8a6..3957fdffeb 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
index 06b1b5fb9f..d09579d992 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
@@ -3,6 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
index 987bb1affd..7ca53d6679 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Testing;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
index ae35cfceb3..249b9e81ba 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Testing;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
index b1f0e53be5..14fc763eb4 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
index a074a37966..100a2c8870 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
index 011324e375..e4fdf5af97 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
@@ -9,6 +9,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
index 4d3ffe1141..ac57f42e07 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
index df75eeb275..215b10f924 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
index 3b4a9860af..2b636dc1bc 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
index e5daf90fbc..316849fea5 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
index 2e30b896a9..7fc20ee589 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
@@ -6,6 +6,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
index b2fc870312..83e87f5ee2 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs
index 0c55f372ae..50ca9b1853 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
index d7f233f637..a7e0916773 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs
index eb2d7a40a9..1c1f0bde7f 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
index c152c42934..f90bcd7a79 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
index 4c1adf8696..570a178a17 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs
index 6f676f8006..8eae291f33 100644
--- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs
+++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs
index aff0ba923f..a1cfeb7add 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs
index 3e9da762c2..1d2797e8e5 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
index 05587342dc..38b29b0c28 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Rendering;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
index f12a7306b4..0e94bc4649 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
index a2861cc661..a52aa4fd90 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs
index 030ae61263..bdad61813b 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs
index e458c124d1..6507511ae0 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 using Microsoft.Framework.WebEncoders.Testing;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
index b95df43ef6..62943f4d7d 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
index b94e56553b..2c03948c3d 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.TestCommon;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
index 2fad3a89a1..c7716056dd 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
index f6b2e0dae2..29c914aa22 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.TagHelpers.Internal;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
index 0b510cca2f..cf82fc5fb6 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.TagHelpers.Internal;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
index fd01d25fa4..3be6a0a327 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNet.Antiforgery;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.AspNet.Html.Abstractions;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
index c95fdd1310..6f1bac96e7 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
index c6df962541..490924c984 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
index 992f67510e..32711d5d36 100644
--- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
index 7f7e1d762b..59e69a469f 100644
--- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Cors;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs
index cff4e4d502..b698b632b9 100644
--- a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs
@@ -5,11 +5,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Test
+namespace Microsoft.AspNet.Mvc.Filters
 {
     public class CommonFilterTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs
index d84d374c80..672da2db2d 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs
@@ -6,15 +6,16 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
+using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
-using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class PartialViewResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs
index 0e0448922b..442e8a7146 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs
@@ -8,19 +8,18 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ViewComponentResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs
rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs
index a8851770e9..28e35b042c 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.TestCommon.Notification;
 using Microsoft.AspNet.Routing;
@@ -17,7 +18,7 @@ using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ActionResults
 {
     public class ViewResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
index d132c719cf..03048da0ea 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
@@ -11,6 +11,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
index 2a4f3d02d9..b371c69827 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
@@ -7,6 +7,8 @@ using System.IO;
 using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Newtonsoft.Json;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
index 75a87abcc0..0bf99ffc5f 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs
index aab174fbcd..9f01e7d36b 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.TestCommon;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs
index 235ecf76f2..51f7301e96 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Html.Abstractions;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Mvc.Rendering;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs
index 16cdf52fdf..c908dc83eb 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.AspNet.Antiforgery;
 using Microsoft.AspNet.DataProtection;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Framework.WebEncoders;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
index 61f7fcea6a..b899877145 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Antiforgery;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs
index 3f891bf458..90c28554b9 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
index 0afb403ec7..d3c7a217cb 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs
index 7a7c536866..4ac1a8dbb9 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Moq;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs
index 55b8a664e8..6849e2f6c2 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs
@@ -1,8 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewComponents;
 using Microsoft.Framework.WebEncoders;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
index 9d269f722c..465ef38e7f 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewComponents;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
index 0ef17727e2..6c357696b4 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.Actions;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.ViewComponents
@@ -85,7 +86,7 @@ namespace Microsoft.AspNet.Mvc.ViewComponents
 
             private static IAssemblyProvider GetAssemblyProvider()
             {
-                var assemblyProvider = new FixedSetAssemblyProvider();
+                var assemblyProvider = new StaticAssemblyProvider();
                 assemblyProvider.CandidateAssemblies.Add(
                     typeof(FilteredViewComponentDescriptorProvider).GetTypeInfo().Assembly);
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
index 1e7f40812f..fa3a11a5e7 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 using Xunit;
 
@@ -203,7 +204,7 @@ namespace Microsoft.AspNet.Mvc.ViewComponents
 
             private static IAssemblyProvider GetAssemblyProvider()
             {
-                var assemblyProvider = new FixedSetAssemblyProvider();
+                var assemblyProvider = new StaticAssemblyProvider();
                 assemblyProvider.CandidateAssemblies.Add(
                     typeof(FilteredViewComponentSelector).GetTypeInfo().Assembly);
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs
index ab03d67a38..fd4737480e 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewComponents;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
index baf62486e4..409090d2d4 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.ViewComponents;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
index cf5e733cef..f426226366 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Routing;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
index 33d4c21ba2..19144c6610 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
@@ -7,6 +7,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
index 11aafa2ba8..84a22c06de 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
index bb81c934d0..b34b84e596 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
@@ -7,6 +7,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
index da1fce95c2..5a83c53dde 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Routing;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
index 96ef43adf0..d34d0817f1 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
@@ -7,6 +7,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
index 8d2ace76c8..4fe485d6f5 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
@@ -7,6 +7,9 @@ using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
index 94435c1a2e..10760c19ca 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
@@ -8,6 +8,8 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
@@ -370,7 +372,7 @@ namespace System.Web.Http
 
         private ControllerActionDescriptorProvider CreateProvider()
         {
-            var assemblyProvider = new FixedSetAssemblyProvider();
+            var assemblyProvider = new StaticAssemblyProvider();
             assemblyProvider.CandidateAssemblies.Add(GetType().GetTypeInfo().Assembly);
             var controllerTypeProvider = new NamespaceFilteredControllerTypeProvider(assemblyProvider);
 
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
index 804b99850c..01c6cc778a 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
@@ -9,6 +9,8 @@ using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Newtonsoft.Json;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
index f9333f437a..44b7657c79 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
@@ -7,6 +7,9 @@ using System.Net;
 using System.Net.Http;
 using System.Web.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Routing;
 using Moq;
 #endif
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
index 2a7a6b712e..f740697786 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.WebApiCompatShim;
 using Microsoft.AspNet.Testing.xunit;
 using Moq;
@@ -145,8 +146,10 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
             Assert.NotNull(httpContext.Response.ContentLength);
         }
 
-        private OutputFormatterContext GetOutputFormatterContext(object outputValue, Type outputType,
-                                                                    HttpContext httpContext)
+        private OutputFormatterContext GetOutputFormatterContext(
+            object outputValue,
+            Type outputType,
+            HttpContext httpContext)
         {
             return new OutputFormatterContext
             {
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
index 052dc30832..2559d82ad0 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Web.Http;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNet.Mvc.ActionConstraints;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Xunit;
diff --git a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs
index ca5889925b..76f0655bf3 100644
--- a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs
+++ b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActionConstraintsWebSite
 {
diff --git a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs
index ca06eca38f..db74802593 100644
--- a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs
+++ b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActionConstraintsWebSite
 {
diff --git a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs
index 0fde891c37..2e38dca60e 100644
--- a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs
+++ b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs
@@ -5,6 +5,7 @@ using System;
 using System.Text;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActionResultsWebSite
 {
diff --git a/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs b/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs
index 5f3dbe6065..7c987901bf 100644
--- a/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActionResultsWebSite
 {
diff --git a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs
index c9f16cc6ca..0cf3832733 100644
--- a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs
+++ b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs
@@ -2,7 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace ActionResultsWebSite
 {
diff --git a/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs b/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs
index a8d2413597..653d8c880d 100644
--- a/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs
+++ b/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActivatorWebSite
 {
diff --git a/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs b/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs
index 2cdbf4ce80..d381d782e5 100644
--- a/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs
+++ b/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs
@@ -3,6 +3,8 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace ActivatorWebSite
 {
diff --git a/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs b/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs
index 621c454bd6..b559df3adf 100644
--- a/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs
+++ b/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ActivatorWebSite
 {
diff --git a/test/WebSites/ActivatorWebSite/Controllers/ViewController.cs b/test/WebSites/ActivatorWebSite/Controllers/ViewController.cs
index 03ff25f470..16540b3740 100644
--- a/test/WebSites/ActivatorWebSite/Controllers/ViewController.cs
+++ b/test/WebSites/ActivatorWebSite/Controllers/ViewController.cs
@@ -11,32 +11,32 @@ namespace ActivatorWebSite
     /// </summary>
     public class ViewController : Controller
     {
-        public ViewResult ConsumeDefaultProperties()
+        public IActionResult ConsumeDefaultProperties()
         {
             return View();
         }
 
-        public ViewResult ConsumeInjectedService()
+        public IActionResult ConsumeInjectedService()
         {
             return View();
         }
 
-        public ViewResult ConsumeServicesFromBaseType()
+        public IActionResult ConsumeServicesFromBaseType()
         {
             return View();
         }
 
-        public ViewResult ConsumeViewComponent()
+        public IActionResult ConsumeViewComponent()
         {
             return View();
         }
 
-        public ViewResult ConsumeCannotBeActivatedComponent()
+        public IActionResult ConsumeCannotBeActivatedComponent()
         {
             return View();
         }
 
-        public ViewResult UseTagHelper()
+        public IActionResult UseTagHelper()
         {
             var item = new Item
             {
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
index c1eef96cfe..dda90db1d9 100644
--- a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
+++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
@@ -4,8 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.ApiExplorer;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ApiExplorerWebSite
 {
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
index 941cc17d21..b5052ed7ad 100644
--- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
+++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
@@ -3,6 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ApiExplorerWebSite
 {
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
index 2d084b9933..172d0f9538 100644
--- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
+++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
@@ -3,6 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ApiExplorerWebSite
 {
diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs
index b3037e9742..f80922cb4d 100644
--- a/test/WebSites/ApiExplorerWebSite/Startup.cs
+++ b/test/WebSites/ApiExplorerWebSite/Startup.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ApiExplorerWebSite
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
index 7416c1c4a8..5bd46b0bbd 100644
--- a/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
+++ b/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 
 namespace ApplicationModelWebSite
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
index 11d5ccdccb..cd66df0272 100644
--- a/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
+++ b/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace ApplicationModelWebSite
 {
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
index da18d97cd1..54c130447b 100644
--- a/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
+++ b/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 
 namespace ApplicationModelWebSite
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
index 64ee79a517..bdbc3446cf 100644
--- a/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace ApplicationModelWebSite
 {
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs
index e098af3e80..fcd957aa66 100644
--- a/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs
+++ b/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace ApplicationModelWebSite.Controllers
 {
diff --git a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
index 1f2a2d8887..89418387ff 100644
--- a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
+++ b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace BasicWebSite
 {
diff --git a/test/WebSites/BasicWebSite/Controllers/Appointments.cs b/test/WebSites/BasicWebSite/Controllers/Appointments.cs
index 14832f6b5c..4a1154da9b 100644
--- a/test/WebSites/BasicWebSite/Controllers/Appointments.cs
+++ b/test/WebSites/BasicWebSite/Controllers/Appointments.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace BasicWebSite.Controllers
 {
diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs
index 35f4a4da7d..a7e53f823b 100644
--- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs
@@ -5,6 +5,8 @@ using System.Threading.Tasks;
 using BasicWebSite.Models;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace BasicWebSite.Controllers
 {
diff --git a/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs b/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
index 24b341b12d..c3bbb097d5 100644
--- a/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
diff --git a/test/WebSites/BasicWebSite/Controllers/MonitorController.cs b/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
index 389891d5db..9f615519e4 100644
--- a/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace BasicWebSite
 {
diff --git a/test/WebSites/BasicWebSite/Controllers/RoutingController.cs b/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
index 2fe8c22b9e..f9705530ec 100644
--- a/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace BasicWebSite
 {
diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs
index f7b9d87d37..67574725ad 100644
--- a/test/WebSites/BasicWebSite/Startup.cs
+++ b/test/WebSites/BasicWebSite/Startup.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 
 namespace BasicWebSite
diff --git a/test/WebSites/CompositeViewEngineWebSite/HomeController.cs b/test/WebSites/CompositeViewEngineWebSite/HomeController.cs
index afa70bd3c6..90184174a0 100644
--- a/test/WebSites/CompositeViewEngineWebSite/HomeController.cs
+++ b/test/WebSites/CompositeViewEngineWebSite/HomeController.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace CompositeViewEngineWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
index ca953bf023..d04c5ff72a 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
index 1464a5713b..394c77f6b6 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
index 86b48894d3..5255259669 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
index b26eedfeda..51b44f24df 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
index 881650582b..f548a30125 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
@@ -3,6 +3,9 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
index 06e8c89abd..838fd75cdf 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
index 1b3f6b3976..72970e5e28 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
@@ -2,6 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 using Newtonsoft.Json;
 
 namespace ContentNegotiationWebSite
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
index 83b66cfb88..44cfc382cc 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
index d82751ff6c..6617f2eb05 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
index 58ff645894..0906e7a169 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
@@ -3,6 +3,8 @@
 
 using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace ContentNegotiationWebSite
 {
diff --git a/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs b/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
index 6a0d473920..6f2f1d55df 100644
--- a/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
+++ b/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace ContentNegotiationWebSite
diff --git a/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs b/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
index 9264692c6e..a50c88acfe 100644
--- a/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
+++ b/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace ContentNegotiationWebSite
diff --git a/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
index 1f645d2b69..1a39a84138 100644
--- a/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
+++ b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Internal;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace ContentNegotiationWebSite
diff --git a/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
index 676519b24f..0d57854ef1 100644
--- a/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
+++ b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Internal;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace ContentNegotiationWebSite
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
index ef63bb4d0c..eebd5a5240 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
+++ b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
@@ -3,6 +3,8 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace ControllersFromServicesClassLibrary
 {
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs b/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
index 9a06c8a5a2..e37da7f9e4 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
+++ b/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ControllersFromServicesClassLibrary
 {
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs b/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
index 6a4ccfcd85..ab9fa522e7 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
+++ b/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ControllersFromServicesClassLibrary
 {
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs b/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
index 1c6e83099a..a83a38cb61 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
+++ b/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace ControllersFromServicesClassLibrary
 {
diff --git a/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs b/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs
index 3147cb2a90..75e247873a 100644
--- a/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs
+++ b/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace CustomRouteWebSite
 {
diff --git a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
index 7d2cc5ac68..f08f432a47 100644
--- a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
+++ b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace FilesWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs b/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs
index 757269c940..2a38057492 100644
--- a/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs b/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs
index 87abf0b963..aac014e507 100644
--- a/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs
@@ -3,6 +3,8 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/HomeController.cs b/test/WebSites/FiltersWebSite/Controllers/HomeController.cs
index 108cb062d4..1199e89320 100644
--- a/test/WebSites/FiltersWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/HomeController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace FiltersWebSite.Controllers
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/JsonOnlyController.cs b/test/WebSites/FiltersWebSite/Controllers/JsonOnlyController.cs
index 34b4847da7..7a7e5ebac6 100644
--- a/test/WebSites/FiltersWebSite/Controllers/JsonOnlyController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/JsonOnlyController.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FiltersWebSite.Controllers
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/ProductsController.cs b/test/WebSites/FiltersWebSite/Controllers/ProductsController.cs
index f7a28e18db..3250bbf880 100644
--- a/test/WebSites/FiltersWebSite/Controllers/ProductsController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/ProductsController.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs b/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs
index 4ef4672ad7..16ee0cef6d 100644
--- a/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs
@@ -2,8 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FiltersWebSite.Controllers
 {
diff --git a/test/WebSites/FiltersWebSite/Controllers/ResultFilterController.cs b/test/WebSites/FiltersWebSite/Controllers/ResultFilterController.cs
index caea55ca28..68bec7d200 100644
--- a/test/WebSites/FiltersWebSite/Controllers/ResultFilterController.cs
+++ b/test/WebSites/FiltersWebSite/Controllers/ResultFilterController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/AddHeaderAttribute.cs b/test/WebSites/FiltersWebSite/Filters/AddHeaderAttribute.cs
index 68bdbed86a..e826d9b1ea 100644
--- a/test/WebSites/FiltersWebSite/Filters/AddHeaderAttribute.cs
+++ b/test/WebSites/FiltersWebSite/Filters/AddHeaderAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs b/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs
index 764d54f5d3..32f6ada0eb 100644
--- a/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs
+++ b/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/BlockAnonymous.cs b/test/WebSites/FiltersWebSite/Filters/BlockAnonymous.cs
index ea751bedad..8360d2dae3 100644
--- a/test/WebSites/FiltersWebSite/Filters/BlockAnonymous.cs
+++ b/test/WebSites/FiltersWebSite/Filters/BlockAnonymous.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs
index d6de15d4fd..17a9ccc9cf 100644
--- a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs
@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ChangeContentResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ChangeContentResultFilter.cs
index a309eac8be..18b6e10e70 100644
--- a/test/WebSites/FiltersWebSite/Filters/ChangeContentResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ChangeContentResultFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs
index 4d74e4b0e7..fe518a983d 100644
--- a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs
@@ -3,7 +3,8 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerAuthorizationFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerAuthorizationFilter.cs
index cd5fbd9757..159e7ddbcc 100644
--- a/test/WebSites/FiltersWebSite/Filters/ControllerAuthorizationFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ControllerAuthorizationFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerExceptionFilter.cs
index 2448accc9f..8553ed080e 100644
--- a/test/WebSites/FiltersWebSite/Filters/ControllerExceptionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ControllerExceptionFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs
index 2316c6dadf..248f55d9d8 100644
--- a/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs
index 9ea56b7261..a8be87b7c8 100644
--- a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs
@@ -3,7 +3,8 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs
index 70bc463db9..663c839b68 100644
--- a/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalExceptionFilter.cs
index fb0d749fc5..fca590bc23 100644
--- a/test/WebSites/FiltersWebSite/Filters/GlobalExceptionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/GlobalExceptionFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs
index 09c7aabb6a..5aae34dd7c 100644
--- a/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/HandleExceptionActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/HandleExceptionActionFilter.cs
index 43969dee70..5a2ad9cc6b 100644
--- a/test/WebSites/FiltersWebSite/Filters/HandleExceptionActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/HandleExceptionActionFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/HandleInvalidOperationExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/HandleInvalidOperationExceptionFilter.cs
index f473143ace..bf4ac8d1f1 100644
--- a/test/WebSites/FiltersWebSite/Filters/HandleInvalidOperationExceptionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/HandleInvalidOperationExceptionFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ModifiedRandomNumberProvider.cs b/test/WebSites/FiltersWebSite/Filters/ModifiedRandomNumberProvider.cs
index 4263f87039..343da658ed 100644
--- a/test/WebSites/FiltersWebSite/Filters/ModifiedRandomNumberProvider.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ModifiedRandomNumberProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs
index bdd34a26b3..1ab247f133 100644
--- a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs
@@ -1,8 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/PassThroughActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/PassThroughActionFilter.cs
index 9f62ef9a9d..d0b4e30b0c 100644
--- a/test/WebSites/FiltersWebSite/Filters/PassThroughActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/PassThroughActionFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs
index 6499f65f37..51df744ef2 100644
--- a/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs b/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs
index 9d21ed60cd..ddcbac33a8 100644
--- a/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs
@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Net.Http.Headers;
 
 namespace FiltersWebSite
diff --git a/test/WebSites/FiltersWebSite/Filters/RandomNumberModifier.cs b/test/WebSites/FiltersWebSite/Filters/RandomNumberModifier.cs
index bc7690a7c7..f91c9ea700 100644
--- a/test/WebSites/FiltersWebSite/Filters/RandomNumberModifier.cs
+++ b/test/WebSites/FiltersWebSite/Filters/RandomNumberModifier.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/RandomNumberProvider.cs b/test/WebSites/FiltersWebSite/Filters/RandomNumberProvider.cs
index f2b64d581d..c00b984357 100644
--- a/test/WebSites/FiltersWebSite/Filters/RandomNumberProvider.cs
+++ b/test/WebSites/FiltersWebSite/Filters/RandomNumberProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs
index 6a3fb304e3..e3341eb603 100644
--- a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs
+++ b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs
@@ -1,8 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs
index 3a2831b5f6..73bda3f434 100644
--- a/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs
@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Net.Http.Headers;
 
 namespace FiltersWebSite
diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs
index 794d75e9fd..8fa9b6c749 100644
--- a/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs
index f974212640..5ab81fe92c 100644
--- a/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs
@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ThrowingActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ThrowingActionFilter.cs
index 819694fa1a..e924ba3efd 100644
--- a/test/WebSites/FiltersWebSite/Filters/ThrowingActionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ThrowingActionFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ThrowingAuthorizationFilter.cs b/test/WebSites/FiltersWebSite/Filters/ThrowingAuthorizationFilter.cs
index 08647d7a39..c555702a34 100644
--- a/test/WebSites/FiltersWebSite/Filters/ThrowingAuthorizationFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ThrowingAuthorizationFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ThrowingExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ThrowingExceptionFilter.cs
index d9ecd69c8e..500cd363a7 100644
--- a/test/WebSites/FiltersWebSite/Filters/ThrowingExceptionFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ThrowingExceptionFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/ThrowingResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ThrowingResultFilter.cs
index a5a16084a7..54a68d6865 100644
--- a/test/WebSites/FiltersWebSite/Filters/ThrowingResultFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/ThrowingResultFilter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Filters/TracingResourceFilter.cs b/test/WebSites/FiltersWebSite/Filters/TracingResourceFilter.cs
index 97175e00ef..413d3865c0 100644
--- a/test/WebSites/FiltersWebSite/Filters/TracingResourceFilter.cs
+++ b/test/WebSites/FiltersWebSite/Filters/TracingResourceFilter.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FiltersWebSite
 {
diff --git a/test/WebSites/FiltersWebSite/Helper/Helpers.cs b/test/WebSites/FiltersWebSite/Helper/Helpers.cs
index 897d5088f2..0c01ae49d0 100644
--- a/test/WebSites/FiltersWebSite/Helper/Helpers.cs
+++ b/test/WebSites/FiltersWebSite/Helper/Helpers.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.Net.Http.Headers;
 
 namespace FiltersWebSite
diff --git a/test/WebSites/FormatFilterWebSite/CustomFormatter.cs b/test/WebSites/FormatFilterWebSite/CustomFormatter.cs
index 27ad6f3d5c..540523bee3 100644
--- a/test/WebSites/FormatFilterWebSite/CustomFormatter.cs
+++ b/test/WebSites/FormatFilterWebSite/CustomFormatter.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace FormatFilterWebSite
diff --git a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
index 55808e656c..0349c1a5ce 100644
--- a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
+++ b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
@@ -2,7 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FormatterWebSite
 {
diff --git a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
index 27a9369524..627ea0e1c3 100644
--- a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
+++ b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace FormatterWebSite.Controllers
 {
diff --git a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
index 71eb837f62..320869ab1f 100644
--- a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
+++ b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
@@ -3,6 +3,8 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Formatters;
 using Newtonsoft.Json;
 
 namespace FormatterWebSite.Controllers
diff --git a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
index 9beaa16b66..74d8308441 100644
--- a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
+++ b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace FormatterWebSite.Controllers
 {
diff --git a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
index 3a84a42bfe..89017d2d54 100644
--- a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
+++ b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
@@ -3,7 +3,9 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters;
 
 namespace FormatterWebSite
 {
diff --git a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
index 9260275176..9eaea25c3a 100644
--- a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
+++ b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace FormatterWebSite
 {
diff --git a/test/WebSites/FormatterWebSite/StringInputFormatter.cs b/test/WebSites/FormatterWebSite/StringInputFormatter.cs
index a6b177a236..88f76cc9f7 100644
--- a/test/WebSites/FormatterWebSite/StringInputFormatter.cs
+++ b/test/WebSites/FormatterWebSite/StringInputFormatter.cs
@@ -1,8 +1,10 @@
-using System;
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace FormatterWebSite
diff --git a/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs b/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
index b4d36ba3fb..f1ff618571 100644
--- a/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
+++ b/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace FormatterWebSite
diff --git a/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs b/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
index 1f82f1779a..602e3b0961 100644
--- a/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
@@ -7,7 +7,7 @@ namespace MvcSample.Web.Components
 {
     public class SplashViewComponent : ViewComponent
     {
-        public ViewViewComponentResult Invoke()
+        public IViewComponentResult Invoke()
         {
             var region = (string)ViewData["Locale"];
             var model = region == "North" ? "NorthWest Store":
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs b/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
index 1849ed0187..68a9810436 100644
--- a/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
@@ -12,7 +12,7 @@ namespace HtmlGenerationWebSite.Controllers
         public ProductsService ProductsService { get; set; }
 
         [HttpGet("/catalog")]
-        public ViewResult Splash(int categoryId, int correlationId, [FromHeader] string locale)
+        public IActionResult Splash(int categoryId, int correlationId, [FromHeader] string locale)
         {
             var category = categoryId == 1 ? "Laptops" : "Phones";
             ViewData["Category"] = category;
@@ -23,21 +23,21 @@ namespace HtmlGenerationWebSite.Controllers
         }
 
         [HttpGet("/catalog/{id:int}")]
-        public ViewResult Details(int id)
+        public IActionResult Details(int id)
         {
             ViewData["ProductId"] = id;
             return View();
         }
 
         [HttpGet("/catalog/cart")]
-        public ViewResult ShoppingCart(int correlationId)
+        public IActionResult ShoppingCart(int correlationId)
         {
             ViewData["CorrelationId"] = correlationId;
             return View();
         }
 
         [HttpGet("/catalog/{region}/confirm-payment")]
-        public ViewResult GuestConfirmPayment(string region, int confirmationId = 0)
+        public IActionResult GuestConfirmPayment(string region, int confirmationId = 0)
         {
             ViewData["Message"] = "Welcome Guest. Your confirmation id is " + confirmationId;
             ViewData["Region"] = region;
@@ -45,7 +45,7 @@ namespace HtmlGenerationWebSite.Controllers
         }
 
         [HttpGet("/catalog/{region}/{section}/confirm-payment")]
-        public ViewResult ConfirmPayment(string region, string section, int confirmationId)
+        public IActionResult ConfirmPayment(string region, string section, int confirmationId)
         {
             var message = "Welcome " + section + " member. Your confirmation id is " + confirmationId;
             ViewData["Message"] = message;
@@ -55,7 +55,7 @@ namespace HtmlGenerationWebSite.Controllers
         }
 
         [HttpGet("/catalog/past-purchases/{id}")]
-        public ViewResult PastPurchases(string id, int correlationId)
+        public IActionResult PastPurchases(string id, int correlationId)
         {
             var identity = new ClaimsIdentity();
             identity.AddClaim(new Claim(ClaimsIdentity.DefaultNameClaimType, id));
@@ -66,7 +66,7 @@ namespace HtmlGenerationWebSite.Controllers
         }
 
         [HttpGet("/categories/{category}")]
-        public ViewResult ListCategories(string category, int correlationId)
+        public IActionResult ListCategories(string category, int correlationId)
         {
             ViewData["Category"] = category;
             ViewData["CorrelationId"] = correlationId;
@@ -75,10 +75,9 @@ namespace HtmlGenerationWebSite.Controllers
         }
 
         [HttpPost("/categories/update-products")]
-        public IActionResult UpdateCategories()
+        public void UpdateCategories()
         {
             ProductsService.UpdateProducts();
-            return new EmptyResult();
         }
 
         [HttpGet("/catalog/GetDealPercentage/{dealPercentage}")]
diff --git a/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs b/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs
index c2cc1dab94..f8b48ccb56 100644
--- a/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs
+++ b/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using JsonPatchWebSite.Models;
 using Microsoft.AspNet.JsonPatch;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace JsonPatchWebSite.Controllers
 {
diff --git a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
index 65f9687f62..57edb4fde4 100644
--- a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
+++ b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Primitives;
 using ModelBindingWebSite.Models;
diff --git a/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs b/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
index 16948a36e2..9625b08973 100644
--- a/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
+++ b/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
@@ -7,12 +7,12 @@ namespace RazorWebSite
 {
     public class DirectivesController : Controller
     {
-        public ViewResult ViewInheritsInjectAndUsingsFromViewImports()
+        public IActionResult ViewInheritsInjectAndUsingsFromViewImports()
         {
             return View(new Person { Name = "Person1" });
         }
 
-        public ViewResult ViewInheritsBasePageFromViewImports()
+        public IActionResult ViewInheritsBasePageFromViewImports()
         {
             return View("/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml",
                         new Person { Name = "Person2" });
diff --git a/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs b/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
index 9f2d396d6e..86b5cc6a9b 100644
--- a/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
+++ b/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
@@ -8,12 +8,12 @@ namespace RazorWebSite.Controllers
     public class ExpanderViewsController : Controller
     {
         // This result discovers the Index.cshtml from /View but the partial is executed from /Shared-Views
-        public ViewResult Index()
+        public IActionResult Index()
         {
             return View();
         }
 
-        public PartialViewResult Partial()
+        public IActionResult Partial()
         {
             return PartialView("_ExpanderPartial");
         }
diff --git a/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs b/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
index 6a77549103..8b3806f152 100644
--- a/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
+++ b/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
@@ -7,34 +7,34 @@ namespace RazorWebSite
 {
     public class FlushPoint : Controller
     {
-        public ViewResult PageWithLayout()
+        public IActionResult PageWithLayout()
         {
             return View();
         }
 
-        public ViewResult PageWithoutLayout()
+        public IActionResult PageWithoutLayout()
         {
             return View();
         }
 
         // This uses RenderSection to render the section that contains a FlushAsync call
-        public ViewResult PageWithPartialsAndViewComponents()
+        public IActionResult PageWithPartialsAndViewComponents()
         {
             return View();
         }
 
         // This uses RenderSectionAsync to render the section that contains a FlushAsync call
-        public ViewResult PageWithRenderSectionAsync()
+        public IActionResult PageWithRenderSectionAsync()
         {
             return View("PageWithSectionInvokedViaRenderSectionAsync");
         }
 
-        public ViewResult PageWithNestedLayout()
+        public IActionResult PageWithNestedLayout()
         {
             return View();
         }
 
-        public ViewResult PageWithFlushBeforeLayout()
+        public IActionResult PageWithFlushBeforeLayout()
         {
             return View();
         }
diff --git a/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs b/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
index bfcd136828..61297ba2c5 100644
--- a/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
+++ b/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
@@ -7,7 +7,7 @@ namespace RazorWebSite.Controllers
 {
     public class NestedViewStartsController : Controller
     {
-        public ViewResult Index()
+        public IActionResult Index()
         {
             return View("NestedViewStarts/Index");
         }
diff --git a/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs b/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
index 208edc6c6c..c3ba535d90 100644
--- a/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
+++ b/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
@@ -7,12 +7,12 @@ namespace RazorWebSite.Controllers
 {
     public class TemplateExpander : Controller
     {
-        public ViewResult Index()
+        public IActionResult Index()
         {
             return View();
         }
 
-        public ViewResult ViewWithLayout()
+        public IActionResult ViewWithLayout()
         {
             return View();
         }
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs b/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
index 0bc29ac6dd..df10cb264c 100644
--- a/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
+++ b/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
@@ -49,7 +49,7 @@ namespace RazorWebSite.Controllers
             return View(model);
         }
 
-        public ViewResult ViewPassesViewDataToLayout()
+        public IActionResult ViewPassesViewDataToLayout()
         {
             ViewData["Title"] = "Controller title";
             return View("ViewWithTitle");
@@ -61,13 +61,13 @@ namespace RazorWebSite.Controllers
             return View("ViewWithDataFromController");
         }
 
-        public ViewResult ViewWithComponentThatHasLayout()
+        public IActionResult ViewWithComponentThatHasLayout()
         {
             ViewData["Title"] = "View With Component With Layout";
             return View();
         }
 
-        public ViewResult ViewWithComponentThatHasViewStart()
+        public IActionResult ViewWithComponentThatHasViewStart()
         {
             return View();
         }
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs b/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
index b95d3c8cee..7f35a1bb56 100644
--- a/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
+++ b/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
@@ -9,7 +9,7 @@ namespace RazorWebSite.Controllers
     // The intent of this controller is to verify that view compilation uses the app's compilation settings.
     public class ViewsConsumingCompilationOptionsController : Controller
     {
-        public ViewResult Index()
+        public IActionResult Index()
         {
             return View();
         }
diff --git a/test/WebSites/RazorWebSite/NestedViewImportsController.cs b/test/WebSites/RazorWebSite/NestedViewImportsController.cs
index e97392b247..16a7e18a60 100644
--- a/test/WebSites/RazorWebSite/NestedViewImportsController.cs
+++ b/test/WebSites/RazorWebSite/NestedViewImportsController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace RazorWebSite.Controllers
 {
diff --git a/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs b/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs
index a166dec8e8..086d47d830 100644
--- a/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs
+++ b/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs
@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace RequestServicesWebSite
 {
diff --git a/test/WebSites/ResponseCacheWebSite/Startup.cs b/test/WebSites/ResponseCacheWebSite/Startup.cs
index 16c76a1300..8e3e4e0dc1 100644
--- a/test/WebSites/ResponseCacheWebSite/Startup.cs
+++ b/test/WebSites/ResponseCacheWebSite/Startup.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ResponseCacheWebSite
diff --git a/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs b/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs
index 481156a8da..b2360887ad 100644
--- a/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs
+++ b/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace RoutingWebSite
 {
diff --git a/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs b/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs
index 30fe0521c5..4fbb9ed21e 100644
--- a/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs
+++ b/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace RoutingWebSite
 {
diff --git a/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs b/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
index 26282c1ec4..43cf0f2a92 100644
--- a/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
+++ b/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Routing;
 
 namespace RoutingWebSite
diff --git a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs
index 769f6d0f34..ab4b28b710 100644
--- a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs
+++ b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 
 namespace RoutingWebSite
diff --git a/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs b/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
index 75f27e6f2f..7841e740bd 100644
--- a/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
@@ -30,44 +30,44 @@ namespace TagHelpersWebSite.Controllers
             return View();
         }
 
-        public ViewResult UnboundDynamicAttributes()
+        public IActionResult UnboundDynamicAttributes()
         {
             return View();
         }
 
-        public ViewResult NestedViewImportsTagHelper()
+        public IActionResult NestedViewImportsTagHelper()
         {
             return View();
         }
 
-        public ViewResult ViewWithLayoutAndNestedTagHelper()
+        public IActionResult ViewWithLayoutAndNestedTagHelper()
         {
             return View();
         }
 
-        public ViewResult ViewWithInheritedRemoveTagHelper()
+        public IActionResult ViewWithInheritedRemoveTagHelper()
         {
             return View("/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml");
         }
 
-        public ViewResult ViewWithInheritedTagHelperPrefix()
+        public IActionResult ViewWithInheritedTagHelperPrefix()
         {
             return View("/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml");
         }
 
-        public ViewResult ViewWithOverriddenTagHelperPrefix()
+        public IActionResult ViewWithOverriddenTagHelperPrefix()
         {
             return View("/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml");
         }
 
-        public ViewResult ViewWithNestedInheritedTagHelperPrefix()
+        public IActionResult ViewWithNestedInheritedTagHelperPrefix()
         {
             return View(
                 "/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/" +
                 "NestedInheritedTagHelperPrefix.cshtml");
         }
 
-        public ViewResult ViewWithNestedOverriddenTagHelperPrefix()
+        public IActionResult ViewWithNestedOverriddenTagHelperPrefix()
         {
             return View(
                 "/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/" +
diff --git a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
index 74ebffdb4e..b59d0b2267 100644
--- a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
+++ b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.OptionsModel;
 
 namespace UrlHelperWebSite
diff --git a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs
index 808040f235..9b9cf980c6 100644
--- a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs
+++ b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.DependencyInjection;
 
 namespace VersioningWebSite
diff --git a/test/WebSites/VersioningWebSite/VersionAttribute.cs b/test/WebSites/VersioningWebSite/VersionAttribute.cs
index 41e42ed26f..adc85c7fa6 100644
--- a/test/WebSites/VersioningWebSite/VersionAttribute.cs
+++ b/test/WebSites/VersioningWebSite/VersionAttribute.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 
 namespace VersioningWebSite
diff --git a/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs b/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
index 66a7e66bad..8b9e861484 100644
--- a/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
+++ b/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace VersioningWebSite
 {
diff --git a/test/WebSites/VersioningWebSite/VersionGetAttribute.cs b/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
index d3c5818822..3882be02d5 100644
--- a/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
+++ b/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace VersioningWebSite
 {
diff --git a/test/WebSites/VersioningWebSite/VersionPostAttribute.cs b/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
index c6a29e52b6..dd93d6141d 100644
--- a/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
+++ b/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace VersioningWebSite
 {
diff --git a/test/WebSites/VersioningWebSite/VersionPutAttribute.cs b/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
index 6c536026a0..6911dc19b7 100644
--- a/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
+++ b/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Actions;
 
 namespace VersioningWebSite
 {
diff --git a/test/WebSites/VersioningWebSite/VersionRangeValidator.cs b/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
index 7d6c01e1bf..b7cc7e66f2 100644
--- a/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
+++ b/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionConstraints;
 
 namespace VersioningWebSite
 {
diff --git a/test/WebSites/ViewComponentWebSite/HomeController.cs b/test/WebSites/ViewComponentWebSite/HomeController.cs
index 0261bc0868..12a1d5e36a 100644
--- a/test/WebSites/ViewComponentWebSite/HomeController.cs
+++ b/test/WebSites/ViewComponentWebSite/HomeController.cs
@@ -20,52 +20,52 @@ namespace ViewComponentWebSite
             };
         }
 
-        public ViewResult ViewWithAsyncComponents()
+        public IActionResult ViewWithAsyncComponents()
         {
-            return new ViewResult();
+            return View();
         }
 
-        public ViewResult ViewWithSyncComponents()
+        public IActionResult ViewWithSyncComponents()
         {
-            return new ViewResult();
+            return View();
         }
 
-        public ViewResult ViewWithIntegerViewComponent()
+        public IActionResult ViewWithIntegerViewComponent()
         {
-            return new ViewResult();
+            return View();
         }
 
-        public ViewResult ViewComponentWithEnumerableModelUsingWhere()
+        public IActionResult ViewComponentWithEnumerableModelUsingWhere()
         {
             ViewBag.LinqQueryType = "Where";
             return View("ViewComponentWithEnumerableModel", ModelList.Where(a => a != null));
         }
 
-        public ViewResult ViewComponentWithEnumerableModelUsingSelect()
+        public IActionResult ViewComponentWithEnumerableModelUsingSelect()
         {
             ViewBag.LinqQueryType = "Select";
             return View("ViewComponentWithEnumerableModel", ModelList.Select(a => a));
         }
         
-        public ViewResult ViewComponentWithEnumerableModelUsingTake()
+        public IActionResult ViewComponentWithEnumerableModelUsingTake()
         {
             ViewBag.LinqQueryType = "Take";
             return View("ViewComponentWithEnumerableModel", ModelList.Take(2));
         }
 
-        public ViewResult ViewComponentWithEnumerableModelUsingTakeWhile()
+        public IActionResult ViewComponentWithEnumerableModelUsingTakeWhile()
         {
             ViewBag.LinqQueryType = "TakeWhile";
             return View("ViewComponentWithEnumerableModel", ModelList.TakeWhile(a => a != null));
         }
 
-        public ViewResult ViewComponentWithEnumerableModelUsingUnion()
+        public IActionResult ViewComponentWithEnumerableModelUsingUnion()
         {
             ViewBag.LinqQueryType = "Union";
             return View("ViewComponentWithEnumerableModel", ModelList.Union(ModelList));
         }
 
-        public ViewResult ViewComponentWithEnumerableModelUsingSelectMany()
+        public IActionResult ViewComponentWithEnumerableModelUsingSelectMany()
         {
             var selectManySampleModelList = new List<SelectManySampleModel>
                     {
diff --git a/test/WebSites/ViewComponentWebSite/ViewDataComponent.cs b/test/WebSites/ViewComponentWebSite/ViewDataComponent.cs
index ff8488aff0..507ba53559 100644
--- a/test/WebSites/ViewComponentWebSite/ViewDataComponent.cs
+++ b/test/WebSites/ViewComponentWebSite/ViewDataComponent.cs
@@ -9,17 +9,17 @@ namespace ViewComponentWebSite
     [ViewComponent(Name = "ViewData")]
     public class ViewDataComponent : ViewComponent
     {
-        public ViewViewComponentResult Invoke()
+        public IViewComponentResult Invoke()
         {
             ViewData["value-from-component"] = nameof(Invoke) + ": hello from viewdatacomponent";
             return View("ComponentThatReadsViewData");
         }
 
-        public Task<ViewViewComponentResult> InvokeAsync()
+        public Task<IViewComponentResult> InvokeAsync()
         {
             ViewData["value-from-component"] = nameof(InvokeAsync) + ": hello from viewdatacomponent";
             var result = View("ComponentThatReadsViewData");
-            return Task.FromResult(result);
+            return Task.FromResult<IViewComponentResult>(result);
         }
     }
 }
\ No newline at end of file
diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
index 1f7d57fd68..86d4dc93f4 100644
--- a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
+++ b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
@@ -2,7 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Actions;
+using Microsoft.AspNet.Mvc.Filters;
 using Newtonsoft.Json;
 
 namespace WebApiCompatShimWebSite
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
index eebae072e4..f547826e11 100644
--- a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
+++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using System.Web.Http;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.WebApiCompatShim;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
index 69d45d3b56..d4d048bcfd 100644
--- a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
+++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using System.Web.Http;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace WebApiCompatShimWebSite
 {
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
index 9ba78cccaa..39c81c4aa7 100644
--- a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
+++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
@@ -5,6 +5,8 @@ using System.Net;
 using System.Net.Http;
 using System.Web.Http;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
+using Microsoft.AspNet.Mvc.Filters;
 
 namespace WebApiCompatShimWebSite
 {
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
index f913cf1232..46efd87572 100644
--- a/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace XmlFormattersWebSite
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
index d569271517..4ac7183315 100644
--- a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
+++ b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using XmlFormattersWebSite.Models;
 
 namespace XmlFormattersWebSite.Controllers
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
index 83e36a8e06..39df58e14b 100644
--- a/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
+++ b/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.ActionResults;
 using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace XmlFormattersWebSite
diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs b/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
index 878ddfe57e..6f21ab8227 100644
--- a/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
+++ b/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.AspNet.Mvc.Formatters.Xml;
 using XmlFormattersWebSite.Models;
 
diff --git a/test/WebSites/XmlFormattersWebSite/Startup.cs b/test/WebSites/XmlFormattersWebSite/Startup.cs
index 2196d53c4c..c3744a342a 100644
--- a/test/WebSites/XmlFormattersWebSite/Startup.cs
+++ b/test/WebSites/XmlFormattersWebSite/Startup.cs
@@ -3,8 +3,7 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Formatters.Xml;
-using Microsoft.AspNet.Routing;
+using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Net.Http.Headers;