diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1340f40dbd..7b47f50a68 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -199,8 +199,6 @@
     <Compile Include="Models\UserExtensions.cs" />
     <Compile Include="Packaging\PackageDataInstallation.cs" />
     <Compile Include="Packaging\PackageInstallation.cs" />
-    <Compile Include="Persistence\Mappers\MapperCollectionBuilder.cs" />
-    <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
     <Compile Include="Persistence\SqlCeBulkSqlInsertProvider.cs" />
     <Compile Include="Persistence\SqlSyntax\SqlCeSyntaxProvider.cs" />
     <Compile Include="PropertyEditors\DataValueReferenceFactoryCollection.cs" />
@@ -275,9 +273,6 @@
     <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
     <Compile Include="Persistence\Factories\AuditEntryFactory.cs" />
     <Compile Include="Persistence\Factories\ConsentFactory.cs" />
-    <Compile Include="Persistence\Mappers\AuditEntryMapper.cs" />
-    <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
-    <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
     <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ConsentRepository.cs" />
     <Compile Include="RuntimeOptions.cs" />
@@ -325,33 +320,6 @@
     <Compile Include="Persistence\Factories\UserFactory.cs" />
     <Compile Include="Persistence\Factories\UserGroupFactory.cs" />
     <Compile Include="Persistence\LocalDb.cs" />
-    <Compile Include="Persistence\Mappers\AccessMapper.cs" />
-    <Compile Include="Persistence\Mappers\ContentMapper.cs" />
-    <Compile Include="Persistence\Mappers\ContentTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\DataTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\DictionaryMapper.cs" />
-    <Compile Include="Persistence\Mappers\DictionaryTranslationMapper.cs" />
-    <Compile Include="Persistence\Mappers\DomainMapper.cs" />
-    <Compile Include="Persistence\Mappers\ExternalLoginMapper.cs" />
-    <Compile Include="Persistence\Mappers\LanguageMapper.cs" />
-    <Compile Include="Persistence\Mappers\MacroMapper.cs" />
-    <Compile Include="Persistence\Mappers\MediaMapper.cs" />
-    <Compile Include="Persistence\Mappers\MediaTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\RelationMapper.cs" />
-    <Compile Include="Persistence\Mappers\RelationTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\ServerRegistrationMapper.cs" />
-    <Compile Include="Persistence\Mappers\TagMapper.cs" />
-    <Compile Include="Persistence\Mappers\TemplateMapper.cs" />
-    <Compile Include="Persistence\Mappers\UmbracoEntityMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserSectionMapper.cs" />
     <Compile Include="Migrations\IMigrationContext.cs" />
     <Compile Include="Migrations\IMigrationExpression.cs" />
     <Compile Include="Migrations\Install\DatabaseDataCreator.cs" />
@@ -596,5 +564,8 @@
       <Name>Umbraco.Infrastructure</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Persistence\Mappers" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Mappers/AccessMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/AccessMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/AccessMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/AccessMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/AuditEntryMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/AuditEntryMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/AuditEntryMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/AuditEntryMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/AuditItemMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/AuditItemMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/ConsentMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/ConsentMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/ConsentMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/ConsentMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/ContentMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/ContentMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/ContentTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/DataTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/DataTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/DictionaryMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/DictionaryMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/DictionaryTranslationMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/DictionaryTranslationMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/DomainMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/DomainMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/ExternalLoginMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/ExternalLoginMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/ExternalLoginMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/ExternalLoginMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MacroMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MacroMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollectionBuilder.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MediaMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MediaMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MediaTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MediaTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MediaTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberGroupMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MemberGroupMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MemberGroupMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MemberGroupMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MemberMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MemberMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MemberTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/MemberTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/MemberTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/PropertyMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/PropertyMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/PropertyMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/PropertyMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/RelationMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/RelationMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/RelationMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/RelationMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/RelationTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/RelationTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/ServerRegistrationMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/ServerRegistrationMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/SimpleContentTypeMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/SimpleContentTypeMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/TagMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/TagMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/TagMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/TagMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/TemplateMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/TemplateMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/UmbracoEntityMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/UmbracoEntityMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/UserGroupMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/UserGroupMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/UserGroupMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/UserGroupMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/UserMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/UserMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/UserMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/UserMapper.cs
diff --git a/src/Umbraco.Core/Persistence/Mappers/UserSectionMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/UserSectionMapper.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Mappers/UserSectionMapper.cs
rename to src/Umbraco.Infrastructure/Persistence/Mappers/UserSectionMapper.cs