diff --git a/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs b/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs
index 8a4f169e0..145d43a9e 100644
--- a/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs
+++ b/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs
@@ -23,7 +23,7 @@ using Orchard.Packaging.GalleryServer;
using Orchard.Packaging.Models;
using Orchard.Packaging.Services;
using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeExecutionSteps;
+using Orchard.Recipes.Providers.Executors;
using Orchard.Recipes.Services;
using Orchard.Tests.Environment.Extensions;
using Orchard.Tests.Environment.Features;
diff --git a/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs b/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs
index 2ec383bdb..259b5b8ad 100644
--- a/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs
+++ b/src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs
@@ -22,14 +22,13 @@ using Orchard.FileSystems.VirtualPath;
using Orchard.Packaging.GalleryServer;
using Orchard.Packaging.Services;
using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeExecutionSteps;
using Orchard.Recipes.Services;
using Orchard.Tests.DisplayManagement.Descriptors;
using Orchard.Tests.Environment.Extensions;
using Orchard.Tests.Environment.Features;
using Orchard.Tests.Stubs;
using Orchard.Tests.UI.Navigation;
-using Orchard.Themes.RecipeExecutionSteps;
+using Orchard.Themes.Recipes.Executors;
using Orchard.Themes.Services;
namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
index 0303855f3..d449c33e1 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
@@ -4,10 +4,10 @@ using System.IO;
using System.Linq;
using Orchard.Commands;
using Orchard.ContentManagement.MetaData;
-using Orchard.ImportExport.RecipeBuilderSteps;
+using Orchard.ImportExport.Recipes.Builders;
using Orchard.ImportExport.Services;
using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeBuilders;
+using Orchard.Recipes.Providers.Builders;
using Orchard.Recipes.Services;
using Orchard.Security;
using Orchard.Settings;
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
index 8776445ac..c74d94799 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
@@ -71,7 +71,7 @@
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/RecipeBuilderSteps/CustomStepsStep.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Recipes/Builders/CustomStepsStep.cs
similarity index 97%
rename from src/Orchard.Web/Modules/Orchard.ImportExport/RecipeBuilderSteps/CustomStepsStep.cs
rename to src/Orchard.Web/Modules/Orchard.ImportExport/Recipes/Builders/CustomStepsStep.cs
index 5f432d2fc..bf52546cd 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/RecipeBuilderSteps/CustomStepsStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Recipes/Builders/CustomStepsStep.cs
@@ -7,7 +7,7 @@ using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
using Orchard.Recipes.Services;
-namespace Orchard.ImportExport.RecipeBuilderSteps {
+namespace Orchard.ImportExport.Recipes.Builders {
public class CustomStepsStep : RecipeBuilderStep {
private readonly IEnumerable _exportEventHandlers;
private readonly ICustomExportStep _customExportStep;
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index cdaf528e4..1f0276db9 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/RecipeBuilderSteps/FeatureStep.cs b/src/Orchard.Web/Modules/Orchard.Modules/Recipes/Builders/FeatureStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Modules/RecipeBuilderSteps/FeatureStep.cs
rename to src/Orchard.Web/Modules/Orchard.Modules/Recipes/Builders/FeatureStep.cs
index 88999c55c..b8a578e24 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/RecipeBuilderSteps/FeatureStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Recipes/Builders/FeatureStep.cs
@@ -7,7 +7,7 @@ using Orchard.Localization;
using Orchard.Modules.ViewModels;
using Orchard.Recipes.Services;
-namespace Orchard.Modules.RecipeBuilderSteps {
+namespace Orchard.Modules.Recipes.Builders {
public class FeatureStep : RecipeBuilderStep {
private readonly IFeatureManager _featureManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/RecipeExecutionSteps/FeatureStep.cs b/src/Orchard.Web/Modules/Orchard.Modules/Recipes/Executors/FeatureStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Modules/RecipeExecutionSteps/FeatureStep.cs
rename to src/Orchard.Web/Modules/Orchard.Modules/Recipes/Executors/FeatureStep.cs
index 809526cf8..c4d345e6a 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/RecipeExecutionSteps/FeatureStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Recipes/Executors/FeatureStep.cs
@@ -5,7 +5,7 @@ using Orchard.Environment.Features;
using Orchard.Logging;
using Orchard.Recipes.Services;
-namespace Orchard.Modules.RecipeExecutionSteps {
+namespace Orchard.Modules.Recipes.Executors {
public class FeatureStep : RecipeExecutionStep {
private readonly IFeatureManager _featureManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
index 87f318f4f..4da799c2e 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
@@ -82,16 +82,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/ContentStep.cs
similarity index 99%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/ContentStep.cs
index 1c3bfbf14..6994974d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/ContentStep.cs
@@ -9,7 +9,7 @@ using Orchard.Recipes.Models;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
public class ContentStep : RecipeBuilderStep {
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IOrchardServices _orchardServices;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/RecipeMetadataStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/RecipeMetadataStep.cs
index f6e33f814..62198646f 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/RecipeMetadataStep.cs
@@ -3,7 +3,7 @@ using Orchard.Localization;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
public class RecipeMetadataStep : RecipeBuilderStep {
private readonly IOrchardServices _orchardServices;
public RecipeMetadataStep(IOrchardServices orchardServices) {
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SettingsStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/SettingsStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SettingsStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/SettingsStep.cs
index fdc8daca3..18df7d5a4 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SettingsStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/SettingsStep.cs
@@ -6,7 +6,7 @@ using Orchard.Localization;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
public class SettingsStep : RecipeBuilderStep {
private readonly IOrchardServices _orchardServices;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/CommandStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs
similarity index 99%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/CommandStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs
index f9e5c7f3a..29a865e1a 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/CommandStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs
@@ -7,7 +7,7 @@ using Orchard.Commands;
using Orchard.Logging;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class CommandStep : RecipeExecutionStep {
private readonly ICommandManager _commandManager;
private readonly CommandParser _commandParser;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentSchemaStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentSchemaStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentSchemaStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentSchemaStep.cs
index 774fa8e6f..c8e62df69 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentSchemaStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentSchemaStep.cs
@@ -5,7 +5,7 @@ using Orchard.ContentTypes.Events;
using Orchard.Logging;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class ContentSchemaStep : RecipeExecutionStep {
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IContentDefinitionReader _contentDefinitionReader;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
index 336c1470a..d62e71e5c 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ContentStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
@@ -6,7 +6,7 @@ using Orchard.Data;
using Orchard.Logging;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class ContentStep : RecipeExecutionStep {
private readonly IOrchardServices _orchardServices;
private readonly ITransactionManager _transactionManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/MigrationStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/MigrationStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/MigrationStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/MigrationStep.cs
index bfe9cf882..2f2de00ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/MigrationStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/MigrationStep.cs
@@ -5,7 +5,7 @@ using Orchard.Data.Migration;
using Orchard.Logging;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class MigrationStep : RecipeExecutionStep {
private readonly IDataMigrationManager _dataMigrationManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ModuleStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs
similarity index 98%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ModuleStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs
index 88946fdb3..12f9a937f 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/ModuleStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs
@@ -8,7 +8,7 @@ using Orchard.Packaging.Models;
using Orchard.Packaging.Services;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class ModuleStep : RecipeExecutionStep {
private readonly IPackagingSourceManager _packagingSourceManager;
private readonly IPackageManager _packageManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/SettingsStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/SettingsStep.cs
similarity index 96%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/SettingsStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/SettingsStep.cs
index 5a9e095b5..b353304a9 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeExecutionSteps/SettingsStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/SettingsStep.cs
@@ -3,13 +3,11 @@ using System.Collections.Generic;
using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
-using Orchard.Localization;
using Orchard.Logging;
-using Orchard.Recipes.Models;
using Orchard.Recipes.Services;
using Orchard.Settings;
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
public class SettingsStep : RecipeExecutionStep {
private readonly ISiteService _siteService;
private readonly IContentManager _contentManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/RecipeExecutionStepHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/RecipeHandlers/RecipeExecutionStepHandler.cs
similarity index 96%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/RecipeExecutionStepHandler.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/Providers/RecipeHandlers/RecipeExecutionStepHandler.cs
index f309211b1..822a5d3ef 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/RecipeExecutionStepHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/RecipeHandlers/RecipeExecutionStepHandler.cs
@@ -4,7 +4,7 @@ using Orchard.Logging;
using Orchard.Recipes.Models;
using Orchard.Recipes.Services;
-namespace Orchard.Recipes.RecipeHandlers {
+namespace Orchard.Recipes.Providers.RecipeHandlers {
///
/// Delegates execution of the step to the appropriate recipe execution step implementation.
///
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index b0466710e..9c7f2965d 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -75,7 +75,7 @@
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/RecipeExecutionSteps/ThemeStep.cs b/src/Orchard.Web/Modules/Orchard.Themes/Recipes/Executors/ThemeStep.cs
similarity index 99%
rename from src/Orchard.Web/Modules/Orchard.Themes/RecipeExecutionSteps/ThemeStep.cs
rename to src/Orchard.Web/Modules/Orchard.Themes/Recipes/Executors/ThemeStep.cs
index 410205f24..e9c721ce7 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/RecipeExecutionSteps/ThemeStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Recipes/Executors/ThemeStep.cs
@@ -9,7 +9,7 @@ using Orchard.Packaging.Services;
using Orchard.Recipes.Services;
using Orchard.Themes.Services;
-namespace Orchard.Themes.RecipeExecutionSteps {
+namespace Orchard.Themes.Recipes.Executors {
public class ThemeStep : RecipeExecutionStep {
private readonly IPackagingSourceManager _packagingSourceManager;
private readonly IPackageManager _packageManager;