diff --git a/src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/AuditMapDefinition.cs
similarity index 93%
rename from src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/AuditMapDefinition.cs
index 9bc0229550..51a0fed704 100644
--- a/src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/AuditMapDefinition.cs
@@ -4,7 +4,7 @@ using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class AuditMapDefinition : IMapDefinition
+    public class AuditMapDefinition : IMapDefinition
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
diff --git a/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/CodeFileMapDefinition.cs
similarity index 100%
rename from src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/CodeFileMapDefinition.cs
diff --git a/src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentSavedStateMapper.cs
similarity index 96%
rename from src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/ContentSavedStateMapper.cs
index dfb334621d..82f1d4e9bb 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentSavedStateMapper.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Models.Mapping
     /// Returns the <see cref="ContentSavedState?"/> for an <see cref="IContent"/> item
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    internal class ContentBasicSavedStateMapper<T>
+    public class ContentBasicSavedStateMapper<T>
         where T : ContentPropertyBasic
     {
         private readonly ContentSavedStateMapper<T> _inner = new ContentSavedStateMapper<T>();
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Models.Mapping
     /// Returns the <see cref="ContentSavedState"/> for an <see cref="IContent"/> item
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    internal class ContentSavedStateMapper<T>
+    public class ContentSavedStateMapper<T>
         where T : ContentPropertyBasic
     {
         public ContentSavedState Map(IContent source, MapperContext context)
diff --git a/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentVariantMapper.cs
similarity index 98%
rename from src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/ContentVariantMapper.cs
index c279ae2c70..1a911f6d1e 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentVariantMapper.cs
@@ -10,7 +10,7 @@ using Language = Umbraco.Web.Models.ContentEditing.Language;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class ContentVariantMapper
+    public class ContentVariantMapper
     {
         private readonly ILocalizationService _localizationService;
 
diff --git a/src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/DictionaryMapDefinition.cs
similarity index 98%
rename from src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/DictionaryMapDefinition.cs
index c7ae0cb717..278adc56e0 100644
--- a/src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/DictionaryMapDefinition.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Models.Mapping
     /// <summary>
     /// The dictionary model mapper.
     /// </summary>
-    internal class DictionaryMapDefinition : IMapDefinition
+    public class DictionaryMapDefinition : IMapDefinition
     {
         private readonly ILocalizationService _localizationService;
 
diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/LanguageMapDefinition.cs
similarity index 97%
rename from src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/LanguageMapDefinition.cs
index 28074d4817..6fcbe1a88b 100644
--- a/src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/LanguageMapDefinition.cs
@@ -8,7 +8,7 @@ using Language = Umbraco.Web.Models.ContentEditing.Language;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class LanguageMapDefinition : IMapDefinition
+    public class LanguageMapDefinition : IMapDefinition
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/MacroMapDefinition.cs
similarity index 98%
rename from src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/MacroMapDefinition.cs
index e5bca22287..7138c5d795 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/MacroMapDefinition.cs
@@ -9,7 +9,7 @@ using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class MacroMapDefinition : IMapDefinition
+    public class MacroMapDefinition : IMapDefinition
     {
         private readonly ParameterEditorCollection _parameterEditors;
         private readonly ILogger _logger;
diff --git a/src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs b/src/Umbraco.Infrastructure/Models/Mapping/MapperContextExtensions.cs
similarity index 96%
rename from src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/MapperContextExtensions.cs
index 1538f1a987..020a66cd2a 100644
--- a/src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/MapperContextExtensions.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Web.Models.Mapping
     /// <summary>
     /// Provides extension methods for the <see cref="MapperContext"/> class.
     /// </summary>
-    internal static class MapperContextExtensions
+    public static class MapperContextExtensions
     {
         private const string CultureKey = "Map.Culture";
         private const string IncludedPropertiesKey = "Map.IncludedProperties";
@@ -42,4 +42,4 @@ namespace Umbraco.Web.Models.Mapping
             context.Items[IncludedPropertiesKey] = properties;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/RelationMapDefinition.cs
similarity index 98%
rename from src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/RelationMapDefinition.cs
index d26a867858..d6ec4fd969 100644
--- a/src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/RelationMapDefinition.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class RelationMapDefinition : IMapDefinition
+    public class RelationMapDefinition : IMapDefinition
     {
         private readonly IEntityService _entityService;
         private readonly IRelationService _relationService;
diff --git a/src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/SectionMapDefinition.cs
similarity index 96%
rename from src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/SectionMapDefinition.cs
index e05e6e5c84..20b1d2e05f 100644
--- a/src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/SectionMapDefinition.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Sections;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class SectionMapDefinition : IMapDefinition
+    public class SectionMapDefinition : IMapDefinition
     {
         private readonly ILocalizedTextService _textService;
         public SectionMapDefinition(ILocalizedTextService textService)
diff --git a/src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/TagMapDefinition.cs
similarity index 91%
rename from src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/TagMapDefinition.cs
index 2161183504..32912489c2 100644
--- a/src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/TagMapDefinition.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class TagMapDefinition : IMapDefinition
+    public class TagMapDefinition : IMapDefinition
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
diff --git a/src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/TemplateMapDefinition.cs
similarity index 97%
rename from src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/TemplateMapDefinition.cs
index 6868040586..99b69c1fb3 100644
--- a/src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/TemplateMapDefinition.cs
@@ -5,7 +5,7 @@ using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class TemplateMapDefinition : IMapDefinition
+    public class TemplateMapDefinition : IMapDefinition
     {
         private readonly IShortStringHelper _shortStringHelper;
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3d1de77746..ae1c196a21 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -193,7 +193,20 @@
     <Compile Include="Models\Identity\IdentityUser.cs" />
     <Compile Include="Models\Identity\UserLoginInfoWrapper.cs" />
     <Compile Include="Models\Mapping\CommonMapper.cs" />
-    <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentMapDefinition.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyBasicMapper.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDisplayMapper.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDtoMapper.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyMapDefinition.cs" />
+    <Compile Include="Models\Mapping\ContentTypeMapDefinition.cs" />
+    <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
+    <Compile Include="Models\Mapping\MediaMapDefinition.cs" />
+    <Compile Include="Models\Mapping\MemberMapDefinition.cs" />
+    <Compile Include="Models\Mapping\MemberTabsAndPropertiesMapper.cs" />
+    <Compile Include="Models\Mapping\PropertyTypeGroupMapper.cs" />
+    <Compile Include="Models\Mapping\RedirectUrlMapDefinition.cs" />
+    <Compile Include="Models\Mapping\TabsAndPropertiesMapper.cs" />
+    <Compile Include="Models\Mapping\UserMapDefinition.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
@@ -285,7 +298,6 @@
     <Compile Include="ImageProcessorLogger.cs" />
     <Compile Include="Macros\MacroTagParser.cs" />
     <Compile Include="Trees\LogViewerTreeController.cs" />
-    <Compile Include="Models\Mapping\ContentSavedStateMapper.cs" />
     <Compile Include="Mvc\ContainerControllerFactory.cs" />
     <Compile Include="OwinExtensions.cs" />
     <Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
@@ -387,14 +399,6 @@
     <Compile Include="Editors\EditorModelEventManager.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
     <Compile Include="Models\ContentTypeImportModel.cs" />
-    <Compile Include="Models\Mapping\AuditMapDefinition.cs" />
-    <Compile Include="Models\Mapping\DictionaryMapDefinition.cs" />
-    <Compile Include="Models\Mapping\LanguageMapDefinition.cs" />
-    <Compile Include="Models\Mapping\CodeFileMapDefinition.cs" />
-    <Compile Include="Models\Mapping\MemberTabsAndPropertiesMapper.cs" />
-    <Compile Include="Models\Mapping\RedirectUrlMapDefinition.cs" />
-    <Compile Include="Models\Mapping\TemplateMapDefinition.cs" />
-    <Compile Include="Models\Mapping\ContentVariantMapper.cs" />
     <Compile Include="Models\PublishedContent\HttpContextVariationContextAccessor.cs" />
     <Compile Include="Models\PublishedContent\PublishedValueFallback.cs" />
     <Compile Include="Models\Trees\ExportMember.cs" />
@@ -530,7 +534,6 @@
     <Compile Include="Security\ForceRenewalCookieAuthenticationMiddleware.cs" />
     <Compile Include="Security\GetUserSecondsMiddleWare.cs" />
     <Compile Include="Security\IUmbracoBackOfficeTwoFactorOptions.cs" />
-    <Compile Include="Models\Mapping\PropertyTypeGroupMapper.cs" />
     <Compile Include="Services\TreeService.cs" />
     <Compile Include="Security\PreviewAuthenticationMiddleware.cs" />
     <Compile Include="Trees\ContentTypeTreeController.cs" />
@@ -543,7 +546,6 @@
     <Compile Include="IUmbracoContextAccessor.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Models\Mapping\RelationMapDefinition.cs" />
     <Compile Include="Mvc\MvcVersionCheck.cs" />
     <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
     <Compile Include="Mvc\ProfilingView.cs" />
@@ -629,25 +631,12 @@
     <Compile Include="Editors\UpdateCheckController.cs" />
     <Compile Include="PasswordConfigurationExtensions.cs" />
     <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\Mapping\MacroMapDefinition.cs" />
-    <Compile Include="Models\Mapping\MemberMapDefinition.cs" />
-    <Compile Include="Models\Mapping\TagMapDefinition.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
     <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
     <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />
     <Compile Include="Editors\MemberController.cs" />
     <Compile Include="Editors\CurrentUserController.cs" />
     <Compile Include="Models\Mapping\DataTypeMapDefinition.cs" />
-    <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />
@@ -719,16 +708,6 @@
     <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
     <Compile Include="HttpCookieExtensions.cs" />
     <Compile Include="FormDataCollectionExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyBasicMapper.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDisplayMapper.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDtoMapper.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyMapDefinition.cs" />
-    <Compile Include="Models\Mapping\MediaMapDefinition.cs" />
-    <Compile Include="Models\Mapping\ContentTypeMapDefinition.cs" />
-    <Compile Include="Models\Mapping\ContentMapDefinition.cs" />
-    <Compile Include="Models\Mapping\SectionMapDefinition.cs" />
-    <Compile Include="Models\Mapping\TabsAndPropertiesMapper.cs" />
-    <Compile Include="Models\Mapping\UserMapDefinition.cs" />
     <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
     <Compile Include="Trees\MediaTreeController.cs" />
     <Compile Include="Models\Trees\ActionMenuItem.cs" />