diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt
index 45ef0ae5c..312f31de7 100644
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@@ -1,3 +1,3 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Futures.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Futures.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
 add profiling data
 feature disable Orchard.DevTools
diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
index e7e8a1a56..3014f0eee 100644
--- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
+++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
@@ -17,7 +17,7 @@ namespace Orchard.Specs.Bindings {
 
             webApp.GivenIHaveACleanSiteWith(TableData(
                 new { extension = "module", names = "Orchard.Setup, Orchard.Modules, Orchard.Themes, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Tags, TinyMce" },
-                new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, PublishLater, Routable, Scheduling, Settings, XmlRpc" },
+                new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, ContentsLocation, PublishLater, Routable, Scheduling, Settings, XmlRpc" },
                 new { extension = "theme", names = "SafeMode, Classic" }));
 
             webApp.WhenIGoTo("Setup");
diff --git a/src/Orchard.Specs/Setup.feature b/src/Orchard.Specs/Setup.feature
index d6b83f363..09bbad8c8 100644
--- a/src/Orchard.Specs/Setup.feature
+++ b/src/Orchard.Specs/Setup.feature
@@ -34,7 +34,7 @@ Scenario: Calling setup on a brand new install
     Given I have a clean site with
             | extension | names |
             | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, TinyMce |
-            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, XmlRpc  |
+            | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, XmlRpc  |
             | theme | SafeMode, Classic |
         And I am on "/Setup"
     When I fill in 
diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs
index 3f9536ee2..143c807fb 100644
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@@ -145,8 +145,8 @@ this.ScenarioSetup(scenarioInfo);
                             "nyMce"});
             table1.AddRow(new string[] {
                         "core",
-                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," +
-                            " Scheduling, Settings, XmlRpc"});
+                        "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" +
+                            "ble, PublishLater, Scheduling, Settings, XmlRpc"});
             table1.AddRow(new string[] {
                         "theme",
                         "SafeMode, Classic"});
