diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 588e0de045..3a4c32cf59 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -205,7 +205,6 @@
     <Compile Include="PropertyEditors\IDataValueReference.cs" />
     <Compile Include="PropertyEditors\IDataValueReferenceFactory.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
@@ -294,10 +293,6 @@
     <Compile Include="Migrations\Upgrade\Upgrader.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
     <Compile Include="ContentExtensions.cs" />
-    <Compile Include="Persistence\DatabaseDebugHelper.cs" />
-    <Compile Include="Persistence\DbCommandExtensions.cs" />
-    <Compile Include="Persistence\EntityNotFoundException.cs" />
-    <Compile Include="Persistence\LocalDb.cs" />
     <Compile Include="Migrations\IMigrationContext.cs" />
     <Compile Include="Migrations\IMigrationExpression.cs" />
     <Compile Include="Migrations\Install\DatabaseDataCreator.cs" />
@@ -421,18 +416,6 @@
     <Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\IDataTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
@@ -464,7 +447,6 @@
     <Compile Include="Persistence\Repositories\Implement\UserGroupRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\UserRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentRepositoryBase.cs" />
-    <Compile Include="Persistence\UmbracoDatabaseExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RuntimeState.cs" />
     <Compile Include="Runtime\CoreInitialComposer.cs" />
diff --git a/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs b/src/Umbraco.Infrastructure/Persistence/DatabaseDebugHelper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
rename to src/Umbraco.Infrastructure/Persistence/DatabaseDebugHelper.cs
diff --git a/src/Umbraco.Core/Persistence/DbCommandExtensions.cs b/src/Umbraco.Infrastructure/Persistence/DbCommandExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/DbCommandExtensions.cs
rename to src/Umbraco.Infrastructure/Persistence/DbCommandExtensions.cs
diff --git a/src/Umbraco.Core/Persistence/EntityNotFoundException.cs b/src/Umbraco.Infrastructure/Persistence/EntityNotFoundException.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/EntityNotFoundException.cs
rename to src/Umbraco.Infrastructure/Persistence/EntityNotFoundException.cs
diff --git a/src/Umbraco.Core/Persistence/LocalDb.cs b/src/Umbraco.Infrastructure/Persistence/LocalDb.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/LocalDb.cs
rename to src/Umbraco.Infrastructure/Persistence/LocalDb.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IContentRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IContentRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeCommonRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeCommonRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IContentTypeRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeRepositoryBase.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IContentTypeRepositoryBase.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IContentTypeRepositoryBase.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDataTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IDataTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDataTypeRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IDataTypeRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentBlueprintRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IDocumentBlueprintRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDocumentBlueprintRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IDocumentBlueprintRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IDocumentRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IDocumentRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IEntityRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IEntityRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IMediaRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMediaRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IMediaRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IMediaTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IMediaTypeRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IMemberRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IMemberRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMemberTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IMemberTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMemberTypeRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IMemberTypeRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IPublicAccessRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/IPublicAccessRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IPublicAccessRepository.cs
rename to src/Umbraco.Infrastructure/Persistence/Repositories/IPublicAccessRepository.cs
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
rename to src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs