diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
index 9c3c2b15e..df479056b 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
@@ -68,9 +68,9 @@
     <Compile Include="Controllers\TransliterationAdminController.cs" />
     <Compile Include="Controllers\AdminCutlureSelectorController.cs" />
     <Compile Include="Models\TransliterationSpecificationRecord.cs" />
-    <Compile Include="Providers\AdminCultureSelectorSelector.cs" />
+    <Compile Include="Selectors\DefaultAdminCultureSelectorSelector.cs" />
     <Compile Include="Providers\BrowserCultureProvider.cs" />
-    <Compile Include="Providers\DefaultFrontEndCultureSelector.cs" />
+    <Compile Include="Selectors\DefaultFrontEndCultureSelector.cs" />
     <Compile Include="Providers\ICultureStorageProvider.cs" />
     <Compile Include="RuleEngine\CultureRuleProvider.cs" />
     <Compile Include="Services\AdminDirectionalityFactory.cs" />
@@ -85,7 +85,6 @@
     <Compile Include="Projections\CurrentCultureFilter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResourceManifest.cs" />
-    <Compile Include="Routes.cs" />
     <Compile Include="Providers\ICultureProvider.cs" />
     <Compile Include="Services\ILocalizationService.cs" />
     <Compile Include="Services\ITransliterationService.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Routes.cs b/src/Orchard.Web/Modules/Orchard.Localization/Routes.cs
deleted file mode 100644
index 27d4f2f12..000000000
--- a/src/Orchard.Web/Modules/Orchard.Localization/Routes.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.Routing;
-using Orchard.Environment.Extensions;
-using Orchard.Mvc.Routes;
-
-namespace Orchard.Localization {
-    [OrchardFeature("Orchard.Localization.CutlurePicker")]
-    public class Routes : IRouteProvider {
-        public void GetRoutes(ICollection<RouteDescriptor> routes) {
-            foreach (var routeDescriptor in GetRoutes())
-                routes.Add(routeDescriptor);
-        }
-
-        public IEnumerable<RouteDescriptor> GetRoutes() {
-            return new[] {
-                new RouteDescriptor {
-                    Route = new Route(
-                        "Culture/Change",
-                        new RouteValueDictionary {
-                            {"area", "Orchard.Localization"},
-                            {"controller", "Culture"},
-                            {"action", "ChangeCulture"}
-                        },
-                        new RouteValueDictionary(),
-                        new RouteValueDictionary {
-                            {"area", "Orchard.Localization"}
-                        },
-                        new MvcRouteHandler())
-                },
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Providers/AdminCultureSelectorSelector.cs b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultAdminCultureSelectorSelector.cs
similarity index 81%
rename from src/Orchard.Web/Modules/Orchard.Localization/Providers/AdminCultureSelectorSelector.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultAdminCultureSelectorSelector.cs
index 3f4257ce9..9001ca9b9 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Providers/AdminCultureSelectorSelector.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultAdminCultureSelectorSelector.cs
@@ -3,15 +3,16 @@ using System.Linq;
 using System.Web;
 using System.Web.Routing;
 using Orchard.Environment.Extensions;
+using Orchard.Localization.Providers;
 using Orchard.Localization.Services;
 using Orchard.UI.Admin;
 
-namespace Orchard.Localization.Providers {
+namespace Orchard.Localization.Selectors {
     [OrchardFeature("Orchard.Localization.CutlureSelector")]
-    public class AdminCultureSelectorSelector : ICultureSelector {
+    public class DefaultAdminCultureSelectorSelector : ICultureSelector {
         private readonly IEnumerable<ICultureProvider> _providers;
 
-        public AdminCultureSelectorSelector(IEnumerable<ICultureProvider> providers) {
+        public DefaultAdminCultureSelectorSelector(IEnumerable<ICultureProvider> providers) {
             _providers = providers;
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Providers/DefaultFrontEndCultureSelector.cs b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultFrontEndCultureSelector.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Localization/Providers/DefaultFrontEndCultureSelector.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultFrontEndCultureSelector.cs
index c629869b7..c01c0c57b 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Providers/DefaultFrontEndCultureSelector.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/DefaultFrontEndCultureSelector.cs
@@ -8,7 +8,7 @@ using Orchard.Environment.Extensions;
 using Orchard.Localization.Services;
 using Orchard.UI.Admin;
 
-namespace Orchard.Localization.Providers {
+namespace Orchard.Localization.Selectors {
     [OrchardFeature("Orchard.Localization.CutlureSelector")]
     public class DefaultFrontEndCultureSelector : ICultureSelector {
         private readonly IAliasService _aliasService;