Netcore: Align namespaces (#9801)

* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge

src/Umbraco.Core/Models/Mapping/AuditMapDefinition.cs

@@ -1,8 +1,7 @@
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class AuditMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/CodeFileMapDefinition.cs

@@ -1,8 +1,7 @@
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class CodeFileMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/CommonMapper.cs

@@ -1,18 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.ContentApps;
-using Umbraco.Web.Models.ContentEditing;
-using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile;
+using Umbraco.Cms.Core.ContentApps;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Models.Membership;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
+using UserProfile = Umbraco.Cms.Core.Models.ContentEditing.UserProfile;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class CommonMapper
     {

src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// Creates a base generic ContentPropertyBasic from a Property

src/Umbraco.Core/Models/Mapping/ContentPropertyDisplayMapper.cs

@@ -1,12 +1,15 @@
-using Microsoft.Extensions.Logging;
-using Umbraco.Core.Dictionary;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
 
-namespace Umbraco.Web.Models.Mapping
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Dictionary;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// Creates a ContentPropertyDisplay from a Property

src/Umbraco.Core/Models/Mapping/ContentPropertyDtoMapper.cs

@@ -1,11 +1,10 @@
 using Microsoft.Extensions.Logging;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// Creates a ContentPropertyDto from a Property

src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs

@@ -1,12 +1,11 @@
 using Microsoft.Extensions.Logging;
-using Umbraco.Core.Dictionary;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Dictionary;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// A mapper which declares how to map content properties. These mappings are shared among media (and probably members) which is

src/Umbraco.Core/Models/Mapping/ContentSavedStateMapper.cs

@@ -1,10 +1,9 @@
 using System;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// Returns the <see cref="ContentSavedState?"/> for an <see cref="IContent"/> item

src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs

@@ -3,19 +3,18 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.Models;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Hosting;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Configuration;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Exceptions;
+using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Strings;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// Defines mappings for content/media/members type mappings

src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Language = Umbraco.Web.Models.ContentEditing.Language;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class ContentVariantMapper
     {
@@ -96,17 +94,17 @@ namespace Umbraco.Web.Models.Mapping
             return variant.Language == null || variant.Language.IsDefault;
         }
 
-        private IEnumerable<Language> GetLanguages(MapperContext context)
+        private IEnumerable<ContentEditing.Language> GetLanguages(MapperContext context)
         {
             var allLanguages = _localizationService.GetAllLanguages().OrderBy(x => x.Id).ToList();
             if (allLanguages.Count == 0)
             {
                 // This should never happen
-                return Enumerable.Empty<Language>();
+                return Enumerable.Empty<ContentEditing.Language>();
             }
             else
             {
-                return context.MapEnumerable<ILanguage, Language>(allLanguages).ToList();
+                return context.MapEnumerable<ILanguage, ContentEditing.Language>(allLanguages).ToList();
             }
         }
 
@@ -130,7 +128,7 @@ namespace Umbraco.Web.Models.Mapping
             return segments.Distinct();
         }
 
-        private ContentVariantDisplay CreateVariantDisplay(MapperContext context, IContent content, Language language, string segment)
+        private ContentVariantDisplay CreateVariantDisplay(MapperContext context, IContent content, ContentEditing.Language language, string segment)
         {
             context.SetCulture(language?.IsoCode);
             context.SetSegment(segment);
@@ -145,7 +143,7 @@ namespace Umbraco.Web.Models.Mapping
             return variantDisplay;
         }
 
-        private string GetDisplayName(Language language, string segment)
+        private string GetDisplayName(ContentEditing.Language language, string segment)
         {
             var isCultureVariant = language != null;
             var isSegmentVariant = !segment.IsNullOrWhiteSpace();

src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs

@@ -3,15 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Umbraco.Core;
-using Umbraco.Core.Configuration.Models;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class DataTypeMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/DictionaryMapDefinition.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <inheritdoc />
     /// <summary>

src/Umbraco.Core/Models/Mapping/LanguageMapDefinition.cs

@@ -1,20 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
-using Language = Umbraco.Web.Models.ContentEditing.Language;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class LanguageMapDefinition : IMapDefinition
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
             mapper.Define<ILanguage, EntityBasic>((source, context) => new EntityBasic(), Map);
-            mapper.Define<ILanguage, Language>((source, context) => new Language(), Map);
-            mapper.Define<IEnumerable<ILanguage>, IEnumerable<Language>>((source, context) => new List<Language>(), Map);
+            mapper.Define<ILanguage, ContentEditing.Language>((source, context) => new ContentEditing.Language(), Map);
+            mapper.Define<IEnumerable<ILanguage>, IEnumerable<ContentEditing.Language>>((source, context) => new List<ContentEditing.Language>(), Map);
         }
 
         // Umbraco.Code.MapAll -Udi -Path -Trashed -AdditionalData -Icon
@@ -28,7 +26,7 @@ namespace Umbraco.Web.Models.Mapping
         }
 
         // Umbraco.Code.MapAll
