From 8162e6ee7aec813aa2c2d5cf7c44d9a920237816 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Fri, 1 Oct 2010 13:43:36 -0700
Subject: [PATCH] Renaming and repathing migration classes.

--HG--
branch : dev
---
 .../ArchiveLaterDataMigration.cs => Migrations.cs}          | 4 ++--
 .../Orchard.ArchiveLater/Orchard.ArchiveLater.csproj        | 2 +-
 .../{DataMigrations/BlogsDataMigration.cs => Migrations.cs} | 4 ++--
 src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj  | 2 +-
 .../CommentsDataMigration.cs => Migrations.cs}              | 4 ++--
 .../Modules/Orchard.Comments/Orchard.Comments.csproj        | 2 +-
 .../{DataMigrations/EmailDataMigration.cs => Migrations.cs} | 4 ++--
 src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj  | 2 +-
 .../IndexingDataMigration.cs => Migrations.cs}              | 4 ++--
 .../Modules/Orchard.Indexing/Orchard.Indexing.csproj        | 2 +-
 .../{DataMigrations/MediaDataMigration.cs => Migrations.cs} | 2 +-
 src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj  | 2 +-
 .../{DataMigrations/RolesDataMigration.cs => Migrations.cs} | 2 +-
 src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj  | 2 +-
 .../SearchDataMigration.cs => Migrations.cs}                | 2 +-
 .../Modules/Orchard.Search/Orchard.Search.csproj            | 2 +-
 .../{DataMigrations/TagsDataMigration.cs => Migrations.cs}  | 2 +-
 src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj    | 2 +-
 .../ThemesDataMigration.cs => Migrations.cs}                | 2 +-
 .../Modules/Orchard.Themes/Orchard.Themes.csproj            | 2 +-
 .../{DataMigrations/UsersDataMigration.cs => Migrations.cs} | 2 +-
 src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj  | 2 +-
 .../WidgetsDataMigration.cs => Migrations.cs}               | 2 +-
 .../Modules/Orchard.Widgets/Orchard.Widgets.csproj          | 6 ++----
 24 files changed, 30 insertions(+), 32 deletions(-)
 rename src/Orchard.Web/Modules/Orchard.ArchiveLater/{DataMigrations/ArchiveLaterDataMigration.cs => Migrations.cs} (87%)
 rename src/Orchard.Web/Modules/Orchard.Blogs/{DataMigrations/BlogsDataMigration.cs => Migrations.cs} (93%)
 rename src/Orchard.Web/Modules/Orchard.Comments/{DataMigrations/CommentsDataMigration.cs => Migrations.cs} (95%)
 rename src/Orchard.Web/Modules/Orchard.Email/{DataMigrations/EmailDataMigration.cs => Migrations.cs} (81%)
 rename src/Orchard.Web/Modules/Orchard.Indexing/{DataMigrations/IndexingDataMigration.cs => Migrations.cs} (77%)
 rename src/Orchard.Web/Modules/Orchard.Media/{DataMigrations/MediaDataMigration.cs => Migrations.cs} (90%)
 rename src/Orchard.Web/Modules/Orchard.Roles/{DataMigrations/RolesDataMigration.cs => Migrations.cs} (95%)
 rename src/Orchard.Web/Modules/Orchard.Search/{DataMigrations/SearchDataMigration.cs => Migrations.cs} (87%)
 rename src/Orchard.Web/Modules/Orchard.Tags/{DataMigrations/TagsDataMigration.cs => Migrations.cs} (95%)
 rename src/Orchard.Web/Modules/Orchard.Themes/{DataMigrations/ThemesDataMigration.cs => Migrations.cs} (89%)
 rename src/Orchard.Web/Modules/Orchard.Users/{DataMigrations/UsersDataMigration.cs => Migrations.cs} (95%)
 rename src/Orchard.Web/Modules/Orchard.Widgets/{DataMigrations/WidgetsDataMigration.cs => Migrations.cs} (95%)

diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Migrations.cs
similarity index 87%
rename from src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Migrations.cs
index 5522b5d66..14940045d 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Migrations.cs
@@ -6,8 +6,8 @@ using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
-namespace ArchiveLater.DataMigrations {
-    public class ArchiveLaterDataMigration : DataMigrationImpl {
+namespace Orchard.ArchiveLater {
+    public class Migrations : DataMigrationImpl {
         public int Create() {
             ContentDefinitionManager.AlterPartDefinition(typeof(ArchiveLaterPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
index 8c97e4df2..dce5dd111 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
@@ -68,7 +68,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DataMigrations\ArchiveLaterDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\ArchiveLaterPartDriver.cs" />
     <Compile Include="Handlers\ArchiveLaterPartHandler.cs" />
     <Compile Include="Handlers\UnpublishingTaskHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
similarity index 93%
rename from src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index 7662e34db..abf666dd8 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -5,8 +5,8 @@ using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Data.Migration;
 
-namespace Orchard.Blogs.DataMigrations {
-    public class BlogsDataMigration : DataMigrationImpl {
+namespace Orchard.Blogs {
+    public class Migrations : DataMigrationImpl {
 
         public int Create() {
             //CREATE TABLE Orchard_Blogs_BlogPartArchiveRecord (Id  integer, Year INTEGER, Month INTEGER, PostCount INTEGER, Blog_id INTEGER, primary key (Id));
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index d44ee7848..2ef51e181 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -70,7 +70,7 @@
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\BlogCommands.cs" />
     <Compile Include="Controllers\BlogAdminController.cs" />
-    <Compile Include="DataMigrations\BlogsDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\BlogPartDriver.cs" />
     <Compile Include="Controllers\BlogPostAdminController.cs" />
     <Compile Include="Controllers\BlogPostController.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
index 6980fdd54..1b80269a7 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
@@ -7,8 +7,8 @@ using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
-namespace Orchard.Comments.DataMigrations {
-    public class CommentsDataMigration : DataMigrationImpl {
+namespace Orchard.Comments {
+    public class Migrations : DataMigrationImpl {
     
         public int Create() {
             //CREATE TABLE Orchard_Comments_ClosedCommentsRecord (Id  integer, ContentItemId INTEGER, primary key (Id));
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 166b2a055..1443113cf 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -72,7 +72,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\CommentController.cs" />
-    <Compile Include="DataMigrations\CommentsDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\CommentPartDriver.cs" />
     <Compile Include="Drivers\CommentsContainerPartDriver.cs" />
     <Compile Include="Drivers\CommentSettingsPartDriver.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Email/DataMigrations/EmailDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
similarity index 81%
rename from src/Orchard.Web/Modules/Orchard.Email/DataMigrations/EmailDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
index e60fb7e6a..5bbf3f693 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/DataMigrations/EmailDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
@@ -1,7 +1,7 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Email.DataMigrations {
-    public class EmailDataMigration : DataMigrationImpl {
+namespace Orchard.Email {
+    public class Migrations : DataMigrationImpl {
 
         public int Create() {
 
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
index 4538cb48d..04160d24c 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
@@ -65,7 +65,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DataMigrations\EmailDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\SmtpSettingsPartDriver.cs" />
     <Compile Include="Handlers\SmtpSettingsPartHandler.cs" />
     <Compile Include="Models\SmtpSettingsPart.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
similarity index 77%
rename from src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
index 2ff65cae4..b1ac79896 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
@@ -1,8 +1,8 @@
 using System;
 using Orchard.Data.Migration;
 
-namespace Orchard.Indexing.DataMigrations {
-    public class IndexingDataMigration : DataMigrationImpl {
+namespace Orchard.Indexing {
+    public class Migrations : DataMigrationImpl {
 
         public int Create() {
             SchemaBuilder.CreateTable("IndexingTaskRecord", table => table
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
index aad7631f6..63d1f7a76 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
@@ -62,7 +62,7 @@
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\IndexingDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="DefaultIndexingUpdater.cs" />
     <Compile Include="Handlers\CreateIndexingTaskHandler.cs" />
     <Compile Include="Handlers\InfosetFieldIndexingHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Media/Migrations.cs
similarity index 90%
rename from src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Media/Migrations.cs
index 39520f791..baa622b36 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Migrations.cs
@@ -1,6 +1,6 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Media.DataMigrations {
+namespace Orchard.Media {
     public class MediaDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 4613973ac..31b08ff65 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -72,7 +72,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="ResourceManifest.cs" />
-    <Compile Include="DataMigrations\MediaDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
     <Compile Include="Models\MediaSettingsPart.cs" />
     <Compile Include="Handlers\MediaSettingsPartHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
index 1655886e4..2fe54e503 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
@@ -1,6 +1,6 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Roles.DataMigrations {
+namespace Orchard.Roles {
     public class RolesDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
index b52a9aa49..cd9fb5214 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -67,7 +67,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\RolesDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\UserRolesPartDriver.cs" />
     <Compile Include="DefaultRoleUpdater.cs" />
     <Compile Include="Models\IUserRoles.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
similarity index 87%
rename from src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
index c87941c09..67552aae3 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
@@ -1,6 +1,6 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Search.DataMigrations {
+namespace Orchard.Search {
     public class SearchDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index 59d239ee4..1a7b9f5dc 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -67,7 +67,7 @@
   <ItemGroup>
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Controllers\SearchController.cs" />
-    <Compile Include="DataMigrations\SearchDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Drivers\SearchSettingsPartDriver.cs" />
     <Compile Include="Filters\SearchFilter.cs" />
     <Compile Include="Models\SearchSettingsPart.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
index 488134ad8..db2d774ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
@@ -6,7 +6,7 @@ using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 using Orchard.Tags.Models;
 
-namespace Orchard.Tags.DataMigrations {
+namespace Orchard.Tags {
     public class TagsDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index d783cfa7a..b41c3416d 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -68,7 +68,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\TagsDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Models\TagsContentItems.cs" />
     <Compile Include="Services\ITagService.cs" />
     <Compile Include="ViewModels\EditTagsViewModel.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
similarity index 89%
rename from src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
index 4e1126c0d..f2e6d2c3d 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
@@ -1,6 +1,6 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Themes.DataMigrations {
+namespace Orchard.Themes {
     public class ThemesDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index fb25f12f7..eca4458ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -69,7 +69,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\ThemesDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="DesignerNotes\ZoneManagerEvents.cs" />
     <Compile Include="Handlers\ThemeSiteSettingsPartHandler.cs" />
     <Compile Include="Models\Theme.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
index 7bec8138d..0445c94ab 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
@@ -1,6 +1,6 @@
 using Orchard.Data.Migration;
 
-namespace Orchard.Users.DataMigrations {
+namespace Orchard.Users {
     public class UsersDataMigration : DataMigrationImpl {
 
         public int Create() {
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index 013c2afac..13cd6098f 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -70,7 +70,7 @@
     <Compile Include="Commands\UserCommands.cs" />
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\UsersDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Events\UserContext.cs" />
     <Compile Include="Handlers\ModerationMessageAlteration.cs" />
     <Compile Include="Handlers\RegistrationSettingsPartHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/DataMigrations/WidgetsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Widgets/DataMigrations/WidgetsDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index af3b88096..0949ccdd7 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/DataMigrations/WidgetsDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
@@ -8,7 +8,7 @@ using Orchard.Environment.State;
 using Orchard.Events;
 using Orchard.Widgets.Models;
 
-namespace Orchard.Widgets.DataMigrations {
+namespace Orchard.Widgets {
     public interface IDefaultLayersInitializer : IEventHandler {
         void CreateDefaultLayers();
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index 48a9b64b4..ea889dd91 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -59,7 +59,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\WidgetsDataMigration.cs" />
+    <Compile Include="Migrations.cs" />
     <Compile Include="Handlers\LayerPartHandler.cs" />
     <Compile Include="Handlers\WidgetPartHandler.cs" />
     <Compile Include="Models\LayerPart.cs" />
@@ -75,9 +75,7 @@
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>