diff --git a/src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs b/src/Orchard.Web/Modules/Orchard.Migrations/Commands/DataMigrationCommands.cs
similarity index 93%
rename from src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs
rename to src/Orchard.Web/Modules/Orchard.Migrations/Commands/DataMigrationCommands.cs
index 28dbb997b..e3d6d5417 100644
--- a/src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Commands/DataMigrationCommands.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Linq;
 using Orchard.Commands;
+using Orchard.Data.Migration;
 using Orchard.Data.Migration.Generator;
 using Orchard.Data.Migration.Interpreters;
+using Orchard.Environment.Extensions;
 
-namespace Orchard.Data.Migration.Commands {
+namespace Orchard.Migrations.Commands {
+
+    [OrchardFeature("Orchard.Migration")]
     public class DataMigrationCommands : DefaultOrchardCommandHandler {
         private readonly IDataMigrationManager _dataMigrationManager;
         private readonly IDataMigrationInterpreter _dataMigrationInterpreter;
diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
index 53ce1c4f0..751d5668f 100644
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
@@ -6,6 +6,10 @@ version: 0.1.0
 orchardversion: 0.6.0
 description: 
 features:
-    Orchard.Migration:
+	Orchard.Migration:
+		Description: Data migration commands.
+		Category: Migrations
+    DatabaseMigration:
         Description: Database migration action.
-        Category: Developer
\ No newline at end of file
+		Dependencies: Orchard.Migration
+        Category: Migrations
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
index f0545e245..6a065741d 100644
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
@@ -69,6 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\DatabaseUpdateController.cs" />
+    <Compile Include="Commands\DataMigrationCommands.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -77,9 +78,7 @@
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
diff --git a/src/Orchard/Data/Migration/DataMigration.cs b/src/Orchard/Data/Migration/DataMigration.cs
index 5de505842..66b757916 100644
--- a/src/Orchard/Data/Migration/DataMigration.cs
+++ b/src/Orchard/Data/Migration/DataMigration.cs
@@ -11,4 +11,4 @@ namespace Orchard.Data.Migration {
         public IContentDefinitionManager ContentDefinitionManager {get; set; }
         public virtual Feature Feature { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Orchard/Data/Migration/DataMigrationManager.cs b/src/Orchard/Data/Migration/DataMigrationManager.cs
index f20ebb9f2..4ddf0ba2d 100644
--- a/src/Orchard/Data/Migration/DataMigrationManager.cs
+++ b/src/Orchard/Data/Migration/DataMigrationManager.cs
@@ -11,7 +11,6 @@ using Orchard.Environment.Extensions;
 using Orchard.Environment.State;
 using Orchard.Localization;
 using Orchard.Logging;
-using Orchard.Reports.Services;
 
 namespace Orchard.Data.Migration {
     /// <summary>
diff --git a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
index aad54fca0..0744e6d3c 100644
--- a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
+++ b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
@@ -13,9 +13,7 @@ using NHibernate.Dialect;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.Extensions;
-using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Environment.State;
 
 namespace Orchard.Data.Migration.Generator {
diff --git a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
index 65a267fb4..24039ba9d 100644
--- a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
@@ -8,7 +8,6 @@ using NHibernate;
 using NHibernate.Dialect;
 using NHibernate.SqlTypes;
 using Orchard.Data.Migration.Schema;
-using Orchard.Data.Providers;
 using Orchard.Environment.Configuration;
 using Orchard.Localization;
 using Orchard.Logging;
diff --git a/src/Orchard/Data/Migration/Schema/IShellSettings.cs b/src/Orchard/Data/Migration/Schema/IShellSettings.cs
deleted file mode 100644
index 5f282702b..000000000
--- a/src/Orchard/Data/Migration/Schema/IShellSettings.cs
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 1e6c526be..6d5e4aa29 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -452,7 +452,6 @@
     <Compile Include="Data\Migration\Interpreters\StringCommandInterpreter.cs" />
     <Compile Include="Data\Migration\Schema\AddColumnCommand.cs" />
     <Compile Include="Data\Migration\Schema\ISchemaBuilderCommand.cs" />
-    <Compile Include="Data\Migration\Schema\IShellSettings.cs" />
     <Compile Include="Data\Migration\Generator\SchemaCommandGenerator.cs" />
     <Compile Include="Data\Migration\Schema\SchemaUtils.cs" />
     <Compile Include="Data\Migration\Schema\SqlStatementCommand.cs" />
@@ -465,7 +464,6 @@
     <Compile Include="Data\Migration\Schema\AlterColumnCommand.cs" />
     <Compile Include="Data\Migration\Schema\DropTableCommand.cs" />
     <Compile Include="Data\Migration\Schema\AlterTableCommand.cs" />
-    <Compile Include="Data\Migration\Commands\DataMigrationCommands.cs" />
     <Compile Include="Data\Migration\Schema\SchemaBuilder.cs" />
     <Compile Include="Data\Migration\DataMigrationCoordinator.cs" />
     <Compile Include="Data\Migration\DataMigration.cs" />