-        private static void Map(ILanguage source, Language target, MapperContext context)
+        private static void Map(ILanguage source, ContentEditing.Language target, MapperContext context)
         {
             target.Id = source.Id;
             target.IsoCode = source.IsoCode;
@@ -38,14 +36,14 @@ namespace Umbraco.Web.Models.Mapping
             target.FallbackLanguageId = source.FallbackLanguageId;
         }
 
-        private static void Map(IEnumerable<ILanguage> source, IEnumerable<Language> target, MapperContext context)
+        private static void Map(IEnumerable<ILanguage> source, IEnumerable<ContentEditing.Language> target, MapperContext context)
         {
             if (target == null)
                 throw new ArgumentNullException(nameof(target));
-            if (!(target is List<Language> list))
+            if (!(target is List<ContentEditing.Language> list))
                 throw new NotSupportedException($"{nameof(target)} must be a List<Language>.");
 
-            var temp = context.MapEnumerable<ILanguage, Language>(source);
+            var temp = context.MapEnumerable<ILanguage, ContentEditing.Language>(source);
 
             //Put the default language first in the list & then sort rest by a-z
             var defaultLang = temp.SingleOrDefault(x => x.IsDefault);

src/Umbraco.Core/Models/Mapping/MacroMapDefinition.cs

@@ -1,12 +1,10 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class MacroMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/MapperContextExtensions.cs

@@ -1,6 +1,6 @@
-using Umbraco.Core.Mapping;
+using Umbraco.Cms.Core.Mapping;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Extensions
 {
     /// <summary>
     /// Provides extension methods for the <see cref="MapperContext"/> class.

src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs

@@ -2,17 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Options;
-using Umbraco.Core;
-using Umbraco.Core.Configuration.Models;
-using Umbraco.Core.Dictionary;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Security;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Dictionary;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     /// <summary>
     /// A custom tab/property resolver for members which will ensure that the built-in membership properties are or aren't displayed

src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Strings;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class PropertyTypeGroupMapper<TPropertyType>
         where TPropertyType : PropertyTypeDisplay, new()

src/Umbraco.Core/Models/Mapping/RedirectUrlMapDefinition.cs

@@ -1,9 +1,8 @@
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Routing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Routing;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class RedirectUrlMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/RelationMapDefinition.cs

@@ -1,10 +1,9 @@
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class RelationMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/SectionMapDefinition.cs

@@ -1,11 +1,11 @@
-using Umbraco.Core.Manifest;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models.Sections;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Sections;
+using Umbraco.Cms.Core.Manifest;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Sections;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class SectionMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Dictionary;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Dictionary;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public abstract class TabsAndPropertiesMapper
     {

src/Umbraco.Core/Models/Mapping/TagMapDefinition.cs

@@ -1,7 +1,6 @@
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
+using Umbraco.Cms.Core.Mapping;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class TagMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/TemplateMapDefinition.cs

@@ -1,9 +1,8 @@
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Models;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Strings;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class TemplateMapDefinition : IMapDefinition
     {

src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs

@@ -3,23 +3,21 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Options;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.Models;
-using Umbraco.Core.IO;
-using Umbraco.Core.Mapping;
-using Umbraco.Core.Media;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Sections;
-using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Actions;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Services;
+using Umbraco.Cms.Core.Actions;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.IO;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Media;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Models.Membership;
+using Umbraco.Cms.Core.Sections;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Strings;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class UserMapDefinition : IMapDefinition
     {