diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/TransliterationSlugEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Localization/Events/TransliterationSlugEventHandler.cs
similarity index 92%
rename from src/Orchard.Web/Modules/Orchard.Localization/Services/TransliterationSlugEventHandler.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Events/TransliterationSlugEventHandler.cs
index 3c68bd147..fa87869b0 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Services/TransliterationSlugEventHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Events/TransliterationSlugEventHandler.cs
@@ -2,8 +2,9 @@ using Orchard.Autoroute.Services;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Environment.Extensions;
+using Orchard.Localization.Services;
 
-namespace Orchard.Localization.Services {
+namespace Orchard.Localization.Events {
     [OrchardFeature("Orchard.Localization.Transliteration")]
     public class TransliterationSlugEventHandler : ISlugEventHandler {
         private readonly ITransliterationService _transliterationService;
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
index f9fe8ba1f..1ba82c3e6 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
@@ -80,7 +80,7 @@
     <Compile Include="Services\CultureSelectorFactory.cs" />
     <Compile Include="Services\CultureService.cs" />
     <Compile Include="Services\LocalizationCultureFilter.cs" />
-    <Compile Include="Services\CultureStorageProvider.cs" />
+    <Compile Include="Providers\CultureStorageProvider.cs" />
     <Compile Include="Services\ICultureService.cs" />
     <Compile Include="Drivers\LocalizationPartDriver.cs" />
     <Compile Include="Handlers\LocalizationPartHandler.cs" />
@@ -91,13 +91,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Routes.cs" />
-    <Compile Include="Services\ICultureStorageProvider.cs" />
+    <Compile Include="Providers\ICultureStorageProvider.cs" />
     <Compile Include="Services\ILocalizationService.cs" />
     <Compile Include="Services\ITransliterationService.cs" />
-    <Compile Include="Services\LocalizationDateTimeFormatProvider.cs" />
+    <Compile Include="Providers\LocalizationDateTimeFormatProvider.cs" />
     <Compile Include="Services\LocalizationService.cs" />
     <Compile Include="Services\TransliterationService.cs" />
-    <Compile Include="Services\TransliterationSlugEventHandler.cs" />
+    <Compile Include="Events\TransliterationSlugEventHandler.cs" />
     <Compile Include="ViewModels\AddLocalizationViewModel.cs" />
     <Compile Include="ViewModels\ContentLocalizationsViewModel.cs" />
     <Compile Include="ViewModels\EditLocalizationViewModel.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/CultureStorageProvider.cs b/src/Orchard.Web/Modules/Orchard.Localization/Providers/CultureStorageProvider.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Localization/Services/CultureStorageProvider.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Providers/CultureStorageProvider.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorageProvider.cs b/src/Orchard.Web/Modules/Orchard.Localization/Providers/ICultureStorageProvider.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorageProvider.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Providers/ICultureStorageProvider.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationDateTimeFormatProvider.cs b/src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationDateTimeFormatProvider.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
index ab0de663c..3cbca9c0a 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationDateTimeFormatProvider.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Orchard.Environment.Extensions;
+using Orchard.Localization.Services;
 
-namespace Orchard.Localization.Services {
+namespace Orchard.Localization.Providers {
 
     /// <summary>
     /// Provides an implementation of IDateTimeFormatProvider which uses Localizer to obtain
diff --git a/src/Orchard/Localization/Services/DefaultCultureFilter.cs b/src/Orchard/Localization/Services/DefaultCultureFilter.cs
index 668c58cb0..3f12efda6 100644
--- a/src/Orchard/Localization/Services/DefaultCultureFilter.cs
+++ b/src/Orchard/Localization/Services/DefaultCultureFilter.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using Orchard.ContentManagement;
+using Orchard.ContentManagement;
 
 namespace Orchard.Localization.Services {
     public class DefaultCultureFilter : ICultureFilter {