diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/ColumnDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ColumnDefinition.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Migrations/Model/ColumnDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ColumnDefinition.cs
index 1813225ffe..24276faab0 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/ColumnDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ColumnDefinition.cs
@@ -1,6 +1,6 @@
-using System.Data;
+using System.Data;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class ColumnDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/ConstraintDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs
similarity index 84%
rename from src/Umbraco.Core/Persistence/Migrations/Model/ConstraintDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs
index ce6d1092e1..e11febaaa7 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/ConstraintDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class ConstraintDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/ConstraintType.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintType.cs
similarity index 54%
rename from src/Umbraco.Core/Persistence/Migrations/Model/ConstraintType.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintType.cs
index 30f7912419..ff65c050f6 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/ConstraintType.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintType.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public enum ConstraintType
     {
diff --git a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
index e08f1e883d..1bad7bd082 100644
--- a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Persistence.Migrations.Model;
 
 namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/DeletionDataDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DeletionDataDefinition.cs
similarity index 50%
rename from src/Umbraco.Core/Persistence/Migrations/Model/DeletionDataDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DeletionDataDefinition.cs
index fc57dc2d6c..f4610e7841 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/DeletionDataDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DeletionDataDefinition.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class DeletionDataDefinition : List<KeyValuePair<string, object>>
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/Direction.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/Direction.cs
similarity index 56%
rename from src/Umbraco.Core/Persistence/Migrations/Model/Direction.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/Direction.cs
index b2d1c6c8a2..2e98185ce9 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/Direction.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/Direction.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public enum Direction
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/ForeignKeyDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ForeignKeyDefinition.cs
similarity index 86%
rename from src/Umbraco.Core/Persistence/Migrations/Model/ForeignKeyDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ForeignKeyDefinition.cs
index b688f230d5..4d6f1989f3 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/ForeignKeyDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ForeignKeyDefinition.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class ForeignKeyDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/IndexColumnDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexColumnDefinition.cs
similarity index 70%
rename from src/Umbraco.Core/Persistence/Migrations/Model/IndexColumnDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexColumnDefinition.cs
index 7a48a4ce66..b2bb090ac1 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/IndexColumnDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexColumnDefinition.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class IndexColumnDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/IndexDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Migrations/Model/IndexDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
index 0ba9c5f9ca..f620558905 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/IndexDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class IndexDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/InsertionDataDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/InsertionDataDefinition.cs
similarity index 50%
rename from src/Umbraco.Core/Persistence/Migrations/Model/InsertionDataDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/InsertionDataDefinition.cs
index 23a45a149b..ae49ab224d 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/InsertionDataDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/InsertionDataDefinition.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class InsertionDataDefinition : List<KeyValuePair<string, object>>
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/ModificationType.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ModificationType.cs
similarity index 68%
rename from src/Umbraco.Core/Persistence/Migrations/Model/ModificationType.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ModificationType.cs
index b9858a4315..1ab4e17dcf 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/ModificationType.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ModificationType.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public enum ModificationType
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/SystemMethods.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs
similarity index 66%
rename from src/Umbraco.Core/Persistence/Migrations/Model/SystemMethods.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs
index 2bd0591494..b7cacf0899 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/SystemMethods.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public enum SystemMethods
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Model/TableDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/TableDefinition.cs
similarity index 84%
rename from src/Umbraco.Core/Persistence/Migrations/Model/TableDefinition.cs
rename to src/Umbraco.Core/Persistence/DatabaseModelDefinitions/TableDefinition.cs
index a305875b7c..18180049e9 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Model/TableDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/TableDefinition.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Umbraco.Core.Persistence.Migrations.Model
+namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class TableDefinition
     {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
index 1287871433..3b77743b0d 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
index b8dce3200e..7df3463dea 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs
index 2759069945..a50e393e96 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs
index ea60175e67..439733bc46 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs
index eec58750f3..f37626c98d 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Create.Column;
 using Umbraco.Core.Persistence.Migrations.Syntax.Create.Constraint;
 using Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions;
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs
index df50ef2e28..32a69e7591 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs
index 7dd016517e..69c057fd74 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
index 438a515593..405e013545 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Index
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs
index b6cf3626ec..c62c1ca205 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs
index a592da7102..60e6761713 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Column;
 using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Constraint;
 using Umbraco.Core.Persistence.Migrations.Syntax.Delete.DefaultConstraint;
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteDataBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteDataBuilder.cs
index 3e99d7a5c4..149e73b078 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteDataBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteDataBuilder.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs
index b474a30955..ff449d306c 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs
index 2c368432e2..aa61e8cd6e 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs
index ce7a1d0f76..3136beefab 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs
index 26af44a000..ee9cff2807 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Index/DeleteIndexBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Index/DeleteIndexBuilder.cs
index b754f91803..72250877db 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Index/DeleteIndexBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Index/DeleteIndexBuilder.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Index
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/ExpressionBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/ExpressionBuilder.cs
index 28be42d739..1d2c76b6a7 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/ExpressionBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/ExpressionBuilder.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs
index 53279cd3ea..5980bbe75d 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs
@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs
index 08ca98befa..7dafffcfbd 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs
index 854acd7e3d..3b55c655c4 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/IColumnOptionSyntax.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/IColumnOptionSyntax.cs
index 3b07a81944..5d96a7ca17 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/IColumnOptionSyntax.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/IColumnOptionSyntax.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs
index 33148be7cc..b8ca81ce56 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Insert.Expressions
 {
diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs
index 9e65b842ed..9b419f8daf 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Insert.Expressions;
 
 namespace Umbraco.Core.Persistence.Migrations.Syntax.Insert
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
index 6431b43347..6930f9d9d8 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
@@ -44,6 +44,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         string CreateConstraint { get; }
         string DeleteConstraint { get; }
         string CreateForeignKeyConstraint { get; }
-        string Format(Migrations.Model.ColumnDefinition column);
+        string Format(DatabaseModelDefinitions.ColumnDefinition column);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
index 0655c1e7f4..3c484a8ebf 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using ColumnDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.ColumnDefinition;
 using TableDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.TableDefinition;
 
@@ -170,7 +170,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return result > 0;
         }
 
-        protected override string FormatIdentity(Migrations.Model.ColumnDefinition column)
+        protected override string FormatIdentity(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return column.IsIdentity ? AutoIncrementDefinition : string.Empty;
         }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index cd7501184a..13f41903d7 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -1,5 +1,5 @@
 using Umbraco.Core.Persistence.DatabaseAnnotations;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using ColumnDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.ColumnDefinition;
 
 namespace Umbraco.Core.Persistence.SqlSyntax
@@ -95,12 +95,12 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return result > 0;
         }
 
-        protected override string FormatIdentity(Migrations.Model.ColumnDefinition column)
+        protected override string FormatIdentity(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return column.IsIdentity ? GetIdentityString(column) : string.Empty;
         }
 
-        private static string GetIdentityString(Migrations.Model.ColumnDefinition column)
+        private static string GetIdentityString(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return "IDENTITY(1,1)";
         }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 5784fff530..527ad161b6 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.SqlSyntax
 {
@@ -43,12 +43,12 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return result > 0;
         }
 
-        protected override string FormatIdentity(Migrations.Model.ColumnDefinition column)
+        protected override string FormatIdentity(ColumnDefinition column)
         {
             return column.IsIdentity ? GetIdentityString(column) : string.Empty;
         }
 
-        private static string GetIdentityString(Migrations.Model.ColumnDefinition column)
+        private static string GetIdentityString(ColumnDefinition column)
         {
             return "IDENTITY(1,1)";
         }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index a4e18fc7a0..5e0bd84f4f 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -4,7 +4,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
-using Umbraco.Core.Persistence.Migrations.Model;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using ColumnDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.ColumnDefinition;
 using TableDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.TableDefinition;
 
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     {
         protected SqlSyntaxProviderBase()
         {
-            ClauseOrder = new List<Func<Migrations.Model.ColumnDefinition, string>>
+            ClauseOrder = new List<Func<DatabaseModelDefinitions.ColumnDefinition, string>>
                               {
                                   FormatString,
                                   FormatType,
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         public string DateTimeColumnDefinition = "DATETIME";
         public string TimeColumnDefinition = "DATETIME";
 
-        protected IList<Func<Migrations.Model.ColumnDefinition, string>> ClauseOrder { get; set; }
+        protected IList<Func<DatabaseModelDefinitions.ColumnDefinition, string>> ClauseOrder { get; set; }
 
         protected DbTypes<TSyntax> DbTypeMap = new DbTypes<TSyntax>();
         protected void InitColumnTypeMap()
@@ -335,7 +335,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return DbTypeMap.ColumnDbTypeMap[valueType];
         }
 
-        public virtual string Format(Migrations.Model.ColumnDefinition column)
+        public virtual string Format(DatabaseModelDefinitions.ColumnDefinition column)
         {
             var clauses = new List<string>();
 
@@ -349,12 +349,12 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return string.Join(" ", clauses.ToArray());
         }
 
-        public virtual string FormatString(Migrations.Model.ColumnDefinition column)
+        public virtual string FormatString(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return GetQuotedColumnName(column.Name);
         }
 
-        protected virtual string FormatType(Migrations.Model.ColumnDefinition column)
+        protected virtual string FormatType(DatabaseModelDefinitions.ColumnDefinition column)
         {
             if (!column.Type.HasValue)
                 return column.CustomType;
@@ -369,12 +369,12 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return dbTypeDefinition;
         }
 
-        protected virtual string FormatNullable(Migrations.Model.ColumnDefinition column)
+        protected virtual string FormatNullable(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return column.IsNullable ? string.Empty : "NOT NULL";
         }
 
-        protected virtual string FormatDefaultValue(Migrations.Model.ColumnDefinition column)
+        protected virtual string FormatDefaultValue(DatabaseModelDefinitions.ColumnDefinition column)
         {
             if (column.DefaultValue == null)
                 return string.Empty;
@@ -392,14 +392,14 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return "DEFAULT " + GetQuotedValue(column.DefaultValue.ToString());
         }
 
-        protected virtual string FormatPrimaryKey(Migrations.Model.ColumnDefinition column)
+        protected virtual string FormatPrimaryKey(DatabaseModelDefinitions.ColumnDefinition column)
         {
             return string.Empty;
         }
 
         protected abstract string FormatSystemMethods(SystemMethods systemMethod);
 
-        protected abstract string FormatIdentity(Migrations.Model.ColumnDefinition column);
+        protected abstract string FormatIdentity(DatabaseModelDefinitions.ColumnDefinition column);
 
         public virtual string CreateTable { get { return "CREATE TABLE {0} ({1})"; } }
         public virtual string DropTable { get { return "DROP TABLE {0}"; } }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e81cef4503..ec682630ef 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -184,7 +184,19 @@
     <Compile Include="Persistence\DatabaseAnnotations\PrimaryKeyColumnAttribute.cs" />
     <Compile Include="Persistence\DatabaseAnnotations\ReferencesAttribute.cs" />
     <Compile Include="Persistence\DatabaseFactory.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\ColumnDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintType.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\DefinitionFactory.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\DeletionDataDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\Direction.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\ForeignKeyDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\IndexColumnDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\IndexDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\InsertionDataDefinition.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\ModificationType.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\SystemMethods.cs" />
+    <Compile Include="Persistence\DatabaseModelDefinitions\TableDefinition.cs" />
     <Compile Include="Persistence\DatabaseProviders.cs" />
     <Compile Include="Persistence\Factories\ContentFactory.cs" />
     <Compile Include="Persistence\Factories\ContentTypeFactory.cs" />
@@ -225,18 +237,6 @@
     <Compile Include="Persistence\Migrations\MigrationBase.cs" />
     <Compile Include="Persistence\Migrations\MigrationContext.cs" />
     <Compile Include="Persistence\Migrations\MigrationRunner.cs" />
-    <Compile Include="Persistence\Migrations\Model\ColumnDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\ConstraintDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\ConstraintType.cs" />
-    <Compile Include="Persistence\Migrations\Model\DeletionDataDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\Direction.cs" />
-    <Compile Include="Persistence\Migrations\Model\InsertionDataDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\ModificationType.cs" />
-    <Compile Include="Persistence\Migrations\Model\ForeignKeyDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\IndexColumnDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\IndexDefinition.cs" />
-    <Compile Include="Persistence\Migrations\Model\SystemMethods.cs" />
-    <Compile Include="Persistence\Migrations\Model\TableDefinition.cs" />
     <Compile Include="Persistence\Migrations\PluginManagerExtension.cs" />
     <Compile Include="Persistence\Migrations\Syntax\Alter\AlterSyntaxBuilder.cs" />
     <Compile Include="Persistence\Migrations\Syntax\Alter\Column\AlterColumnBuilder.cs" />
@@ -634,7 +634,9 @@
       <Name>umbraco.interfaces</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Persistence\Migrations\Model\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.