diff --git a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
index 77dd7e36e..39bc2ee97 100644
--- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
@@ -2,8 +2,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Fields;
-using Orchard.Core.Common.Models;
-using Orchard.Core.Common.Settings;
+using Orchard.Core.ContentsLocation.Models;
 
 namespace Orchard.Core.Common.Drivers {
     [UsedImplicitly]
diff --git a/src/Orchard.Web/Core/Common/Module.txt b/src/Orchard.Web/Core/Common/Module.txt
index 9669d53a4..4f52a20b8 100644
--- a/src/Orchard.Web/Core/Common/Module.txt
+++ b/src/Orchard.Web/Core/Common/Module.txt
@@ -8,4 +8,5 @@ description: The common module introduces content parts that are going to be use
 features:
     Common:
         Description: Core content parts.
+        Dependencies: ContentsLocation
         Category: Core
diff --git a/src/Orchard.Web/Core/Common/Settings/LocationSettingsEditorEvents.cs b/src/Orchard.Web/Core/Common/Settings/LocationSettingsEditorEvents.cs
index 325b3855b..3b2d42045 100644
--- a/src/Orchard.Web/Core/Common/Settings/LocationSettingsEditorEvents.cs
+++ b/src/Orchard.Web/Core/Common/Settings/LocationSettingsEditorEvents.cs
@@ -5,6 +5,8 @@ using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.ViewModels;
 using Orchard.Core.Common.Models;
+using Orchard.Core.ContentsLocation.Models;
+using Orchard.Core.ContentsLocation.ViewModels;
 using Orchard.Localization;
 
 namespace Orchard.Core.Common.Settings {
diff --git a/src/Orchard.Web/Core/Common/Models/LocationDefinition.cs b/src/Orchard.Web/Core/ContentsLocation/Models/LocationDefinition.cs
similarity index 75%
rename from src/Orchard.Web/Core/Common/Models/LocationDefinition.cs
rename to src/Orchard.Web/Core/ContentsLocation/Models/LocationDefinition.cs
index 7d5274924..524413aaa 100644
--- a/src/Orchard.Web/Core/Common/Models/LocationDefinition.cs
+++ b/src/Orchard.Web/Core/ContentsLocation/Models/LocationDefinition.cs
@@ -1,6 +1,6 @@
 using Orchard.Localization;
 
-namespace Orchard.Core.Common.Models {
+namespace Orchard.Core.ContentsLocation.Models {
     public class LocationDefinition {
         public string Name { get; set; }
         public LocalizedString DisplayName { get; set; }
diff --git a/src/Orchard.Web/Core/Common/Models/LocationSettings.cs b/src/Orchard.Web/Core/ContentsLocation/Models/LocationSettings.cs
similarity index 91%
rename from src/Orchard.Web/Core/Common/Models/LocationSettings.cs
rename to src/Orchard.Web/Core/ContentsLocation/Models/LocationSettings.cs
index 1e3058c0c..c4669e023 100644
--- a/src/Orchard.Web/Core/Common/Models/LocationSettings.cs
+++ b/src/Orchard.Web/Core/ContentsLocation/Models/LocationSettings.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Orchard.ContentManagement.Drivers;
 
-namespace Orchard.Core.Common.Models {
+namespace Orchard.Core.ContentsLocation.Models {
     public class LocationSettings : Dictionary<string, ContentLocation> {
         public LocationSettings() { }
         public LocationSettings(LocationSettings value)
diff --git a/src/Orchard.Web/Core/ContentsLocation/Module.txt b/src/Orchard.Web/Core/ContentsLocation/Module.txt
new file mode 100644
index 000000000..f2947182d
--- /dev/null
+++ b/src/Orchard.Web/Core/ContentsLocation/Module.txt
@@ -0,0 +1,12 @@
+Name: ContentsLocation
+antiforgery: enabled
+author: The Orchard Team
+website: http://orchardproject.net
+version: 0.5.0
+orchardversion: 0.5.0
+description: The "Contents Location" module introduces settings for part and field to fine tune the location of contents.
+features:
+    ContentsLocation:
+        Description: Contents location settings management
+        Dependencies: Settings
+        Category: Core
diff --git a/src/Orchard.Web/Core/Common/ViewModels/LocationSettingsViewModel.cs b/src/Orchard.Web/Core/ContentsLocation/ViewModels/LocationSettingsViewModel.cs
similarity index 66%
rename from src/Orchard.Web/Core/Common/ViewModels/LocationSettingsViewModel.cs
rename to src/Orchard.Web/Core/ContentsLocation/ViewModels/LocationSettingsViewModel.cs
index 11dc57e13..7387113b3 100644
--- a/src/Orchard.Web/Core/Common/ViewModels/LocationSettingsViewModel.cs
+++ b/src/Orchard.Web/Core/ContentsLocation/ViewModels/LocationSettingsViewModel.cs
@@ -1,7 +1,7 @@
 using Orchard.ContentManagement.Drivers;
-using Orchard.Core.Common.Models;
+using Orchard.Core.ContentsLocation.Models;
 
-namespace Orchard.Core.Common.Settings {
+namespace Orchard.Core.ContentsLocation.ViewModels {
     public class LocationSettingsViewModel {
         public LocationDefinition Definition { get; set; }
         public ContentLocation Location { get; set; }
diff --git a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/LocationSettings.ascx b/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx
similarity index 88%
rename from src/Orchard.Web/Core/Common/Views/DefinitionTemplates/LocationSettings.ascx
rename to src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx
index bcda2b218..e04003a51 100644
--- a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/LocationSettings.ascx
+++ b/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Common.Settings.LocationSettingsViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.ContentsLocation.ViewModels.LocationSettingsViewModel>" %>
     <fieldset >
         <legend><%:T("{0}", Model.Definition.DisplayName) %></legend>
 
diff --git a/src/Orchard.Web/Core/ContentsLocation/Views/Web.config b/src/Orchard.Web/Core/ContentsLocation/Views/Web.config
new file mode 100644
index 000000000..e065d8735
--- /dev/null
+++ b/src/Orchard.Web/Core/ContentsLocation/Views/Web.config
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*"
+          type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+
+    <!--
+        Enabling request validation in view pages would cause validation to occur
+        after the input has already been processed by the controller. By default
+        MVC performs request validation before a controller processes the input.
+        To change this behavior apply the ValidateInputAttribute to a
+        controller or action.
+    -->
+    <pages
+        validateRequest="false"
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
+      </controls>
+    </pages>
+  </system.web>
+
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index bbf80b552..10c78f5b3 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -67,13 +67,13 @@
     <Compile Include="Common\Drivers\TextFieldDriver.cs" />
     <Compile Include="Common\Extensions\HtmlHelperExtensions.cs" />
     <Compile Include="Common\Fields\TextField.cs" />
-    <Compile Include="Common\Models\LocationDefinition.cs" />
+    <Compile Include="ContentsLocation\Models\LocationDefinition.cs" />
     <Compile Include="Common\Services\ICommonService.cs" />
     <Compile Include="Common\Services\CommonService.cs" />
     <Compile Include="Common\Settings\BodySettings.cs" />
-    <Compile Include="Common\Models\LocationSettings.cs" />
+    <Compile Include="ContentsLocation\Models\LocationSettings.cs" />
     <Compile Include="Common\Settings\LocationSettingsEditorEvents.cs" />
-    <Compile Include="Common\ViewModels\LocationSettingsViewModel.cs" />
+    <Compile Include="ContentsLocation\ViewModels\LocationSettingsViewModel.cs" />
     <Compile Include="Common\ViewModels\CommonMetadataViewModel.cs" />
     <Compile Include="Common\ViewModels\ContainerEditorViewModel.cs" />
     <Compile Include="Common\ViewModels\TextContentFieldDisplayViewModel.cs" />
@@ -228,7 +228,6 @@
     <Content Include="Common\Module.txt" />
     <Content Include="Common\Views\DefinitionTemplates\BodyTypePartSettings.ascx" />
     <Content Include="Common\Views\DefinitionTemplates\BodyPartSettings.ascx" />
-    <Content Include="Common\Views\DefinitionTemplates\LocationSettings.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Fields\Common.TextField.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.SummaryAdmin.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.SummaryAdmin.ascx" />
@@ -236,6 +235,8 @@
     <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.SummaryAdmin.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Parts\Common.Metadata.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Parts\Common.Metadata.SummaryAdmin.ascx" />
+    <Content Include="ContentsLocation\Module.txt" />
+    <Content Include="ContentsLocation\Views\DefinitionTemplates\LocationSettings.ascx" />
     <Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.SummaryAdmin.ascx" />
     <Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.ascx" />
     <Content Include="Localization\Views\EditorTemplates\Parts\Localization.Translation.ascx" />
@@ -352,6 +353,7 @@
     <Content Include="Localization\Views\Web.config" />
     <Content Include="Reports\Views\Web.config" />
     <Content Include="PublishLater\Views\Web.config" />
+    <Content Include="ContentsLocation\Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
index 612ef2af0..8bdbbf717 100644
--- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
+++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
@@ -1,8 +1,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.Drivers;
-using Orchard.Core.Common.Models;
-using Orchard.Core.Common.Settings;
+using Orchard.Core.ContentsLocation.Models;
 using Orchard.Core.Routable.Models;
 using Orchard.Core.Routable.Services;
 using Orchard.Core.Routable.ViewModels;
diff --git a/src/Orchard.Web/Core/Routable/Module.txt b/src/Orchard.Web/Core/Routable/Module.txt
index 7ee9065be..0ac49def9 100644
--- a/src/Orchard.Web/Core/Routable/Module.txt
+++ b/src/Orchard.Web/Core/Routable/Module.txt
@@ -8,5 +8,5 @@ description: The routable module enables content items to be accessed through a
 features:
     Routable:
         Description: Routable content part.
-        Dependencies: Settings
+        Dependencies: ContentsLocation
         Category: Core
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 3f8956bd2..88771b7f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -67,6 +67,7 @@ namespace Orchard.Setup.Services {
                     "Common",
                     "PublishLater",
                     "Contents",
+                    "ContentsLocation",
                     "Dashboard",
                     "Reports",
                     "Feeds",