diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 15c6ac263f..bc28a2c13a 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Abstractions/Actions/ActionAssignDomain.cs b/src/Umbraco.Core/Actions/ActionAssignDomain.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionAssignDomain.cs
rename to src/Umbraco.Core/Actions/ActionAssignDomain.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionBrowse.cs b/src/Umbraco.Core/Actions/ActionBrowse.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionBrowse.cs
rename to src/Umbraco.Core/Actions/ActionBrowse.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionChangeDocType.cs b/src/Umbraco.Core/Actions/ActionChangeDocType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionChangeDocType.cs
rename to src/Umbraco.Core/Actions/ActionChangeDocType.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionCollection.cs b/src/Umbraco.Core/Actions/ActionCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionCollection.cs
rename to src/Umbraco.Core/Actions/ActionCollection.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionCollectionBuilder.cs b/src/Umbraco.Core/Actions/ActionCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionCollectionBuilder.cs
rename to src/Umbraco.Core/Actions/ActionCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionCopy.cs b/src/Umbraco.Core/Actions/ActionCopy.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionCopy.cs
rename to src/Umbraco.Core/Actions/ActionCopy.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionCreateBlueprintFromContent.cs b/src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionCreateBlueprintFromContent.cs
rename to src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionDelete.cs b/src/Umbraco.Core/Actions/ActionDelete.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionDelete.cs
rename to src/Umbraco.Core/Actions/ActionDelete.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionMove.cs b/src/Umbraco.Core/Actions/ActionMove.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionMove.cs
rename to src/Umbraco.Core/Actions/ActionMove.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionNew.cs b/src/Umbraco.Core/Actions/ActionNew.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionNew.cs
rename to src/Umbraco.Core/Actions/ActionNew.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionProtect.cs b/src/Umbraco.Core/Actions/ActionProtect.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionProtect.cs
rename to src/Umbraco.Core/Actions/ActionProtect.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionPublish.cs b/src/Umbraco.Core/Actions/ActionPublish.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionPublish.cs
rename to src/Umbraco.Core/Actions/ActionPublish.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionRestore.cs b/src/Umbraco.Core/Actions/ActionRestore.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionRestore.cs
rename to src/Umbraco.Core/Actions/ActionRestore.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionRights.cs b/src/Umbraco.Core/Actions/ActionRights.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionRights.cs
rename to src/Umbraco.Core/Actions/ActionRights.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionRollback.cs b/src/Umbraco.Core/Actions/ActionRollback.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionRollback.cs
rename to src/Umbraco.Core/Actions/ActionRollback.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionSort.cs b/src/Umbraco.Core/Actions/ActionSort.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionSort.cs
rename to src/Umbraco.Core/Actions/ActionSort.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionToPublish.cs b/src/Umbraco.Core/Actions/ActionToPublish.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionToPublish.cs
rename to src/Umbraco.Core/Actions/ActionToPublish.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionUnpublish.cs b/src/Umbraco.Core/Actions/ActionUnpublish.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionUnpublish.cs
rename to src/Umbraco.Core/Actions/ActionUnpublish.cs
diff --git a/src/Umbraco.Abstractions/Actions/ActionUpdate.cs b/src/Umbraco.Core/Actions/ActionUpdate.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/ActionUpdate.cs
rename to src/Umbraco.Core/Actions/ActionUpdate.cs
diff --git a/src/Umbraco.Abstractions/Actions/IAction.cs b/src/Umbraco.Core/Actions/IAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Actions/IAction.cs
rename to src/Umbraco.Core/Actions/IAction.cs
diff --git a/src/Umbraco.Abstractions/AssemblyExtensions.cs b/src/Umbraco.Core/AssemblyExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/AssemblyExtensions.cs
rename to src/Umbraco.Core/AssemblyExtensions.cs
diff --git a/src/Umbraco.Abstractions/Attempt.cs b/src/Umbraco.Core/Attempt.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Attempt.cs
rename to src/Umbraco.Core/Attempt.cs
diff --git a/src/Umbraco.Abstractions/AttemptOfTResult.cs b/src/Umbraco.Core/AttemptOfTResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/AttemptOfTResult.cs
rename to src/Umbraco.Core/AttemptOfTResult.cs
diff --git a/src/Umbraco.Abstractions/AttemptOfTResultTStatus.cs b/src/Umbraco.Core/AttemptOfTResultTStatus.cs
similarity index 100%
rename from src/Umbraco.Abstractions/AttemptOfTResultTStatus.cs
rename to src/Umbraco.Core/AttemptOfTResultTStatus.cs
diff --git a/src/Umbraco.Abstractions/Cache/AppCacheExtensions.cs b/src/Umbraco.Core/Cache/AppCacheExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/AppCacheExtensions.cs
rename to src/Umbraco.Core/Cache/AppCacheExtensions.cs
diff --git a/src/Umbraco.Abstractions/Cache/AppCaches.cs b/src/Umbraco.Core/Cache/AppCaches.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/AppCaches.cs
rename to src/Umbraco.Core/Cache/AppCaches.cs
diff --git a/src/Umbraco.Abstractions/Cache/AppPolicedCacheDictionary.cs b/src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/AppPolicedCacheDictionary.cs
rename to src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs
diff --git a/src/Umbraco.Abstractions/Cache/ApplicationCacheRefresher.cs b/src/Umbraco.Core/Cache/ApplicationCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/ApplicationCacheRefresher.cs
rename to src/Umbraco.Core/Cache/ApplicationCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/CacheKeys.cs
rename to src/Umbraco.Core/Cache/CacheKeys.cs
diff --git a/src/Umbraco.Abstractions/Cache/CacheRefresherBase.cs b/src/Umbraco.Core/Cache/CacheRefresherBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/CacheRefresherBase.cs
rename to src/Umbraco.Core/Cache/CacheRefresherBase.cs
diff --git a/src/Umbraco.Abstractions/Cache/CacheRefresherCollection.cs b/src/Umbraco.Core/Cache/CacheRefresherCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/CacheRefresherCollection.cs
rename to src/Umbraco.Core/Cache/CacheRefresherCollection.cs
diff --git a/src/Umbraco.Abstractions/Cache/CacheRefresherCollectionBuilder.cs b/src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/CacheRefresherCollectionBuilder.cs
rename to src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Cache/CacheRefresherEventArgs.cs b/src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/CacheRefresherEventArgs.cs
rename to src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Cache/ContentCacheRefresher.cs b/src/Umbraco.Core/Cache/ContentCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/ContentCacheRefresher.cs
rename to src/Umbraco.Core/Cache/ContentCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/ContentTypeCacheRefresher.cs
rename to src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DataTypeCacheRefresher.cs
rename to src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/DeepCloneAppCache.cs b/src/Umbraco.Core/Cache/DeepCloneAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DeepCloneAppCache.cs
rename to src/Umbraco.Core/Cache/DeepCloneAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/DictionaryAppCache.cs b/src/Umbraco.Core/Cache/DictionaryAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DictionaryAppCache.cs
rename to src/Umbraco.Core/Cache/DictionaryAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/DictionaryCacheRefresher.cs b/src/Umbraco.Core/Cache/DictionaryCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DictionaryCacheRefresher.cs
rename to src/Umbraco.Core/Cache/DictionaryCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/DistributedCache.cs b/src/Umbraco.Core/Cache/DistributedCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DistributedCache.cs
rename to src/Umbraco.Core/Cache/DistributedCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/DistributedCacheBinderComponent.cs b/src/Umbraco.Core/Cache/DistributedCacheBinderComponent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DistributedCacheBinderComponent.cs
rename to src/Umbraco.Core/Cache/DistributedCacheBinderComponent.cs
diff --git a/src/Umbraco.Abstractions/Cache/DomainCacheRefresher.cs b/src/Umbraco.Core/Cache/DomainCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/DomainCacheRefresher.cs
rename to src/Umbraco.Core/Cache/DomainCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/FastDictionaryAppCache.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/FastDictionaryAppCache.cs
rename to src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/FastDictionaryAppCacheBase.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/FastDictionaryAppCacheBase.cs
rename to src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
diff --git a/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs b/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
rename to src/Umbraco.Core/Cache/HttpRequestAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/IAppCache.cs b/src/Umbraco.Core/Cache/IAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IAppCache.cs
rename to src/Umbraco.Core/Cache/IAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/IAppPolicyCache.cs b/src/Umbraco.Core/Cache/IAppPolicyCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IAppPolicyCache.cs
rename to src/Umbraco.Core/Cache/IAppPolicyCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/ICacheRefresher.cs b/src/Umbraco.Core/Cache/ICacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/ICacheRefresher.cs
rename to src/Umbraco.Core/Cache/ICacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/IDistributedCacheBinder.cs b/src/Umbraco.Core/Cache/IDistributedCacheBinder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IDistributedCacheBinder.cs
rename to src/Umbraco.Core/Cache/IDistributedCacheBinder.cs
diff --git a/src/Umbraco.Abstractions/Cache/IJsonCacheRefresher.cs b/src/Umbraco.Core/Cache/IJsonCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IJsonCacheRefresher.cs
rename to src/Umbraco.Core/Cache/IJsonCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/IPayloadCacheRefresher.cs b/src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IPayloadCacheRefresher.cs
rename to src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/IRepositoryCachePolicy.cs b/src/Umbraco.Core/Cache/IRepositoryCachePolicy.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IRepositoryCachePolicy.cs
rename to src/Umbraco.Core/Cache/IRepositoryCachePolicy.cs
diff --git a/src/Umbraco.Abstractions/Cache/IRequestCache.cs b/src/Umbraco.Core/Cache/IRequestCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IRequestCache.cs
rename to src/Umbraco.Core/Cache/IRequestCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/IsolatedCaches.cs b/src/Umbraco.Core/Cache/IsolatedCaches.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/IsolatedCaches.cs
rename to src/Umbraco.Core/Cache/IsolatedCaches.cs
diff --git a/src/Umbraco.Abstractions/Cache/JsonCacheRefresherBase.cs b/src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/JsonCacheRefresherBase.cs
rename to src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs
diff --git a/src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs b/src/Umbraco.Core/Cache/LanguageCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs
rename to src/Umbraco.Core/Cache/LanguageCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/MacroCacheRefresher.cs b/src/Umbraco.Core/Cache/MacroCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/MacroCacheRefresher.cs
rename to src/Umbraco.Core/Cache/MacroCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/MediaCacheRefresher.cs b/src/Umbraco.Core/Cache/MediaCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/MediaCacheRefresher.cs
rename to src/Umbraco.Core/Cache/MediaCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/MemberCacheRefresher.cs b/src/Umbraco.Core/Cache/MemberCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/MemberCacheRefresher.cs
rename to src/Umbraco.Core/Cache/MemberCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs b/src/Umbraco.Core/Cache/MemberGroupCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs
rename to src/Umbraco.Core/Cache/MemberGroupCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/NoAppCache.cs b/src/Umbraco.Core/Cache/NoAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/NoAppCache.cs
rename to src/Umbraco.Core/Cache/NoAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/NoCacheRepositoryCachePolicy.cs b/src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/NoCacheRepositoryCachePolicy.cs
rename to src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs
diff --git a/src/Umbraco.Abstractions/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/ObjectCacheAppCache.cs
rename to src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
diff --git a/src/Umbraco.Abstractions/Cache/PayloadCacheRefresherBase.cs b/src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/PayloadCacheRefresherBase.cs
rename to src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs
diff --git a/src/Umbraco.Abstractions/Cache/PublicAccessCacheRefresher.cs b/src/Umbraco.Core/Cache/PublicAccessCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/PublicAccessCacheRefresher.cs
rename to src/Umbraco.Core/Cache/PublicAccessCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/RelationTypeCacheRefresher.cs b/src/Umbraco.Core/Cache/RelationTypeCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/RelationTypeCacheRefresher.cs
rename to src/Umbraco.Core/Cache/RelationTypeCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/RepositoryCachePolicyOptions.cs b/src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/RepositoryCachePolicyOptions.cs
rename to src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs
diff --git a/src/Umbraco.Abstractions/Cache/SafeLazy.cs b/src/Umbraco.Core/Cache/SafeLazy.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/SafeLazy.cs
rename to src/Umbraco.Core/Cache/SafeLazy.cs
diff --git a/src/Umbraco.Abstractions/Cache/TemplateCacheRefresher.cs b/src/Umbraco.Core/Cache/TemplateCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/TemplateCacheRefresher.cs
rename to src/Umbraco.Core/Cache/TemplateCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/TypedCacheRefresherBase.cs b/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/TypedCacheRefresherBase.cs
rename to src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs
diff --git a/src/Umbraco.Abstractions/Cache/UserCacheRefresher.cs b/src/Umbraco.Core/Cache/UserCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/UserCacheRefresher.cs
rename to src/Umbraco.Core/Cache/UserCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/Cache/UserGroupCacheRefresher.cs b/src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cache/UserGroupCacheRefresher.cs
rename to src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
diff --git a/src/Umbraco.Abstractions/CacheHelperExtensions.cs b/src/Umbraco.Core/CacheHelperExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CacheHelperExtensions.cs
rename to src/Umbraco.Core/CacheHelperExtensions.cs
diff --git a/src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs b/src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs
rename to src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs
diff --git a/src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs
rename to src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs
diff --git a/src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs b/src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs
rename to src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs
diff --git a/src/Umbraco.Abstractions/Collections/CompositeIntStringKey.cs b/src/Umbraco.Core/Collections/CompositeIntStringKey.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/CompositeIntStringKey.cs
rename to src/Umbraco.Core/Collections/CompositeIntStringKey.cs
diff --git a/src/Umbraco.Abstractions/Collections/CompositeNStringNStringKey.cs b/src/Umbraco.Core/Collections/CompositeNStringNStringKey.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/CompositeNStringNStringKey.cs
rename to src/Umbraco.Core/Collections/CompositeNStringNStringKey.cs
diff --git a/src/Umbraco.Abstractions/Collections/CompositeStringStringKey.cs b/src/Umbraco.Core/Collections/CompositeStringStringKey.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/CompositeStringStringKey.cs
rename to src/Umbraco.Core/Collections/CompositeStringStringKey.cs
diff --git a/src/Umbraco.Abstractions/Collections/CompositeTypeTypeKey.cs b/src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/CompositeTypeTypeKey.cs
rename to src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs
diff --git a/src/Umbraco.Abstractions/Collections/ConcurrentHashSet.cs b/src/Umbraco.Core/Collections/ConcurrentHashSet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/ConcurrentHashSet.cs
rename to src/Umbraco.Core/Collections/ConcurrentHashSet.cs
diff --git a/src/Umbraco.Abstractions/Collections/DeepCloneableList.cs b/src/Umbraco.Core/Collections/DeepCloneableList.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/DeepCloneableList.cs
rename to src/Umbraco.Core/Collections/DeepCloneableList.cs
diff --git a/src/Umbraco.Abstractions/Collections/ListCloneBehavior.cs b/src/Umbraco.Core/Collections/ListCloneBehavior.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/ListCloneBehavior.cs
rename to src/Umbraco.Core/Collections/ListCloneBehavior.cs
diff --git a/src/Umbraco.Abstractions/Collections/ObservableDictionary.cs b/src/Umbraco.Core/Collections/ObservableDictionary.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/ObservableDictionary.cs
rename to src/Umbraco.Core/Collections/ObservableDictionary.cs
diff --git a/src/Umbraco.Abstractions/Collections/OrderedHashSet.cs b/src/Umbraco.Core/Collections/OrderedHashSet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/OrderedHashSet.cs
rename to src/Umbraco.Core/Collections/OrderedHashSet.cs
diff --git a/src/Umbraco.Abstractions/Collections/TopoGraph.cs b/src/Umbraco.Core/Collections/TopoGraph.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/TopoGraph.cs
rename to src/Umbraco.Core/Collections/TopoGraph.cs
diff --git a/src/Umbraco.Abstractions/Collections/TypeList.cs b/src/Umbraco.Core/Collections/TypeList.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Collections/TypeList.cs
rename to src/Umbraco.Core/Collections/TypeList.cs
diff --git a/src/Umbraco.Abstractions/Composing/BuilderCollectionBase.cs b/src/Umbraco.Core/Composing/BuilderCollectionBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/BuilderCollectionBase.cs
rename to src/Umbraco.Core/Composing/BuilderCollectionBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/CollectionBuilderBase.cs b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/CollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/CollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/ComponentCollection.cs b/src/Umbraco.Core/Composing/ComponentCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ComponentCollection.cs
rename to src/Umbraco.Core/Composing/ComponentCollection.cs
diff --git a/src/Umbraco.Abstractions/Composing/ComponentCollectionBuilder.cs b/src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ComponentCollectionBuilder.cs
rename to src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Composing/ComponentComposer.cs b/src/Umbraco.Core/Composing/ComponentComposer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ComponentComposer.cs
rename to src/Umbraco.Core/Composing/ComponentComposer.cs
diff --git a/src/Umbraco.Abstractions/Composing/ComposeAfterAttribute.cs b/src/Umbraco.Core/Composing/ComposeAfterAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ComposeAfterAttribute.cs
rename to src/Umbraco.Core/Composing/ComposeAfterAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/ComposeBeforeAttribute.cs b/src/Umbraco.Core/Composing/ComposeBeforeAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ComposeBeforeAttribute.cs
rename to src/Umbraco.Core/Composing/ComposeBeforeAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/Composers.cs b/src/Umbraco.Core/Composing/Composers.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/Composers.cs
rename to src/Umbraco.Core/Composing/Composers.cs
diff --git a/src/Umbraco.Abstractions/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/Composition.cs
rename to src/Umbraco.Core/Composing/Composition.cs
diff --git a/src/Umbraco.Abstractions/Composing/CompositionExtensions.cs b/src/Umbraco.Core/Composing/CompositionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/CompositionExtensions.cs
rename to src/Umbraco.Core/Composing/CompositionExtensions.cs
diff --git a/src/Umbraco.Abstractions/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/Current.cs
rename to src/Umbraco.Core/Composing/Current.cs
diff --git a/src/Umbraco.Abstractions/Composing/DisableAttribute.cs b/src/Umbraco.Core/Composing/DisableAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/DisableAttribute.cs
rename to src/Umbraco.Core/Composing/DisableAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/DisableComposerAttribute.cs b/src/Umbraco.Core/Composing/DisableComposerAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/DisableComposerAttribute.cs
rename to src/Umbraco.Core/Composing/DisableComposerAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/EnableAttribute.cs b/src/Umbraco.Core/Composing/EnableAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/EnableAttribute.cs
rename to src/Umbraco.Core/Composing/EnableAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/EnableComposerAttribute.cs b/src/Umbraco.Core/Composing/EnableComposerAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/EnableComposerAttribute.cs
rename to src/Umbraco.Core/Composing/EnableComposerAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/HideFromTypeFinderAttribute.cs b/src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/HideFromTypeFinderAttribute.cs
rename to src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/IBuilderCollection.cs b/src/Umbraco.Core/Composing/IBuilderCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IBuilderCollection.cs
rename to src/Umbraco.Core/Composing/IBuilderCollection.cs
diff --git a/src/Umbraco.Abstractions/Composing/ICollectionBuilder.cs b/src/Umbraco.Core/Composing/ICollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ICollectionBuilder.cs
rename to src/Umbraco.Core/Composing/ICollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Composing/IComponent.cs b/src/Umbraco.Core/Composing/IComponent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IComponent.cs
rename to src/Umbraco.Core/Composing/IComponent.cs
diff --git a/src/Umbraco.Abstractions/Composing/IComposer.cs b/src/Umbraco.Core/Composing/IComposer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IComposer.cs
rename to src/Umbraco.Core/Composing/IComposer.cs
diff --git a/src/Umbraco.Abstractions/Composing/ICoreComposer.cs b/src/Umbraco.Core/Composing/ICoreComposer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ICoreComposer.cs
rename to src/Umbraco.Core/Composing/ICoreComposer.cs
diff --git a/src/Umbraco.Abstractions/Composing/IDiscoverable.cs b/src/Umbraco.Core/Composing/IDiscoverable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IDiscoverable.cs
rename to src/Umbraco.Core/Composing/IDiscoverable.cs
diff --git a/src/Umbraco.Abstractions/Composing/IFactory.cs b/src/Umbraco.Core/Composing/IFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IFactory.cs
rename to src/Umbraco.Core/Composing/IFactory.cs
diff --git a/src/Umbraco.Abstractions/Composing/IPublishedCacheComposer .cs b/src/Umbraco.Core/Composing/IPublishedCacheComposer .cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IPublishedCacheComposer .cs
rename to src/Umbraco.Core/Composing/IPublishedCacheComposer .cs
diff --git a/src/Umbraco.Abstractions/Composing/IRegister.cs b/src/Umbraco.Core/Composing/IRegister.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IRegister.cs
rename to src/Umbraco.Core/Composing/IRegister.cs
diff --git a/src/Umbraco.Abstractions/Composing/ITypeFinder.cs b/src/Umbraco.Core/Composing/ITypeFinder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/ITypeFinder.cs
rename to src/Umbraco.Core/Composing/ITypeFinder.cs
diff --git a/src/Umbraco.Abstractions/Composing/IUserComposer.cs b/src/Umbraco.Core/Composing/IUserComposer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/IUserComposer.cs
rename to src/Umbraco.Core/Composing/IUserComposer.cs
diff --git a/src/Umbraco.Abstractions/Composing/LazyCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/LazyCollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/Lifetime.cs b/src/Umbraco.Core/Composing/Lifetime.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/Lifetime.cs
rename to src/Umbraco.Core/Composing/Lifetime.cs
diff --git a/src/Umbraco.Abstractions/Composing/OrderedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/OrderedCollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/RuntimeLevelAttribute.cs b/src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/RuntimeLevelAttribute.cs
rename to src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/SetCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/SetCollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/TargetedServiceFactory.cs b/src/Umbraco.Core/Composing/TargetedServiceFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TargetedServiceFactory.cs
rename to src/Umbraco.Core/Composing/TargetedServiceFactory.cs
diff --git a/src/Umbraco.Abstractions/Composing/TypeCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/TypeCollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TypeCollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/TypeCollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TypeFinder.cs
rename to src/Umbraco.Core/Composing/TypeFinder.cs
diff --git a/src/Umbraco.Abstractions/Composing/TypeFinderExtensions.cs b/src/Umbraco.Core/Composing/TypeFinderExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TypeFinderExtensions.cs
rename to src/Umbraco.Core/Composing/TypeFinderExtensions.cs
diff --git a/src/Umbraco.Abstractions/Composing/TypeHelper.cs b/src/Umbraco.Core/Composing/TypeHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TypeHelper.cs
rename to src/Umbraco.Core/Composing/TypeHelper.cs
diff --git a/src/Umbraco.Abstractions/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/TypeLoader.cs
rename to src/Umbraco.Core/Composing/TypeLoader.cs
diff --git a/src/Umbraco.Abstractions/Composing/WeightAttribute.cs b/src/Umbraco.Core/Composing/WeightAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/WeightAttribute.cs
rename to src/Umbraco.Core/Composing/WeightAttribute.cs
diff --git a/src/Umbraco.Abstractions/Composing/WeightedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Composing/WeightedCollectionBuilderBase.cs
rename to src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
diff --git a/src/Umbraco.Abstractions/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CompositionExtensions.cs
rename to src/Umbraco.Core/CompositionExtensions.cs
diff --git a/src/Umbraco.Abstractions/CompositionExtensions_Uniques.cs b/src/Umbraco.Core/CompositionExtensions_Uniques.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CompositionExtensions_Uniques.cs
rename to src/Umbraco.Core/CompositionExtensions_Uniques.cs
diff --git a/src/Umbraco.Abstractions/ConfigConnectionStringExtensions.cs b/src/Umbraco.Core/ConfigConnectionStringExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ConfigConnectionStringExtensions.cs
rename to src/Umbraco.Core/ConfigConnectionStringExtensions.cs
diff --git a/src/Umbraco.Abstractions/Configuration/ConfigConnectionString.cs b/src/Umbraco.Core/Configuration/ConfigConnectionString.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/ConfigConnectionString.cs
rename to src/Umbraco.Core/Configuration/ConfigConnectionString.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Configs.cs b/src/Umbraco.Core/Configuration/Configs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Configs.cs
rename to src/Umbraco.Core/Configuration/Configs.cs
diff --git a/src/Umbraco.Abstractions/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/ConfigsExtensions.cs
rename to src/Umbraco.Core/Configuration/ConfigsExtensions.cs
diff --git a/src/Umbraco.Abstractions/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/GlobalSettingsExtensions.cs
rename to src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Grid/GridConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Grid/GridConfig.cs
rename to src/Umbraco.Core/Configuration/Grid/GridConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Grid/GridEditorsConfig.cs
rename to src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Grid/IGridConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Grid/IGridConfig.cs
rename to src/Umbraco.Core/Configuration/Grid/IGridConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Grid/IGridEditorConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Grid/IGridEditorConfig.cs
rename to src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/Grid/IGridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridEditorsConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/Grid/IGridEditorsConfig.cs
rename to src/Umbraco.Core/Configuration/Grid/IGridEditorsConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/AbstractConfigCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/AbstractConfigCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/AbstractConfigCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/AbstractConfigCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/AcceptableConfiguration.cs b/src/Umbraco.Core/Configuration/HealthChecks/AcceptableConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/AcceptableConfiguration.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/AcceptableConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/CompilationDebugCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/CompilationDebugCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/CompilationDebugCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/CompilationDebugCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationService.cs b/src/Umbraco.Core/Configuration/HealthChecks/ConfigurationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationService.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/ConfigurationService.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationServiceResult.cs b/src/Umbraco.Core/Configuration/HealthChecks/ConfigurationServiceResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationServiceResult.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/ConfigurationServiceResult.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/CustomErrorsCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/CustomErrorsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/CustomErrorsCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/CustomErrorsCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/HealthCheckNotificationVerbosity.cs b/src/Umbraco.Core/Configuration/HealthChecks/HealthCheckNotificationVerbosity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/HealthCheckNotificationVerbosity.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/HealthCheckNotificationVerbosity.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/IDisabledHealthCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/IDisabledHealthCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/IDisabledHealthCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/IDisabledHealthCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/IHealthCheckNotificationSettings.cs b/src/Umbraco.Core/Configuration/HealthChecks/IHealthCheckNotificationSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/IHealthCheckNotificationSettings.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/IHealthCheckNotificationSettings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/IHealthChecks.cs b/src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/IHealthChecks.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/INotificationMethod.cs b/src/Umbraco.Core/Configuration/HealthChecks/INotificationMethod.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/INotificationMethod.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/INotificationMethod.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/INotificationMethodSettings.cs b/src/Umbraco.Core/Configuration/HealthChecks/INotificationMethodSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/INotificationMethodSettings.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/INotificationMethodSettings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/MacroErrorsCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/MacroErrorsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/MacroErrorsCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/MacroErrorsCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/NotificationEmailCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/NotificationEmailCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/NotificationEmailCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/NotificationEmailCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/TraceCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/TraceCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/TraceCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/TraceCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
diff --git a/src/Umbraco.Abstractions/Configuration/HealthChecks/ValueComparisonType.cs b/src/Umbraco.Core/Configuration/HealthChecks/ValueComparisonType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/HealthChecks/ValueComparisonType.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/ValueComparisonType.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IConfigsFactory.cs b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IConfigsFactory.cs
rename to src/Umbraco.Core/Configuration/IConfigsFactory.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IConnectionStrings.cs b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IConnectionStrings.cs
rename to src/Umbraco.Core/Configuration/IConnectionStrings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/ICoreDebug.cs b/src/Umbraco.Core/Configuration/ICoreDebug.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/ICoreDebug.cs
rename to src/Umbraco.Core/Configuration/ICoreDebug.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IGlobalSettings.cs
rename to src/Umbraco.Core/Configuration/IGlobalSettings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IHostingSettings.cs b/src/Umbraco.Core/Configuration/IHostingSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IHostingSettings.cs
rename to src/Umbraco.Core/Configuration/IHostingSettings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IMemberPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/IMemberPasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IMemberPasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/IMemberPasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IPasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/ISmtpSettings.cs b/src/Umbraco.Core/Configuration/ISmtpSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/ISmtpSettings.cs
rename to src/Umbraco.Core/Configuration/ISmtpSettings.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IUmbracoConfigurationSection.cs b/src/Umbraco.Core/Configuration/IUmbracoConfigurationSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IUmbracoConfigurationSection.cs
rename to src/Umbraco.Core/Configuration/IUmbracoConfigurationSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IUmbracoVersion.cs b/src/Umbraco.Core/Configuration/IUmbracoVersion.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IUmbracoVersion.cs
rename to src/Umbraco.Core/Configuration/IUmbracoVersion.cs
diff --git a/src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/IUserPasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/IUserPasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/LocalTempStorage.cs b/src/Umbraco.Core/Configuration/LocalTempStorage.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/LocalTempStorage.cs
rename to src/Umbraco.Core/Configuration/LocalTempStorage.cs
diff --git a/src/Umbraco.Abstractions/Configuration/MemberPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/MemberPasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/PasswordConfiguration.cs b/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/PasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/PasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ContentSectionExtensions.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/ContentSectionExtensions.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IBackOfficeSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IBackOfficeSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IChar.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IChar.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IChar.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IChar.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IContentErrorPage.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentErrorPage.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IContentErrorPage.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IContentErrorPage.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IContentSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IImagingAutoFillUploadField.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingAutoFillUploadField.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IImagingAutoFillUploadField.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IImagingAutoFillUploadField.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IKeepAliveSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IKeepAliveSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ILoggingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/ILoggingSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IPasswordConfigurationSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IPasswordConfigurationSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IPasswordConfigurationSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IPasswordConfigurationSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IRequestHandlerSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IRequestHandlerSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ISecuritySection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/ISecuritySection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITourSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITourSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ITourSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITypeFinderConfig.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITypeFinderConfig.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/IWebRoutingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoSettings/IWebRoutingSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UmbracoVersion.cs
rename to src/Umbraco.Core/Configuration/UmbracoVersion.cs
diff --git a/src/Umbraco.Abstractions/Configuration/UserPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Configuration/UserPasswordConfiguration.cs
rename to src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs
diff --git a/src/Umbraco.Abstractions/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-AppSettings.cs
rename to src/Umbraco.Core/Constants-AppSettings.cs
diff --git a/src/Umbraco.Abstractions/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Applications.cs
rename to src/Umbraco.Core/Constants-Applications.cs
diff --git a/src/Umbraco.Abstractions/Constants-Composing.cs b/src/Umbraco.Core/Constants-Composing.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Composing.cs
rename to src/Umbraco.Core/Constants-Composing.cs
diff --git a/src/Umbraco.Abstractions/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Conventions.cs
rename to src/Umbraco.Core/Constants-Conventions.cs
diff --git a/src/Umbraco.Abstractions/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-DataTypes.cs
rename to src/Umbraco.Core/Constants-DataTypes.cs
diff --git a/src/Umbraco.Abstractions/Constants-DatabaseProviders.cs b/src/Umbraco.Core/Constants-DatabaseProviders.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-DatabaseProviders.cs
rename to src/Umbraco.Core/Constants-DatabaseProviders.cs
diff --git a/src/Umbraco.Abstractions/Constants-DeploySelector.cs b/src/Umbraco.Core/Constants-DeploySelector.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-DeploySelector.cs
rename to src/Umbraco.Core/Constants-DeploySelector.cs
diff --git a/src/Umbraco.Abstractions/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Icons.cs
rename to src/Umbraco.Core/Constants-Icons.cs
diff --git a/src/Umbraco.Abstractions/Constants-Indexes.cs b/src/Umbraco.Core/Constants-Indexes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Indexes.cs
rename to src/Umbraco.Core/Constants-Indexes.cs
diff --git a/src/Umbraco.Abstractions/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-ObjectTypes.cs
rename to src/Umbraco.Core/Constants-ObjectTypes.cs
diff --git a/src/Umbraco.Abstractions/Constants-PackageRepository.cs b/src/Umbraco.Core/Constants-PackageRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-PackageRepository.cs
rename to src/Umbraco.Core/Constants-PackageRepository.cs
diff --git a/src/Umbraco.Abstractions/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-PropertyEditors.cs
rename to src/Umbraco.Core/Constants-PropertyEditors.cs
diff --git a/src/Umbraco.Abstractions/Constants-PropertyTypeGroups.cs b/src/Umbraco.Core/Constants-PropertyTypeGroups.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-PropertyTypeGroups.cs
rename to src/Umbraco.Core/Constants-PropertyTypeGroups.cs
diff --git a/src/Umbraco.Abstractions/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Security.cs
rename to src/Umbraco.Core/Constants-Security.cs
diff --git a/src/Umbraco.Abstractions/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-System.cs
rename to src/Umbraco.Core/Constants-System.cs
diff --git a/src/Umbraco.Abstractions/Constants-SystemDirectories.cs b/src/Umbraco.Core/Constants-SystemDirectories.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-SystemDirectories.cs
rename to src/Umbraco.Core/Constants-SystemDirectories.cs
diff --git a/src/Umbraco.Abstractions/Constants-UdiEntityType.cs b/src/Umbraco.Core/Constants-UdiEntityType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-UdiEntityType.cs
rename to src/Umbraco.Core/Constants-UdiEntityType.cs
diff --git a/src/Umbraco.Abstractions/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Constants-Web.cs
rename to src/Umbraco.Core/Constants-Web.cs
diff --git a/src/Umbraco.Abstractions/ContentApps/ContentAppFactoryCollection.cs b/src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentApps/ContentAppFactoryCollection.cs
rename to src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs
diff --git a/src/Umbraco.Abstractions/ContentApps/ContentAppFactoryCollectionBuilder.cs b/src/Umbraco.Core/ContentApps/ContentAppFactoryCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentApps/ContentAppFactoryCollectionBuilder.cs
rename to src/Umbraco.Core/ContentApps/ContentAppFactoryCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/ContentApps/ContentEditorContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentApps/ContentEditorContentAppFactory.cs
rename to src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs
diff --git a/src/Umbraco.Abstractions/ContentApps/ContentInfoContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentApps/ContentInfoContentAppFactory.cs
rename to src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs
diff --git a/src/Umbraco.Abstractions/ContentApps/ListViewContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentApps/ListViewContentAppFactory.cs
rename to src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs
diff --git a/src/Umbraco.Abstractions/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentExtensions.cs
rename to src/Umbraco.Core/ContentExtensions.cs
diff --git a/src/Umbraco.Abstractions/ContentVariationExtensions.cs b/src/Umbraco.Core/ContentVariationExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ContentVariationExtensions.cs
rename to src/Umbraco.Core/ContentVariationExtensions.cs
diff --git a/src/Umbraco.Abstractions/Cookie/ICookieManager.cs b/src/Umbraco.Core/Cookie/ICookieManager.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Cookie/ICookieManager.cs
rename to src/Umbraco.Core/Cookie/ICookieManager.cs
diff --git a/src/Umbraco.Abstractions/CustomBooleanTypeConverter.cs b/src/Umbraco.Core/CustomBooleanTypeConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/CustomBooleanTypeConverter.cs
rename to src/Umbraco.Core/CustomBooleanTypeConverter.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/AccessRule.cs b/src/Umbraco.Core/Dashboards/AccessRule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/AccessRule.cs
rename to src/Umbraco.Core/Dashboards/AccessRule.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/AccessRuleType.cs b/src/Umbraco.Core/Dashboards/AccessRuleType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/AccessRuleType.cs
rename to src/Umbraco.Core/Dashboards/AccessRuleType.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/DashboardCollection.cs b/src/Umbraco.Core/Dashboards/DashboardCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/DashboardCollection.cs
rename to src/Umbraco.Core/Dashboards/DashboardCollection.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/DashboardCollectionBuilder.cs
rename to src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/DashboardSlim.cs b/src/Umbraco.Core/Dashboards/DashboardSlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/DashboardSlim.cs
rename to src/Umbraco.Core/Dashboards/DashboardSlim.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/IAccessRule.cs b/src/Umbraco.Core/Dashboards/IAccessRule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/IAccessRule.cs
rename to src/Umbraco.Core/Dashboards/IAccessRule.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/IDashboard.cs b/src/Umbraco.Core/Dashboards/IDashboard.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/IDashboard.cs
rename to src/Umbraco.Core/Dashboards/IDashboard.cs
diff --git a/src/Umbraco.Abstractions/Dashboards/IDashboardSlim.cs b/src/Umbraco.Core/Dashboards/IDashboardSlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dashboards/IDashboardSlim.cs
rename to src/Umbraco.Core/Dashboards/IDashboardSlim.cs
diff --git a/src/Umbraco.Abstractions/DataTableExtensions.cs b/src/Umbraco.Core/DataTableExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DataTableExtensions.cs
rename to src/Umbraco.Core/DataTableExtensions.cs
diff --git a/src/Umbraco.Abstractions/DateTimeExtensions.cs b/src/Umbraco.Core/DateTimeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DateTimeExtensions.cs
rename to src/Umbraco.Core/DateTimeExtensions.cs
diff --git a/src/Umbraco.Abstractions/DecimalExtensions.cs b/src/Umbraco.Core/DecimalExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DecimalExtensions.cs
rename to src/Umbraco.Core/DecimalExtensions.cs
diff --git a/src/Umbraco.Abstractions/DelegateEqualityComparer.cs b/src/Umbraco.Core/DelegateEqualityComparer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DelegateEqualityComparer.cs
rename to src/Umbraco.Core/DelegateEqualityComparer.cs
diff --git a/src/Umbraco.Abstractions/DelegateExtensions.cs b/src/Umbraco.Core/DelegateExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DelegateExtensions.cs
rename to src/Umbraco.Core/DelegateExtensions.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactBase.cs b/src/Umbraco.Core/Deploy/ArtifactBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactBase.cs
rename to src/Umbraco.Core/Deploy/ArtifactBase.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactDependency.cs b/src/Umbraco.Core/Deploy/ArtifactDependency.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactDependency.cs
rename to src/Umbraco.Core/Deploy/ArtifactDependency.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactDependencyCollection.cs b/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactDependencyCollection.cs
rename to src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactDependencyMode.cs b/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactDependencyMode.cs
rename to src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactDeployState.cs b/src/Umbraco.Core/Deploy/ArtifactDeployState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactDeployState.cs
rename to src/Umbraco.Core/Deploy/ArtifactDeployState.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs b/src/Umbraco.Core/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
rename to src/Umbraco.Core/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ArtifactSignature.cs b/src/Umbraco.Core/Deploy/ArtifactSignature.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ArtifactSignature.cs
rename to src/Umbraco.Core/Deploy/ArtifactSignature.cs
diff --git a/src/Umbraco.Abstractions/Deploy/Difference.cs b/src/Umbraco.Core/Deploy/Difference.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/Difference.cs
rename to src/Umbraco.Core/Deploy/Difference.cs
diff --git a/src/Umbraco.Abstractions/Deploy/Direction.cs b/src/Umbraco.Core/Deploy/Direction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/Direction.cs
rename to src/Umbraco.Core/Deploy/Direction.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IArtifact.cs b/src/Umbraco.Core/Deploy/IArtifact.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IArtifact.cs
rename to src/Umbraco.Core/Deploy/IArtifact.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IArtifactSignature.cs b/src/Umbraco.Core/Deploy/IArtifactSignature.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IArtifactSignature.cs
rename to src/Umbraco.Core/Deploy/IArtifactSignature.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IDataTypeConfigurationConnector.cs b/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IDataTypeConfigurationConnector.cs
rename to src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IDeployContext.cs b/src/Umbraco.Core/Deploy/IDeployContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IDeployContext.cs
rename to src/Umbraco.Core/Deploy/IDeployContext.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IFileSource.cs b/src/Umbraco.Core/Deploy/IFileSource.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IFileSource.cs
rename to src/Umbraco.Core/Deploy/IFileSource.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IFileType.cs b/src/Umbraco.Core/Deploy/IFileType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IFileType.cs
rename to src/Umbraco.Core/Deploy/IFileType.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IFileTypeCollection.cs b/src/Umbraco.Core/Deploy/IFileTypeCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IFileTypeCollection.cs
rename to src/Umbraco.Core/Deploy/IFileTypeCollection.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IImageSourceParser.cs b/src/Umbraco.Core/Deploy/IImageSourceParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IImageSourceParser.cs
rename to src/Umbraco.Core/Deploy/IImageSourceParser.cs
diff --git a/src/Umbraco.Abstractions/Deploy/ILocalLinkParser.cs b/src/Umbraco.Core/Deploy/ILocalLinkParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/ILocalLinkParser.cs
rename to src/Umbraco.Core/Deploy/ILocalLinkParser.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IMacroParser.cs b/src/Umbraco.Core/Deploy/IMacroParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IMacroParser.cs
rename to src/Umbraco.Core/Deploy/IMacroParser.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IServiceConnector.cs b/src/Umbraco.Core/Deploy/IServiceConnector.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IServiceConnector.cs
rename to src/Umbraco.Core/Deploy/IServiceConnector.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IUniqueIdentifyingServiceConnector.cs b/src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IUniqueIdentifyingServiceConnector.cs
rename to src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs
diff --git a/src/Umbraco.Abstractions/Deploy/IValueConnector.cs b/src/Umbraco.Core/Deploy/IValueConnector.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Deploy/IValueConnector.cs
rename to src/Umbraco.Core/Deploy/IValueConnector.cs
diff --git a/src/Umbraco.Abstractions/Dictionary/ICultureDictionary.cs b/src/Umbraco.Core/Dictionary/ICultureDictionary.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dictionary/ICultureDictionary.cs
rename to src/Umbraco.Core/Dictionary/ICultureDictionary.cs
diff --git a/src/Umbraco.Abstractions/Dictionary/ICultureDictionaryFactory.cs b/src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Dictionary/ICultureDictionaryFactory.cs
rename to src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs
diff --git a/src/Umbraco.Abstractions/DictionaryExtensions.cs b/src/Umbraco.Core/DictionaryExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DictionaryExtensions.cs
rename to src/Umbraco.Core/DictionaryExtensions.cs
diff --git a/src/Umbraco.Abstractions/Direction.cs b/src/Umbraco.Core/Direction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Direction.cs
rename to src/Umbraco.Core/Direction.cs
diff --git a/src/Umbraco.Abstractions/DisposableObjectSlim.cs b/src/Umbraco.Core/DisposableObjectSlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/DisposableObjectSlim.cs
rename to src/Umbraco.Core/DisposableObjectSlim.cs
diff --git a/src/Umbraco.Abstractions/EmailSender.cs b/src/Umbraco.Core/EmailSender.cs
similarity index 100%
rename from src/Umbraco.Abstractions/EmailSender.cs
rename to src/Umbraco.Core/EmailSender.cs
diff --git a/src/Umbraco.Abstractions/Enum.cs b/src/Umbraco.Core/Enum.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Enum.cs
rename to src/Umbraco.Core/Enum.cs
diff --git a/src/Umbraco.Abstractions/EnumExtensions.cs b/src/Umbraco.Core/EnumExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/EnumExtensions.cs
rename to src/Umbraco.Core/EnumExtensions.cs
diff --git a/src/Umbraco.Abstractions/EnumerableExtensions.cs b/src/Umbraco.Core/EnumerableExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/EnumerableExtensions.cs
rename to src/Umbraco.Core/EnumerableExtensions.cs
diff --git a/src/Umbraco.Abstractions/Events/CancellableEnumerableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/CancellableEnumerableObjectEventArgs.cs
rename to src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/CancellableEventArgs.cs
rename to src/Umbraco.Core/Events/CancellableEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/CancellableObjectEventArgs.cs
rename to src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/CancellableObjectEventArgsOfTEventObject.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/CancellableObjectEventArgsOfTEventObject.cs
rename to src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
diff --git a/src/Umbraco.Abstractions/Events/ContentCacheEventArgs.cs b/src/Umbraco.Core/Events/ContentCacheEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ContentCacheEventArgs.cs
rename to src/Umbraco.Core/Events/ContentCacheEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/ContentPublishedEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ContentPublishedEventArgs.cs
rename to src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/ContentPublishingEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ContentPublishingEventArgs.cs
rename to src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/ContentSavedEventArgs.cs b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ContentSavedEventArgs.cs
rename to src/Umbraco.Core/Events/ContentSavedEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/ContentSavingEventArgs.cs b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ContentSavingEventArgs.cs
rename to src/Umbraco.Core/Events/ContentSavingEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/CopyEventArgs.cs b/src/Umbraco.Core/Events/CopyEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/CopyEventArgs.cs
rename to src/Umbraco.Core/Events/CopyEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/DatabaseCreationEventArgs.cs b/src/Umbraco.Core/Events/DatabaseCreationEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/DatabaseCreationEventArgs.cs
rename to src/Umbraco.Core/Events/DatabaseCreationEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/DeleteEventArgs.cs b/src/Umbraco.Core/Events/DeleteEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/DeleteEventArgs.cs
rename to src/Umbraco.Core/Events/DeleteEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/DeleteRevisionsEventArgs.cs b/src/Umbraco.Core/Events/DeleteRevisionsEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/DeleteRevisionsEventArgs.cs
rename to src/Umbraco.Core/Events/DeleteRevisionsEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/EventDefinition.cs b/src/Umbraco.Core/Events/EventDefinition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventDefinition.cs
rename to src/Umbraco.Core/Events/EventDefinition.cs
diff --git a/src/Umbraco.Abstractions/Events/EventDefinitionBase.cs b/src/Umbraco.Core/Events/EventDefinitionBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventDefinitionBase.cs
rename to src/Umbraco.Core/Events/EventDefinitionBase.cs
diff --git a/src/Umbraco.Abstractions/Events/EventDefinitionFilter.cs b/src/Umbraco.Core/Events/EventDefinitionFilter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventDefinitionFilter.cs
rename to src/Umbraco.Core/Events/EventDefinitionFilter.cs
diff --git a/src/Umbraco.Abstractions/Events/EventExtensions.cs b/src/Umbraco.Core/Events/EventExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventExtensions.cs
rename to src/Umbraco.Core/Events/EventExtensions.cs
diff --git a/src/Umbraco.Abstractions/Events/EventMessage.cs b/src/Umbraco.Core/Events/EventMessage.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventMessage.cs
rename to src/Umbraco.Core/Events/EventMessage.cs
diff --git a/src/Umbraco.Abstractions/Events/EventMessageType.cs b/src/Umbraco.Core/Events/EventMessageType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventMessageType.cs
rename to src/Umbraco.Core/Events/EventMessageType.cs
diff --git a/src/Umbraco.Abstractions/Events/EventMessages.cs b/src/Umbraco.Core/Events/EventMessages.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventMessages.cs
rename to src/Umbraco.Core/Events/EventMessages.cs
diff --git a/src/Umbraco.Abstractions/Events/EventNameExtractor.cs b/src/Umbraco.Core/Events/EventNameExtractor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventNameExtractor.cs
rename to src/Umbraco.Core/Events/EventNameExtractor.cs
diff --git a/src/Umbraco.Abstractions/Events/EventNameExtractorError.cs b/src/Umbraco.Core/Events/EventNameExtractorError.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventNameExtractorError.cs
rename to src/Umbraco.Core/Events/EventNameExtractorError.cs
diff --git a/src/Umbraco.Abstractions/Events/EventNameExtractorResult.cs b/src/Umbraco.Core/Events/EventNameExtractorResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/EventNameExtractorResult.cs
rename to src/Umbraco.Core/Events/EventNameExtractorResult.cs
diff --git a/src/Umbraco.Abstractions/Events/ExportedMemberEventArgs.cs b/src/Umbraco.Core/Events/ExportedMemberEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ExportedMemberEventArgs.cs
rename to src/Umbraco.Core/Events/ExportedMemberEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/IDeletingMediaFilesEventArgs.cs b/src/Umbraco.Core/Events/IDeletingMediaFilesEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/IDeletingMediaFilesEventArgs.cs
rename to src/Umbraco.Core/Events/IDeletingMediaFilesEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/IEventDefinition.cs b/src/Umbraco.Core/Events/IEventDefinition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/IEventDefinition.cs
rename to src/Umbraco.Core/Events/IEventDefinition.cs
diff --git a/src/Umbraco.Abstractions/Events/IEventDispatcher.cs b/src/Umbraco.Core/Events/IEventDispatcher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/IEventDispatcher.cs
rename to src/Umbraco.Core/Events/IEventDispatcher.cs
diff --git a/src/Umbraco.Abstractions/Events/IEventMessagesAccessor.cs b/src/Umbraco.Core/Events/IEventMessagesAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/IEventMessagesAccessor.cs
rename to src/Umbraco.Core/Events/IEventMessagesAccessor.cs
diff --git a/src/Umbraco.Abstractions/Events/IEventMessagesFactory.cs b/src/Umbraco.Core/Events/IEventMessagesFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/IEventMessagesFactory.cs
rename to src/Umbraco.Core/Events/IEventMessagesFactory.cs
diff --git a/src/Umbraco.Abstractions/Events/ImportPackageEventArgs.cs b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/ImportPackageEventArgs.cs
rename to src/Umbraco.Core/Events/ImportPackageEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/MacroErrorEventArgs.cs b/src/Umbraco.Core/Events/MacroErrorEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/MacroErrorEventArgs.cs
rename to src/Umbraco.Core/Events/MacroErrorEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/MoveEventArgs.cs
rename to src/Umbraco.Core/Events/MoveEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/MoveEventInfo.cs b/src/Umbraco.Core/Events/MoveEventInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/MoveEventInfo.cs
rename to src/Umbraco.Core/Events/MoveEventInfo.cs
diff --git a/src/Umbraco.Abstractions/Events/NewEventArgs.cs b/src/Umbraco.Core/Events/NewEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/NewEventArgs.cs
rename to src/Umbraco.Core/Events/NewEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/PassThroughEventDispatcher.cs b/src/Umbraco.Core/Events/PassThroughEventDispatcher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/PassThroughEventDispatcher.cs
rename to src/Umbraco.Core/Events/PassThroughEventDispatcher.cs
diff --git a/src/Umbraco.Abstractions/Events/PublishEventArgs.cs b/src/Umbraco.Core/Events/PublishEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/PublishEventArgs.cs
rename to src/Umbraco.Core/Events/PublishEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/QueuingEventDispatcherBase.cs b/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/QueuingEventDispatcherBase.cs
rename to src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs
diff --git a/src/Umbraco.Abstractions/Events/RecycleBinEventArgs.cs b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/RecycleBinEventArgs.cs
rename to src/Umbraco.Core/Events/RecycleBinEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/RefreshContentEventArgs.cs b/src/Umbraco.Core/Events/RefreshContentEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/RefreshContentEventArgs.cs
rename to src/Umbraco.Core/Events/RefreshContentEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/RolesEventArgs.cs b/src/Umbraco.Core/Events/RolesEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/RolesEventArgs.cs
rename to src/Umbraco.Core/Events/RolesEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/RollbackEventArgs.cs b/src/Umbraco.Core/Events/RollbackEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/RollbackEventArgs.cs
rename to src/Umbraco.Core/Events/RollbackEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/SaveEventArgs.cs b/src/Umbraco.Core/Events/SaveEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/SaveEventArgs.cs
rename to src/Umbraco.Core/Events/SaveEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/SendEmailEventArgs.cs b/src/Umbraco.Core/Events/SendEmailEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/SendEmailEventArgs.cs
rename to src/Umbraco.Core/Events/SendEmailEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/SendToPublishEventArgs.cs b/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/SendToPublishEventArgs.cs
rename to src/Umbraco.Core/Events/SendToPublishEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/SupersedeEventAttribute.cs b/src/Umbraco.Core/Events/SupersedeEventAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/SupersedeEventAttribute.cs
rename to src/Umbraco.Core/Events/SupersedeEventAttribute.cs
diff --git a/src/Umbraco.Abstractions/Events/TransientEventMessagesFactory.cs b/src/Umbraco.Core/Events/TransientEventMessagesFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/TransientEventMessagesFactory.cs
rename to src/Umbraco.Core/Events/TransientEventMessagesFactory.cs
diff --git a/src/Umbraco.Abstractions/Events/TypedEventHandler.cs b/src/Umbraco.Core/Events/TypedEventHandler.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/TypedEventHandler.cs
rename to src/Umbraco.Core/Events/TypedEventHandler.cs
diff --git a/src/Umbraco.Abstractions/Events/UninstallPackageEventArgs.cs b/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/UninstallPackageEventArgs.cs
rename to src/Umbraco.Core/Events/UninstallPackageEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/UserGroupWithUsers.cs b/src/Umbraco.Core/Events/UserGroupWithUsers.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Events/UserGroupWithUsers.cs
rename to src/Umbraco.Core/Events/UserGroupWithUsers.cs
diff --git a/src/Umbraco.Abstractions/Exceptions/AuthorizationException.cs b/src/Umbraco.Core/Exceptions/AuthorizationException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Exceptions/AuthorizationException.cs
rename to src/Umbraco.Core/Exceptions/AuthorizationException.cs
diff --git a/src/Umbraco.Abstractions/Exceptions/BootFailedException.cs b/src/Umbraco.Core/Exceptions/BootFailedException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Exceptions/BootFailedException.cs
rename to src/Umbraco.Core/Exceptions/BootFailedException.cs
diff --git a/src/Umbraco.Abstractions/Exceptions/DataOperationException.cs b/src/Umbraco.Core/Exceptions/DataOperationException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
rename to src/Umbraco.Core/Exceptions/DataOperationException.cs
diff --git a/src/Umbraco.Abstractions/Exceptions/InvalidCompositionException.cs b/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Exceptions/InvalidCompositionException.cs
rename to src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
diff --git a/src/Umbraco.Abstractions/Exceptions/PanicException.cs b/src/Umbraco.Core/Exceptions/PanicException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Exceptions/PanicException.cs
rename to src/Umbraco.Core/Exceptions/PanicException.cs
diff --git a/src/Umbraco.Abstractions/ExpressionExtensions.cs b/src/Umbraco.Core/ExpressionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ExpressionExtensions.cs
rename to src/Umbraco.Core/ExpressionExtensions.cs
diff --git a/src/Umbraco.Abstractions/ExpressionHelper.cs b/src/Umbraco.Core/ExpressionHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ExpressionHelper.cs
rename to src/Umbraco.Core/ExpressionHelper.cs
diff --git a/src/Umbraco.Abstractions/FactoryExtensions.cs b/src/Umbraco.Core/FactoryExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/FactoryExtensions.cs
rename to src/Umbraco.Core/FactoryExtensions.cs
diff --git a/src/Umbraco.Abstractions/GuidUdi.cs b/src/Umbraco.Core/GuidUdi.cs
similarity index 100%
rename from src/Umbraco.Abstractions/GuidUdi.cs
rename to src/Umbraco.Core/GuidUdi.cs
diff --git a/src/Umbraco.Abstractions/GuidUtils.cs b/src/Umbraco.Core/GuidUtils.cs
similarity index 100%
rename from src/Umbraco.Abstractions/GuidUtils.cs
rename to src/Umbraco.Core/GuidUtils.cs
diff --git a/src/Umbraco.Abstractions/HashCodeCombiner.cs b/src/Umbraco.Core/HashCodeCombiner.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HashCodeCombiner.cs
rename to src/Umbraco.Core/HashCodeCombiner.cs
diff --git a/src/Umbraco.Abstractions/HashCodeHelper.cs b/src/Umbraco.Core/HashCodeHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HashCodeHelper.cs
rename to src/Umbraco.Core/HashCodeHelper.cs
diff --git a/src/Umbraco.Abstractions/HashGenerator.cs b/src/Umbraco.Core/HashGenerator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HashGenerator.cs
rename to src/Umbraco.Core/HashGenerator.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/ClickJackingCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/ClickJackingCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/ClickJackingCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/ClickJackingCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/HstsCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/HstsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/HstsCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/HstsCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/HttpsCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/HttpsCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/HttpsCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/HttpsCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/NoSniffCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/NoSniffCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/NoSniffCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/NoSniffCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Security/XssProtectionCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Security/XssProtectionCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Security/XssProtectionCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Security/XssProtectionCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/Checks/Services/SmtpCheck.cs b/src/Umbraco.Core/HealthCheck/Checks/Services/SmtpCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/Checks/Services/SmtpCheck.cs
rename to src/Umbraco.Core/HealthCheck/Checks/Services/SmtpCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheck.cs b/src/Umbraco.Core/HealthCheck/HealthCheck.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheck.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheck.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckAction.cs b/src/Umbraco.Core/HealthCheck/HealthCheckAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckAction.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckAction.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckAttribute.cs b/src/Umbraco.Core/HealthCheck/HealthCheckAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckAttribute.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckAttribute.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckCollection.cs b/src/Umbraco.Core/HealthCheck/HealthCheckCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckCollection.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckCollection.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckGroup.cs b/src/Umbraco.Core/HealthCheck/HealthCheckGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckGroup.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckGroup.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckNotificationMethodAttribute.cs b/src/Umbraco.Core/HealthCheck/HealthCheckNotificationMethodAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckNotificationMethodAttribute.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckNotificationMethodAttribute.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HealthCheckStatus.cs b/src/Umbraco.Core/HealthCheck/HealthCheckStatus.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HealthCheckStatus.cs
rename to src/Umbraco.Core/HealthCheck/HealthCheckStatus.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/HeathCheckCollectionBuilder.cs b/src/Umbraco.Core/HealthCheck/HeathCheckCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/HeathCheckCollectionBuilder.cs
rename to src/Umbraco.Core/HealthCheck/HeathCheckCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/HealthCheck/StatusResultType.cs b/src/Umbraco.Core/HealthCheck/StatusResultType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HealthCheck/StatusResultType.cs
rename to src/Umbraco.Core/HealthCheck/StatusResultType.cs
diff --git a/src/Umbraco.Abstractions/HexEncoder.cs b/src/Umbraco.Core/HexEncoder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HexEncoder.cs
rename to src/Umbraco.Core/HexEncoder.cs
diff --git a/src/Umbraco.Abstractions/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Hosting/IHostingEnvironment.cs
rename to src/Umbraco.Core/Hosting/IHostingEnvironment.cs
diff --git a/src/Umbraco.Abstractions/HybridAccessorBase.cs b/src/Umbraco.Core/HybridAccessorBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HybridAccessorBase.cs
rename to src/Umbraco.Core/HybridAccessorBase.cs
diff --git a/src/Umbraco.Abstractions/HybridEventMessagesAccessor.cs b/src/Umbraco.Core/HybridEventMessagesAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/HybridEventMessagesAccessor.cs
rename to src/Umbraco.Core/HybridEventMessagesAccessor.cs
diff --git a/src/Umbraco.Abstractions/IBackOfficeInfo.cs b/src/Umbraco.Core/IBackOfficeInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IBackOfficeInfo.cs
rename to src/Umbraco.Core/IBackOfficeInfo.cs
diff --git a/src/Umbraco.Abstractions/ICompletable.cs b/src/Umbraco.Core/ICompletable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ICompletable.cs
rename to src/Umbraco.Core/ICompletable.cs
diff --git a/src/Umbraco.Abstractions/IDisposeOnRequestEnd.cs b/src/Umbraco.Core/IDisposeOnRequestEnd.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IDisposeOnRequestEnd.cs
rename to src/Umbraco.Core/IDisposeOnRequestEnd.cs
diff --git a/src/Umbraco.Abstractions/IEmailSender.cs b/src/Umbraco.Core/IEmailSender.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IEmailSender.cs
rename to src/Umbraco.Core/IEmailSender.cs
diff --git a/src/Umbraco.Abstractions/IO/FileSystemExtensions.cs b/src/Umbraco.Core/IO/FileSystemExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/FileSystemExtensions.cs
rename to src/Umbraco.Core/IO/FileSystemExtensions.cs
diff --git a/src/Umbraco.Abstractions/IO/FileSystemWrapper.cs b/src/Umbraco.Core/IO/FileSystemWrapper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/FileSystemWrapper.cs
rename to src/Umbraco.Core/IO/FileSystemWrapper.cs
diff --git a/src/Umbraco.Abstractions/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/FileSystems.cs
rename to src/Umbraco.Core/IO/FileSystems.cs
diff --git a/src/Umbraco.Abstractions/IO/IFileSystem.cs b/src/Umbraco.Core/IO/IFileSystem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IFileSystem.cs
rename to src/Umbraco.Core/IO/IFileSystem.cs
diff --git a/src/Umbraco.Abstractions/IO/IFileSystems.cs b/src/Umbraco.Core/IO/IFileSystems.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IFileSystems.cs
rename to src/Umbraco.Core/IO/IFileSystems.cs
diff --git a/src/Umbraco.Abstractions/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IIOHelper.cs
rename to src/Umbraco.Core/IO/IIOHelper.cs
diff --git a/src/Umbraco.Abstractions/IO/IMediaFileSystem.cs b/src/Umbraco.Core/IO/IMediaFileSystem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IMediaFileSystem.cs
rename to src/Umbraco.Core/IO/IMediaFileSystem.cs
diff --git a/src/Umbraco.Abstractions/IO/IMediaPathScheme.cs b/src/Umbraco.Core/IO/IMediaPathScheme.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IMediaPathScheme.cs
rename to src/Umbraco.Core/IO/IMediaPathScheme.cs
diff --git a/src/Umbraco.Abstractions/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/IOHelper.cs
rename to src/Umbraco.Core/IO/IOHelper.cs
diff --git a/src/Umbraco.Abstractions/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/MediaFileSystem.cs
rename to src/Umbraco.Core/IO/MediaFileSystem.cs
diff --git a/src/Umbraco.Abstractions/IO/MediaPathSchemes/CombinedGuidsMediaPathScheme.cs b/src/Umbraco.Core/IO/MediaPathSchemes/CombinedGuidsMediaPathScheme.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/MediaPathSchemes/CombinedGuidsMediaPathScheme.cs
rename to src/Umbraco.Core/IO/MediaPathSchemes/CombinedGuidsMediaPathScheme.cs
diff --git a/src/Umbraco.Abstractions/IO/MediaPathSchemes/OriginalMediaPathScheme.cs b/src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
rename to src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
diff --git a/src/Umbraco.Abstractions/IO/MediaPathSchemes/TwoGuidsMediaPathScheme.cs b/src/Umbraco.Core/IO/MediaPathSchemes/TwoGuidsMediaPathScheme.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/MediaPathSchemes/TwoGuidsMediaPathScheme.cs
rename to src/Umbraco.Core/IO/MediaPathSchemes/TwoGuidsMediaPathScheme.cs
diff --git a/src/Umbraco.Abstractions/IO/MediaPathSchemes/UniqueMediaPathScheme.cs b/src/Umbraco.Core/IO/MediaPathSchemes/UniqueMediaPathScheme.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/MediaPathSchemes/UniqueMediaPathScheme.cs
rename to src/Umbraco.Core/IO/MediaPathSchemes/UniqueMediaPathScheme.cs
diff --git a/src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
rename to src/Umbraco.Core/IO/PhysicalFileSystem.cs
diff --git a/src/Umbraco.Abstractions/IO/ShadowFileSystem.cs b/src/Umbraco.Core/IO/ShadowFileSystem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/ShadowFileSystem.cs
rename to src/Umbraco.Core/IO/ShadowFileSystem.cs
diff --git a/src/Umbraco.Abstractions/IO/ShadowFileSystems.cs b/src/Umbraco.Core/IO/ShadowFileSystems.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/ShadowFileSystems.cs
rename to src/Umbraco.Core/IO/ShadowFileSystems.cs
diff --git a/src/Umbraco.Abstractions/IO/ShadowWrapper.cs b/src/Umbraco.Core/IO/ShadowWrapper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/ShadowWrapper.cs
rename to src/Umbraco.Core/IO/ShadowWrapper.cs
diff --git a/src/Umbraco.Abstractions/IO/SupportingFileSystems.cs b/src/Umbraco.Core/IO/SupportingFileSystems.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/SupportingFileSystems.cs
rename to src/Umbraco.Core/IO/SupportingFileSystems.cs
diff --git a/src/Umbraco.Abstractions/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/SystemFiles.cs
rename to src/Umbraco.Core/IO/SystemFiles.cs
diff --git a/src/Umbraco.Abstractions/IO/ViewHelper.cs b/src/Umbraco.Core/IO/ViewHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IO/ViewHelper.cs
rename to src/Umbraco.Core/IO/ViewHelper.cs
diff --git a/src/Umbraco.Abstractions/IRegisteredObject.cs b/src/Umbraco.Core/IRegisteredObject.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IRegisteredObject.cs
rename to src/Umbraco.Core/IRegisteredObject.cs
diff --git a/src/Umbraco.Abstractions/ITagQuery.cs b/src/Umbraco.Core/ITagQuery.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ITagQuery.cs
rename to src/Umbraco.Core/ITagQuery.cs
diff --git a/src/Umbraco.Abstractions/IUmbracoContext.cs b/src/Umbraco.Core/IUmbracoContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IUmbracoContext.cs
rename to src/Umbraco.Core/IUmbracoContext.cs
diff --git a/src/Umbraco.Abstractions/IUmbracoContextAccessor.cs b/src/Umbraco.Core/IUmbracoContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IUmbracoContextAccessor.cs
rename to src/Umbraco.Core/IUmbracoContextAccessor.cs
diff --git a/src/Umbraco.Abstractions/IfExtensions.cs b/src/Umbraco.Core/IfExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IfExtensions.cs
rename to src/Umbraco.Core/IfExtensions.cs
diff --git a/src/Umbraco.Abstractions/Install/IFilePermissionHelper.cs b/src/Umbraco.Core/Install/IFilePermissionHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Install/IFilePermissionHelper.cs
rename to src/Umbraco.Core/Install/IFilePermissionHelper.cs
diff --git a/src/Umbraco.Abstractions/InstallLog.cs b/src/Umbraco.Core/InstallLog.cs
similarity index 100%
rename from src/Umbraco.Abstractions/InstallLog.cs
rename to src/Umbraco.Core/InstallLog.cs
diff --git a/src/Umbraco.Abstractions/IntExtensions.cs b/src/Umbraco.Core/IntExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IntExtensions.cs
rename to src/Umbraco.Core/IntExtensions.cs
diff --git a/src/Umbraco.Abstractions/KeyValuePairExtensions.cs b/src/Umbraco.Core/KeyValuePairExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/KeyValuePairExtensions.cs
rename to src/Umbraco.Core/KeyValuePairExtensions.cs
diff --git a/src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs b/src/Umbraco.Core/LambdaExpressionCacheKey.cs
similarity index 100%
rename from src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
rename to src/Umbraco.Core/LambdaExpressionCacheKey.cs
diff --git a/src/Umbraco.Abstractions/Logging/DebugDiagnosticsLogger.cs b/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/DebugDiagnosticsLogger.cs
rename to src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
diff --git a/src/Umbraco.Abstractions/Logging/DisposableTimer.cs b/src/Umbraco.Core/Logging/DisposableTimer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/DisposableTimer.cs
rename to src/Umbraco.Core/Logging/DisposableTimer.cs
diff --git a/src/Umbraco.Abstractions/Logging/ILogger.cs b/src/Umbraco.Core/Logging/ILogger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/ILogger.cs
rename to src/Umbraco.Core/Logging/ILogger.cs
diff --git a/src/Umbraco.Abstractions/Logging/IMessageTemplates.cs b/src/Umbraco.Core/Logging/IMessageTemplates.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/IMessageTemplates.cs
rename to src/Umbraco.Core/Logging/IMessageTemplates.cs
diff --git a/src/Umbraco.Abstractions/Logging/IProfiler.cs b/src/Umbraco.Core/Logging/IProfiler.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/IProfiler.cs
rename to src/Umbraco.Core/Logging/IProfiler.cs
diff --git a/src/Umbraco.Abstractions/Logging/IProfilingLogger.cs b/src/Umbraco.Core/Logging/IProfilingLogger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/IProfilingLogger.cs
rename to src/Umbraco.Core/Logging/IProfilingLogger.cs
diff --git a/src/Umbraco.Abstractions/Logging/LogLevel.cs b/src/Umbraco.Core/Logging/LogLevel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/LogLevel.cs
rename to src/Umbraco.Core/Logging/LogLevel.cs
diff --git a/src/Umbraco.Abstractions/Logging/LogProfiler.cs b/src/Umbraco.Core/Logging/LogProfiler.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/LogProfiler.cs
rename to src/Umbraco.Core/Logging/LogProfiler.cs
diff --git a/src/Umbraco.Abstractions/Logging/LoggerExtensions.cs b/src/Umbraco.Core/Logging/LoggerExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/LoggerExtensions.cs
rename to src/Umbraco.Core/Logging/LoggerExtensions.cs
diff --git a/src/Umbraco.Abstractions/Logging/LoggingTaskExtension.cs b/src/Umbraco.Core/Logging/LoggingTaskExtension.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/LoggingTaskExtension.cs
rename to src/Umbraco.Core/Logging/LoggingTaskExtension.cs
diff --git a/src/Umbraco.Abstractions/Logging/NullLogger.cs b/src/Umbraco.Core/Logging/NullLogger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/NullLogger.cs
rename to src/Umbraco.Core/Logging/NullLogger.cs
diff --git a/src/Umbraco.Abstractions/Logging/ProfilerExtensions.cs b/src/Umbraco.Core/Logging/ProfilerExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/ProfilerExtensions.cs
rename to src/Umbraco.Core/Logging/ProfilerExtensions.cs
diff --git a/src/Umbraco.Abstractions/Logging/ProfilingLogger.cs b/src/Umbraco.Core/Logging/ProfilingLogger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/ProfilingLogger.cs
rename to src/Umbraco.Core/Logging/ProfilingLogger.cs
diff --git a/src/Umbraco.Abstractions/Logging/VoidProfiler.cs b/src/Umbraco.Core/Logging/VoidProfiler.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Logging/VoidProfiler.cs
rename to src/Umbraco.Core/Logging/VoidProfiler.cs
diff --git a/src/Umbraco.Abstractions/Macros/MacroErrorBehaviour.cs b/src/Umbraco.Core/Macros/MacroErrorBehaviour.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Macros/MacroErrorBehaviour.cs
rename to src/Umbraco.Core/Macros/MacroErrorBehaviour.cs
diff --git a/src/Umbraco.Abstractions/Manifest/IManifestFilter.cs b/src/Umbraco.Core/Manifest/IManifestFilter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/IManifestFilter.cs
rename to src/Umbraco.Core/Manifest/IManifestFilter.cs
diff --git a/src/Umbraco.Abstractions/Manifest/IManifestParser.cs b/src/Umbraco.Core/Manifest/IManifestParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/IManifestParser.cs
rename to src/Umbraco.Core/Manifest/IManifestParser.cs
diff --git a/src/Umbraco.Abstractions/Manifest/IPackageManifest.cs b/src/Umbraco.Core/Manifest/IPackageManifest.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/IPackageManifest.cs
rename to src/Umbraco.Core/Manifest/IPackageManifest.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestContentAppDefinition.cs b/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestContentAppDefinition.cs
rename to src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestContentAppFactory.cs b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestContentAppFactory.cs
rename to src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestDashboard.cs b/src/Umbraco.Core/Manifest/ManifestDashboard.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestDashboard.cs
rename to src/Umbraco.Core/Manifest/ManifestDashboard.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestFilterCollection.cs b/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestFilterCollection.cs
rename to src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestFilterCollectionBuilder.cs b/src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestFilterCollectionBuilder.cs
rename to src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestSection.cs b/src/Umbraco.Core/Manifest/ManifestSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestSection.cs
rename to src/Umbraco.Core/Manifest/ManifestSection.cs
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/ManifestWatcher.cs
rename to src/Umbraco.Core/Manifest/ManifestWatcher.cs
diff --git a/src/Umbraco.Abstractions/Manifest/PackageManifest.cs b/src/Umbraco.Core/Manifest/PackageManifest.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Manifest/PackageManifest.cs
rename to src/Umbraco.Core/Manifest/PackageManifest.cs
diff --git a/src/Umbraco.Abstractions/Mapping/IMapDefinition.cs b/src/Umbraco.Core/Mapping/IMapDefinition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Mapping/IMapDefinition.cs
rename to src/Umbraco.Core/Mapping/IMapDefinition.cs
diff --git a/src/Umbraco.Abstractions/Mapping/MapDefinitionCollection.cs b/src/Umbraco.Core/Mapping/MapDefinitionCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Mapping/MapDefinitionCollection.cs
rename to src/Umbraco.Core/Mapping/MapDefinitionCollection.cs
diff --git a/src/Umbraco.Abstractions/Mapping/MapDefinitionCollectionBuilder.cs b/src/Umbraco.Core/Mapping/MapDefinitionCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Mapping/MapDefinitionCollectionBuilder.cs
rename to src/Umbraco.Core/Mapping/MapDefinitionCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Mapping/MapperContext.cs b/src/Umbraco.Core/Mapping/MapperContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Mapping/MapperContext.cs
rename to src/Umbraco.Core/Mapping/MapperContext.cs
diff --git a/src/Umbraco.Abstractions/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Mapping/UmbracoMapper.cs
rename to src/Umbraco.Core/Mapping/UmbracoMapper.cs
diff --git a/src/Umbraco.Abstractions/Media/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Media/IEmbedProvider.cs
rename to src/Umbraco.Core/Media/IEmbedProvider.cs
diff --git a/src/Umbraco.Abstractions/Media/OEmbedResult.cs b/src/Umbraco.Core/Media/OEmbedResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Media/OEmbedResult.cs
rename to src/Umbraco.Core/Media/OEmbedResult.cs
diff --git a/src/Umbraco.Abstractions/Media/OEmbedStatus.cs b/src/Umbraco.Core/Media/OEmbedStatus.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Media/OEmbedStatus.cs
rename to src/Umbraco.Core/Media/OEmbedStatus.cs
diff --git a/src/Umbraco.Abstractions/MediaTypeExtensions.cs b/src/Umbraco.Core/MediaTypeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/MediaTypeExtensions.cs
rename to src/Umbraco.Core/MediaTypeExtensions.cs
diff --git a/src/Umbraco.Abstractions/Migrations/IMigration.cs b/src/Umbraco.Core/Migrations/IMigration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Migrations/IMigration.cs
rename to src/Umbraco.Core/Migrations/IMigration.cs
diff --git a/src/Umbraco.Abstractions/Migrations/IncompleteMigrationExpressionException.cs b/src/Umbraco.Core/Migrations/IncompleteMigrationExpressionException.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Migrations/IncompleteMigrationExpressionException.cs
rename to src/Umbraco.Core/Migrations/IncompleteMigrationExpressionException.cs
diff --git a/src/Umbraco.Abstractions/Migrations/NoopMigration.cs b/src/Umbraco.Core/Migrations/NoopMigration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Migrations/NoopMigration.cs
rename to src/Umbraco.Core/Migrations/NoopMigration.cs
diff --git a/src/Umbraco.Abstractions/Models/AnchorsModel.cs b/src/Umbraco.Core/Models/AnchorsModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/AnchorsModel.cs
rename to src/Umbraco.Core/Models/AnchorsModel.cs
diff --git a/src/Umbraco.Abstractions/Models/AuditEntry.cs b/src/Umbraco.Core/Models/AuditEntry.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/AuditEntry.cs
rename to src/Umbraco.Core/Models/AuditEntry.cs
diff --git a/src/Umbraco.Abstractions/Models/AuditItem.cs b/src/Umbraco.Core/Models/AuditItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/AuditItem.cs
rename to src/Umbraco.Core/Models/AuditItem.cs
diff --git a/src/Umbraco.Abstractions/Models/AuditType.cs b/src/Umbraco.Core/Models/AuditType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/AuditType.cs
rename to src/Umbraco.Core/Models/AuditType.cs
diff --git a/src/Umbraco.Abstractions/Models/ChangingPasswordModel.cs b/src/Umbraco.Core/Models/ChangingPasswordModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ChangingPasswordModel.cs
rename to src/Umbraco.Core/Models/ChangingPasswordModel.cs
diff --git a/src/Umbraco.Abstractions/Models/Consent.cs b/src/Umbraco.Core/Models/Consent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Consent.cs
rename to src/Umbraco.Core/Models/Consent.cs
diff --git a/src/Umbraco.Abstractions/Models/ConsentExtensions.cs b/src/Umbraco.Core/Models/ConsentExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ConsentExtensions.cs
rename to src/Umbraco.Core/Models/ConsentExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/ConsentState.cs b/src/Umbraco.Core/Models/ConsentState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ConsentState.cs
rename to src/Umbraco.Core/Models/ConsentState.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentBase.cs
rename to src/Umbraco.Core/Models/ContentBase.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentCultureInfos.cs b/src/Umbraco.Core/Models/ContentCultureInfos.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentCultureInfos.cs
rename to src/Umbraco.Core/Models/ContentCultureInfos.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentCultureInfosCollection.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentCultureInfosCollection.cs
rename to src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/AuditLog.cs b/src/Umbraco.Core/Models/ContentEditing/AuditLog.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/AuditLog.cs
rename to src/Umbraco.Core/Models/ContentEditing/AuditLog.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentApp.cs b/src/Umbraco.Core/Models/ContentEditing/ContentApp.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentApp.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentApp.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentAppBadge.cs b/src/Umbraco.Core/Models/ContentEditing/ContentAppBadge.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentAppBadge.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentAppBadge.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentAppBadgeType.cs b/src/Umbraco.Core/Models/ContentEditing/ContentAppBadgeType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentAppBadgeType.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentAppBadgeType.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentDomainsAndCulture.cs b/src/Umbraco.Core/Models/ContentEditing/ContentDomainsAndCulture.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentDomainsAndCulture.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentDomainsAndCulture.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentItemSave.cs b/src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentItemSave.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Core/Models/ContentEditing/ContentPropertyBasic.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyBasic.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentPropertyBasic.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyCollectionDto.cs b/src/Umbraco.Core/Models/ContentEditing/ContentPropertyCollectionDto.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyCollectionDto.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentPropertyCollectionDto.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/ContentPropertyDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentPropertyDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyDto.cs b/src/Umbraco.Core/Models/ContentEditing/ContentPropertyDto.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyDto.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentPropertyDto.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentRedirectUrl.cs b/src/Umbraco.Core/Models/ContentEditing/ContentRedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentRedirectUrl.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentRedirectUrl.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentSaveAction.cs b/src/Umbraco.Core/Models/ContentEditing/ContentSaveAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentSaveAction.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentSaveAction.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentSavedState.cs b/src/Umbraco.Core/Models/ContentEditing/ContentSavedState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentSavedState.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentSavedState.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentSortOrder.cs b/src/Umbraco.Core/Models/ContentEditing/ContentSortOrder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentSortOrder.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentSortOrder.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ContentVariantSave.cs b/src/Umbraco.Core/Models/ContentEditing/ContentVariantSave.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ContentVariantSave.cs
rename to src/Umbraco.Core/Models/ContentEditing/ContentVariantSave.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/CreatedDocumentTypeCollectionResult.cs b/src/Umbraco.Core/Models/ContentEditing/CreatedDocumentTypeCollectionResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/CreatedDocumentTypeCollectionResult.cs
rename to src/Umbraco.Core/Models/ContentEditing/CreatedDocumentTypeCollectionResult.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/DictionaryOverviewDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/DictionaryOverviewDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/DictionaryTranslationDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/DictionaryTranslationDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationSave.cs b/src/Umbraco.Core/Models/ContentEditing/DictionaryTranslationSave.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationSave.cs
rename to src/Umbraco.Core/Models/ContentEditing/DictionaryTranslationSave.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/DomainDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/DomainDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/DomainDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/DomainDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/IContentAppFactory.cs b/src/Umbraco.Core/Models/ContentEditing/IContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/IContentAppFactory.cs
rename to src/Umbraco.Core/Models/ContentEditing/IContentAppFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/IContentProperties.cs b/src/Umbraco.Core/Models/ContentEditing/IContentProperties.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/IContentProperties.cs
rename to src/Umbraco.Core/Models/ContentEditing/IContentProperties.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/IContentSave.cs b/src/Umbraco.Core/Models/ContentEditing/IContentSave.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/IContentSave.cs
rename to src/Umbraco.Core/Models/ContentEditing/IContentSave.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/IHaveUploadedFiles.cs b/src/Umbraco.Core/Models/ContentEditing/IHaveUploadedFiles.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/IHaveUploadedFiles.cs
rename to src/Umbraco.Core/Models/ContentEditing/IHaveUploadedFiles.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ITabbedContent.cs b/src/Umbraco.Core/Models/ContentEditing/ITabbedContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ITabbedContent.cs
rename to src/Umbraco.Core/Models/ContentEditing/ITabbedContent.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/Language.cs b/src/Umbraco.Core/Models/ContentEditing/Language.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/Language.cs
rename to src/Umbraco.Core/Models/ContentEditing/Language.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/LinkDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/LinkDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/LinkDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/LinkDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/MemberPropertyTypeBasic.cs b/src/Umbraco.Core/Models/ContentEditing/MemberPropertyTypeBasic.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/MemberPropertyTypeBasic.cs
rename to src/Umbraco.Core/Models/ContentEditing/MemberPropertyTypeBasic.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/MemberPropertyTypeDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/MemberPropertyTypeDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/MemberPropertyTypeDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/MemberPropertyTypeDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/MoveOrCopy.cs b/src/Umbraco.Core/Models/ContentEditing/MoveOrCopy.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/MoveOrCopy.cs
rename to src/Umbraco.Core/Models/ContentEditing/MoveOrCopy.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/NotificationStyle.cs b/src/Umbraco.Core/Models/ContentEditing/NotificationStyle.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/NotificationStyle.cs
rename to src/Umbraco.Core/Models/ContentEditing/NotificationStyle.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/NotifySetting.cs b/src/Umbraco.Core/Models/ContentEditing/NotifySetting.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/NotifySetting.cs
rename to src/Umbraco.Core/Models/ContentEditing/NotifySetting.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/ObjectType.cs b/src/Umbraco.Core/Models/ContentEditing/ObjectType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/ObjectType.cs
rename to src/Umbraco.Core/Models/ContentEditing/ObjectType.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/Permission.cs b/src/Umbraco.Core/Models/ContentEditing/Permission.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/Permission.cs
rename to src/Umbraco.Core/Models/ContentEditing/Permission.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PostedFolder.cs b/src/Umbraco.Core/Models/ContentEditing/PostedFolder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PostedFolder.cs
rename to src/Umbraco.Core/Models/ContentEditing/PostedFolder.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PropertyEditorBasic.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyEditorBasic.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PropertyEditorBasic.cs
rename to src/Umbraco.Core/Models/ContentEditing/PropertyEditorBasic.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PropertyGroupBasic.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PropertyGroupBasic.cs
rename to src/Umbraco.Core/Models/ContentEditing/PropertyGroupBasic.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeBasic.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyTypeBasic.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeBasic.cs
rename to src/Umbraco.Core/Models/ContentEditing/PropertyTypeBasic.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyTypeDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/PropertyTypeDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeValidation.cs b/src/Umbraco.Core/Models/ContentEditing/PropertyTypeValidation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeValidation.cs
rename to src/Umbraco.Core/Models/ContentEditing/PropertyTypeValidation.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/RedirectUrlSearchResults.cs b/src/Umbraco.Core/Models/ContentEditing/RedirectUrlSearchResults.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/RedirectUrlSearchResults.cs
rename to src/Umbraco.Core/Models/ContentEditing/RedirectUrlSearchResults.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/RelationDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/RelationDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/RelationDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/RelationDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/RichTextEditorPlugin.cs b/src/Umbraco.Core/Models/ContentEditing/RichTextEditorPlugin.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/RichTextEditorPlugin.cs
rename to src/Umbraco.Core/Models/ContentEditing/RichTextEditorPlugin.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/RollbackVersion.cs b/src/Umbraco.Core/Models/ContentEditing/RollbackVersion.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/RollbackVersion.cs
rename to src/Umbraco.Core/Models/ContentEditing/RollbackVersion.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/SearchResult.cs b/src/Umbraco.Core/Models/ContentEditing/SearchResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/SearchResult.cs
rename to src/Umbraco.Core/Models/ContentEditing/SearchResult.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/Section.cs b/src/Umbraco.Core/Models/ContentEditing/Section.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/Section.cs
rename to src/Umbraco.Core/Models/ContentEditing/Section.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/SnippetDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/SnippetDisplay.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/SnippetDisplay.cs
rename to src/Umbraco.Core/Models/ContentEditing/SnippetDisplay.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/StyleSheet.cs b/src/Umbraco.Core/Models/ContentEditing/StyleSheet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/StyleSheet.cs
rename to src/Umbraco.Core/Models/ContentEditing/StyleSheet.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/StylesheetRule.cs b/src/Umbraco.Core/Models/ContentEditing/StylesheetRule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/StylesheetRule.cs
rename to src/Umbraco.Core/Models/ContentEditing/StylesheetRule.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/Tab.cs b/src/Umbraco.Core/Models/ContentEditing/Tab.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/Tab.cs
rename to src/Umbraco.Core/Models/ContentEditing/Tab.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/UmbracoEntityTypes.cs b/src/Umbraco.Core/Models/ContentEditing/UmbracoEntityTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/UmbracoEntityTypes.cs
rename to src/Umbraco.Core/Models/ContentEditing/UmbracoEntityTypes.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/UnpublishContent.cs b/src/Umbraco.Core/Models/ContentEditing/UnpublishContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/UnpublishContent.cs
rename to src/Umbraco.Core/Models/ContentEditing/UnpublishContent.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentEditing/UrlAndAnchors.cs b/src/Umbraco.Core/Models/ContentEditing/UrlAndAnchors.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentEditing/UrlAndAnchors.cs
rename to src/Umbraco.Core/Models/ContentEditing/UrlAndAnchors.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentExtensions.cs
rename to src/Umbraco.Core/Models/ContentExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentModel.cs b/src/Umbraco.Core/Models/ContentModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentModel.cs
rename to src/Umbraco.Core/Models/ContentModel.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentModelOfTContent.cs b/src/Umbraco.Core/Models/ContentModelOfTContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentModelOfTContent.cs
rename to src/Umbraco.Core/Models/ContentModelOfTContent.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentRepositoryExtensions.cs
rename to src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentSchedule.cs b/src/Umbraco.Core/Models/ContentSchedule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentSchedule.cs
rename to src/Umbraco.Core/Models/ContentSchedule.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentScheduleAction.cs b/src/Umbraco.Core/Models/ContentScheduleAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentScheduleAction.cs
rename to src/Umbraco.Core/Models/ContentScheduleAction.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs
rename to src/Umbraco.Core/Models/ContentScheduleCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentStatus.cs b/src/Umbraco.Core/Models/ContentStatus.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentStatus.cs
rename to src/Umbraco.Core/Models/ContentStatus.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentTypeAvailableCompositionsResult.cs b/src/Umbraco.Core/Models/ContentTypeAvailableCompositionsResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentTypeAvailableCompositionsResult.cs
rename to src/Umbraco.Core/Models/ContentTypeAvailableCompositionsResult.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentTypeAvailableCompositionsResults.cs b/src/Umbraco.Core/Models/ContentTypeAvailableCompositionsResults.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentTypeAvailableCompositionsResults.cs
rename to src/Umbraco.Core/Models/ContentTypeAvailableCompositionsResults.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentTypeBaseExtensions.cs
rename to src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentTypeSort.cs b/src/Umbraco.Core/Models/ContentTypeSort.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentTypeSort.cs
rename to src/Umbraco.Core/Models/ContentTypeSort.cs
diff --git a/src/Umbraco.Abstractions/Models/ContentVariation.cs b/src/Umbraco.Core/Models/ContentVariation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ContentVariation.cs
rename to src/Umbraco.Core/Models/ContentVariation.cs
diff --git a/src/Umbraco.Abstractions/Models/CultureImpact.cs b/src/Umbraco.Core/Models/CultureImpact.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/CultureImpact.cs
rename to src/Umbraco.Core/Models/CultureImpact.cs
diff --git a/src/Umbraco.Abstractions/Models/DataTypeExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DataTypeExtensions.cs
rename to src/Umbraco.Core/Models/DataTypeExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/DeepCloneHelper.cs b/src/Umbraco.Core/Models/DeepCloneHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DeepCloneHelper.cs
rename to src/Umbraco.Core/Models/DeepCloneHelper.cs
diff --git a/src/Umbraco.Abstractions/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DictionaryItem.cs
rename to src/Umbraco.Core/Models/DictionaryItem.cs
diff --git a/src/Umbraco.Abstractions/Models/DictionaryItemExtensions.cs b/src/Umbraco.Core/Models/DictionaryItemExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DictionaryItemExtensions.cs
rename to src/Umbraco.Core/Models/DictionaryItemExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/DictionaryTranslation.cs b/src/Umbraco.Core/Models/DictionaryTranslation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DictionaryTranslation.cs
rename to src/Umbraco.Core/Models/DictionaryTranslation.cs
diff --git a/src/Umbraco.Abstractions/Models/DoNotCloneAttribute.cs b/src/Umbraco.Core/Models/DoNotCloneAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/DoNotCloneAttribute.cs
rename to src/Umbraco.Core/Models/DoNotCloneAttribute.cs
diff --git a/src/Umbraco.Abstractions/Models/Editors/ContentPropertyData.cs b/src/Umbraco.Core/Models/Editors/ContentPropertyData.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Editors/ContentPropertyData.cs
rename to src/Umbraco.Core/Models/Editors/ContentPropertyData.cs
diff --git a/src/Umbraco.Abstractions/Models/Editors/ContentPropertyFile.cs b/src/Umbraco.Core/Models/Editors/ContentPropertyFile.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Editors/ContentPropertyFile.cs
rename to src/Umbraco.Core/Models/Editors/ContentPropertyFile.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/BeingDirty.cs b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/BeingDirty.cs
rename to src/Umbraco.Core/Models/Entities/BeingDirty.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/BeingDirtyBase.cs b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/BeingDirtyBase.cs
rename to src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/ContentEntitySlim.cs b/src/Umbraco.Core/Models/Entities/ContentEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/ContentEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/ContentEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/DocumentEntitySlim.cs b/src/Umbraco.Core/Models/Entities/DocumentEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/DocumentEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/DocumentEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/EntityBase.cs b/src/Umbraco.Core/Models/Entities/EntityBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/EntityBase.cs
rename to src/Umbraco.Core/Models/Entities/EntityBase.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/EntityExtensions.cs b/src/Umbraco.Core/Models/Entities/EntityExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/EntityExtensions.cs
rename to src/Umbraco.Core/Models/Entities/EntityExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/EntitySlim.cs b/src/Umbraco.Core/Models/Entities/EntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/EntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/EntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/ICanBeDirty.cs b/src/Umbraco.Core/Models/Entities/ICanBeDirty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/ICanBeDirty.cs
rename to src/Umbraco.Core/Models/Entities/ICanBeDirty.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IContentEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IContentEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IContentEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/IContentEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IDocumentEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IDocumentEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IDocumentEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/IDocumentEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IEntity.cs b/src/Umbraco.Core/Models/Entities/IEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IEntity.cs
rename to src/Umbraco.Core/Models/Entities/IEntity.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/IEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IHaveAdditionalData.cs b/src/Umbraco.Core/Models/Entities/IHaveAdditionalData.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IHaveAdditionalData.cs
rename to src/Umbraco.Core/Models/Entities/IHaveAdditionalData.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IMediaEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IMediaEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IMemberEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IMemberEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IMemberEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/IMemberEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IRememberBeingDirty.cs b/src/Umbraco.Core/Models/Entities/IRememberBeingDirty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IRememberBeingDirty.cs
rename to src/Umbraco.Core/Models/Entities/IRememberBeingDirty.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/ITreeEntity.cs b/src/Umbraco.Core/Models/Entities/ITreeEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/ITreeEntity.cs
rename to src/Umbraco.Core/Models/Entities/ITreeEntity.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IUmbracoEntity.cs b/src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IUmbracoEntity.cs
rename to src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/IValueObject.cs b/src/Umbraco.Core/Models/Entities/IValueObject.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/IValueObject.cs
rename to src/Umbraco.Core/Models/Entities/IValueObject.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/MediaEntitySlim.cs b/src/Umbraco.Core/Models/Entities/MediaEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/MediaEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/MediaEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/MemberEntitySlim.cs b/src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/MemberEntitySlim.cs
rename to src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/TreeEntityBase.cs b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/TreeEntityBase.cs
rename to src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
diff --git a/src/Umbraco.Abstractions/Models/Entities/TreeEntityPath.cs b/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Entities/TreeEntityPath.cs
rename to src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
diff --git a/src/Umbraco.Abstractions/Models/EntityContainer.cs b/src/Umbraco.Core/Models/EntityContainer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/EntityContainer.cs
rename to src/Umbraco.Core/Models/EntityContainer.cs
diff --git a/src/Umbraco.Abstractions/Models/EntityExtensions.cs b/src/Umbraco.Core/Models/EntityExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/EntityExtensions.cs
rename to src/Umbraco.Core/Models/EntityExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/File.cs b/src/Umbraco.Core/Models/File.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/File.cs
rename to src/Umbraco.Core/Models/File.cs
diff --git a/src/Umbraco.Abstractions/Models/Folder.cs b/src/Umbraco.Core/Models/Folder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Folder.cs
rename to src/Umbraco.Core/Models/Folder.cs
diff --git a/src/Umbraco.Abstractions/Models/IAuditEntry.cs b/src/Umbraco.Core/Models/IAuditEntry.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IAuditEntry.cs
rename to src/Umbraco.Core/Models/IAuditEntry.cs
diff --git a/src/Umbraco.Abstractions/Models/IAuditItem.cs b/src/Umbraco.Core/Models/IAuditItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IAuditItem.cs
rename to src/Umbraco.Core/Models/IAuditItem.cs
diff --git a/src/Umbraco.Abstractions/Models/IConsent.cs b/src/Umbraco.Core/Models/IConsent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IConsent.cs
rename to src/Umbraco.Core/Models/IConsent.cs
diff --git a/src/Umbraco.Abstractions/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContent.cs
rename to src/Umbraco.Core/Models/IContent.cs
diff --git a/src/Umbraco.Abstractions/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContentBase.cs
rename to src/Umbraco.Core/Models/IContentBase.cs
diff --git a/src/Umbraco.Abstractions/Models/IContentModel.cs b/src/Umbraco.Core/Models/IContentModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContentModel.cs
rename to src/Umbraco.Core/Models/IContentModel.cs
diff --git a/src/Umbraco.Abstractions/Models/IContentType.cs b/src/Umbraco.Core/Models/IContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContentType.cs
rename to src/Umbraco.Core/Models/IContentType.cs
diff --git a/src/Umbraco.Abstractions/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContentTypeBase.cs
rename to src/Umbraco.Core/Models/IContentTypeBase.cs
diff --git a/src/Umbraco.Abstractions/Models/IContentTypeComposition.cs b/src/Umbraco.Core/Models/IContentTypeComposition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IContentTypeComposition.cs
rename to src/Umbraco.Core/Models/IContentTypeComposition.cs
diff --git a/src/Umbraco.Abstractions/Models/IDataType.cs b/src/Umbraco.Core/Models/IDataType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDataType.cs
rename to src/Umbraco.Core/Models/IDataType.cs
diff --git a/src/Umbraco.Abstractions/Models/IDataValueEditor.cs b/src/Umbraco.Core/Models/IDataValueEditor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDataValueEditor.cs
rename to src/Umbraco.Core/Models/IDataValueEditor.cs
diff --git a/src/Umbraco.Abstractions/Models/IDeepCloneable.cs b/src/Umbraco.Core/Models/IDeepCloneable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDeepCloneable.cs
rename to src/Umbraco.Core/Models/IDeepCloneable.cs
diff --git a/src/Umbraco.Abstractions/Models/IDictionaryItem.cs b/src/Umbraco.Core/Models/IDictionaryItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDictionaryItem.cs
rename to src/Umbraco.Core/Models/IDictionaryItem.cs
diff --git a/src/Umbraco.Abstractions/Models/IDictionaryTranslation.cs b/src/Umbraco.Core/Models/IDictionaryTranslation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDictionaryTranslation.cs
rename to src/Umbraco.Core/Models/IDictionaryTranslation.cs
diff --git a/src/Umbraco.Abstractions/Models/IDomain.cs b/src/Umbraco.Core/Models/IDomain.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IDomain.cs
rename to src/Umbraco.Core/Models/IDomain.cs
diff --git a/src/Umbraco.Abstractions/Models/IFile.cs b/src/Umbraco.Core/Models/IFile.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IFile.cs
rename to src/Umbraco.Core/Models/IFile.cs
diff --git a/src/Umbraco.Abstractions/Models/IImageUrlGenerator.cs b/src/Umbraco.Core/Models/IImageUrlGenerator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IImageUrlGenerator.cs
rename to src/Umbraco.Core/Models/IImageUrlGenerator.cs
diff --git a/src/Umbraco.Abstractions/Models/ILanguage.cs b/src/Umbraco.Core/Models/ILanguage.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ILanguage.cs
rename to src/Umbraco.Core/Models/ILanguage.cs
diff --git a/src/Umbraco.Abstractions/Models/IMacro.cs b/src/Umbraco.Core/Models/IMacro.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMacro.cs
rename to src/Umbraco.Core/Models/IMacro.cs
diff --git a/src/Umbraco.Abstractions/Models/IMacroProperty.cs b/src/Umbraco.Core/Models/IMacroProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMacroProperty.cs
rename to src/Umbraco.Core/Models/IMacroProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/IMedia.cs b/src/Umbraco.Core/Models/IMedia.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMedia.cs
rename to src/Umbraco.Core/Models/IMedia.cs
diff --git a/src/Umbraco.Abstractions/Models/IMediaType.cs b/src/Umbraco.Core/Models/IMediaType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMediaType.cs
rename to src/Umbraco.Core/Models/IMediaType.cs
diff --git a/src/Umbraco.Abstractions/Models/IMediaUrlGenerator.cs b/src/Umbraco.Core/Models/IMediaUrlGenerator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMediaUrlGenerator.cs
rename to src/Umbraco.Core/Models/IMediaUrlGenerator.cs
diff --git a/src/Umbraco.Abstractions/Models/IMember.cs b/src/Umbraco.Core/Models/IMember.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMember.cs
rename to src/Umbraco.Core/Models/IMember.cs
diff --git a/src/Umbraco.Abstractions/Models/IMemberGroup.cs b/src/Umbraco.Core/Models/IMemberGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMemberGroup.cs
rename to src/Umbraco.Core/Models/IMemberGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/IMemberType.cs b/src/Umbraco.Core/Models/IMemberType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMemberType.cs
rename to src/Umbraco.Core/Models/IMemberType.cs
diff --git a/src/Umbraco.Abstractions/Models/IMigrationEntry.cs b/src/Umbraco.Core/Models/IMigrationEntry.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IMigrationEntry.cs
rename to src/Umbraco.Core/Models/IMigrationEntry.cs
diff --git a/src/Umbraco.Abstractions/Models/IPartialView.cs b/src/Umbraco.Core/Models/IPartialView.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IPartialView.cs
rename to src/Umbraco.Core/Models/IPartialView.cs
diff --git a/src/Umbraco.Abstractions/Models/IProperty.cs b/src/Umbraco.Core/Models/IProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IProperty.cs
rename to src/Umbraco.Core/Models/IProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/IPropertyCollection.cs b/src/Umbraco.Core/Models/IPropertyCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IPropertyCollection.cs
rename to src/Umbraco.Core/Models/IPropertyCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/IPropertyType.cs b/src/Umbraco.Core/Models/IPropertyType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IPropertyType.cs
rename to src/Umbraco.Core/Models/IPropertyType.cs
diff --git a/src/Umbraco.Abstractions/Models/IPropertyValue.cs b/src/Umbraco.Core/Models/IPropertyValue.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IPropertyValue.cs
rename to src/Umbraco.Core/Models/IPropertyValue.cs
diff --git a/src/Umbraco.Abstractions/Models/IRedirectUrl.cs b/src/Umbraco.Core/Models/IRedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IRedirectUrl.cs
rename to src/Umbraco.Core/Models/IRedirectUrl.cs
diff --git a/src/Umbraco.Abstractions/Models/IRelation.cs b/src/Umbraco.Core/Models/IRelation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IRelation.cs
rename to src/Umbraco.Core/Models/IRelation.cs
diff --git a/src/Umbraco.Abstractions/Models/IRelationType.cs b/src/Umbraco.Core/Models/IRelationType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IRelationType.cs
rename to src/Umbraco.Core/Models/IRelationType.cs
diff --git a/src/Umbraco.Abstractions/Models/IScript.cs b/src/Umbraco.Core/Models/IScript.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IScript.cs
rename to src/Umbraco.Core/Models/IScript.cs
diff --git a/src/Umbraco.Abstractions/Models/IServerRegistration.cs b/src/Umbraco.Core/Models/IServerRegistration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IServerRegistration.cs
rename to src/Umbraco.Core/Models/IServerRegistration.cs
diff --git a/src/Umbraco.Abstractions/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ISimpleContentType.cs
rename to src/Umbraco.Core/Models/ISimpleContentType.cs
diff --git a/src/Umbraco.Abstractions/Models/IStylesheet.cs b/src/Umbraco.Core/Models/IStylesheet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IStylesheet.cs
rename to src/Umbraco.Core/Models/IStylesheet.cs
diff --git a/src/Umbraco.Abstractions/Models/IStylesheetProperty.cs b/src/Umbraco.Core/Models/IStylesheetProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IStylesheetProperty.cs
rename to src/Umbraco.Core/Models/IStylesheetProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/ITag.cs b/src/Umbraco.Core/Models/ITag.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ITag.cs
rename to src/Umbraco.Core/Models/ITag.cs
diff --git a/src/Umbraco.Abstractions/Models/ITemplate.cs b/src/Umbraco.Core/Models/ITemplate.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ITemplate.cs
rename to src/Umbraco.Core/Models/ITemplate.cs
diff --git a/src/Umbraco.Abstractions/Models/Identity/IIdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Identity/IIdentityUserLogin.cs
rename to src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
diff --git a/src/Umbraco.Abstractions/Models/Identity/IUserLoginInfo.cs b/src/Umbraco.Core/Models/Identity/IUserLoginInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Identity/IUserLoginInfo.cs
rename to src/Umbraco.Core/Models/Identity/IUserLoginInfo.cs
diff --git a/src/Umbraco.Abstractions/Models/Identity/IdentityUserClaim.cs b/src/Umbraco.Core/Models/Identity/IdentityUserClaim.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Identity/IdentityUserClaim.cs
rename to src/Umbraco.Core/Models/Identity/IdentityUserClaim.cs
diff --git a/src/Umbraco.Abstractions/Models/Identity/IdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Identity/IdentityUserLogin.cs
rename to src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
diff --git a/src/Umbraco.Abstractions/Models/Identity/IdentityUserRole.cs b/src/Umbraco.Core/Models/Identity/IdentityUserRole.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Identity/IdentityUserRole.cs
rename to src/Umbraco.Core/Models/Identity/IdentityUserRole.cs
diff --git a/src/Umbraco.Abstractions/Models/ImageCropAnchor.cs b/src/Umbraco.Core/Models/ImageCropAnchor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ImageCropAnchor.cs
rename to src/Umbraco.Core/Models/ImageCropAnchor.cs
diff --git a/src/Umbraco.Abstractions/Models/ImageCropMode.cs b/src/Umbraco.Core/Models/ImageCropMode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ImageCropMode.cs
rename to src/Umbraco.Core/Models/ImageCropMode.cs
diff --git a/src/Umbraco.Abstractions/Models/ImageCropRatioMode.cs b/src/Umbraco.Core/Models/ImageCropRatioMode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ImageCropRatioMode.cs
rename to src/Umbraco.Core/Models/ImageCropRatioMode.cs
diff --git a/src/Umbraco.Abstractions/Models/ImageUrlGenerationOptions.cs b/src/Umbraco.Core/Models/ImageUrlGenerationOptions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ImageUrlGenerationOptions.cs
rename to src/Umbraco.Core/Models/ImageUrlGenerationOptions.cs
diff --git a/src/Umbraco.Abstractions/Models/Link.cs b/src/Umbraco.Core/Models/Link.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Link.cs
rename to src/Umbraco.Core/Models/Link.cs
diff --git a/src/Umbraco.Abstractions/Models/LinkType.cs b/src/Umbraco.Core/Models/LinkType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/LinkType.cs
rename to src/Umbraco.Core/Models/LinkType.cs
diff --git a/src/Umbraco.Abstractions/Models/LoginModel.cs b/src/Umbraco.Core/Models/LoginModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/LoginModel.cs
rename to src/Umbraco.Core/Models/LoginModel.cs
diff --git a/src/Umbraco.Abstractions/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MacroProperty.cs
rename to src/Umbraco.Core/Models/MacroProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/MacroPropertyCollection.cs b/src/Umbraco.Core/Models/MacroPropertyCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MacroPropertyCollection.cs
rename to src/Umbraco.Core/Models/MacroPropertyCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MacroTypes.cs
rename to src/Umbraco.Core/Models/MacroTypes.cs
diff --git a/src/Umbraco.Abstractions/Models/MemberGroup.cs b/src/Umbraco.Core/Models/MemberGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MemberGroup.cs
rename to src/Umbraco.Core/Models/MemberGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/MemberTypePropertyProfileAccess.cs b/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MemberTypePropertyProfileAccess.cs
rename to src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/ContentPermissionSet.cs b/src/Umbraco.Core/Models/Membership/ContentPermissionSet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/ContentPermissionSet.cs
rename to src/Umbraco.Core/Models/Membership/ContentPermissionSet.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/EntityPermission.cs b/src/Umbraco.Core/Models/Membership/EntityPermission.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/EntityPermission.cs
rename to src/Umbraco.Core/Models/Membership/EntityPermission.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/EntityPermissionCollection.cs b/src/Umbraco.Core/Models/Membership/EntityPermissionCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/EntityPermissionCollection.cs
rename to src/Umbraco.Core/Models/Membership/EntityPermissionCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/EntityPermissionSet.cs b/src/Umbraco.Core/Models/Membership/EntityPermissionSet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/EntityPermissionSet.cs
rename to src/Umbraco.Core/Models/Membership/EntityPermissionSet.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/IMembershipUser.cs b/src/Umbraco.Core/Models/Membership/IMembershipUser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/IMembershipUser.cs
rename to src/Umbraco.Core/Models/Membership/IMembershipUser.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/IProfile.cs b/src/Umbraco.Core/Models/Membership/IProfile.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/IProfile.cs
rename to src/Umbraco.Core/Models/Membership/IProfile.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/IReadOnlyUserGroup.cs b/src/Umbraco.Core/Models/Membership/IReadOnlyUserGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/IReadOnlyUserGroup.cs
rename to src/Umbraco.Core/Models/Membership/IReadOnlyUserGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/IUser.cs b/src/Umbraco.Core/Models/Membership/IUser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/IUser.cs
rename to src/Umbraco.Core/Models/Membership/IUser.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/IUserGroup.cs b/src/Umbraco.Core/Models/Membership/IUserGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/IUserGroup.cs
rename to src/Umbraco.Core/Models/Membership/IUserGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs b/src/Umbraco.Core/Models/Membership/MemberCountType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
rename to src/Umbraco.Core/Models/Membership/MemberCountType.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/MemberExportModel.cs b/src/Umbraco.Core/Models/Membership/MemberExportModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/MemberExportModel.cs
rename to src/Umbraco.Core/Models/Membership/MemberExportModel.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/MemberExportProperty.cs b/src/Umbraco.Core/Models/Membership/MemberExportProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/MemberExportProperty.cs
rename to src/Umbraco.Core/Models/Membership/MemberExportProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/ReadOnlyUserGroup.cs b/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/ReadOnlyUserGroup.cs
rename to src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/UserProfile.cs b/src/Umbraco.Core/Models/Membership/UserProfile.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/UserProfile.cs
rename to src/Umbraco.Core/Models/Membership/UserProfile.cs
diff --git a/src/Umbraco.Abstractions/Models/Membership/UserState.cs b/src/Umbraco.Core/Models/Membership/UserState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Membership/UserState.cs
rename to src/Umbraco.Core/Models/Membership/UserState.cs
diff --git a/src/Umbraco.Abstractions/Models/MigrationEntry.cs b/src/Umbraco.Core/Models/MigrationEntry.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/MigrationEntry.cs
rename to src/Umbraco.Core/Models/MigrationEntry.cs
diff --git a/src/Umbraco.Abstractions/Models/Notification.cs b/src/Umbraco.Core/Models/Notification.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Notification.cs
rename to src/Umbraco.Core/Models/Notification.cs
diff --git a/src/Umbraco.Abstractions/Models/NotificationEmailBodyParams.cs b/src/Umbraco.Core/Models/NotificationEmailBodyParams.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/NotificationEmailBodyParams.cs
rename to src/Umbraco.Core/Models/NotificationEmailBodyParams.cs
diff --git a/src/Umbraco.Abstractions/Models/NotificationEmailSubjectParams.cs b/src/Umbraco.Core/Models/NotificationEmailSubjectParams.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/NotificationEmailSubjectParams.cs
rename to src/Umbraco.Core/Models/NotificationEmailSubjectParams.cs
diff --git a/src/Umbraco.Abstractions/Models/PackageInstallModel.cs b/src/Umbraco.Core/Models/PackageInstallModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PackageInstallModel.cs
rename to src/Umbraco.Core/Models/PackageInstallModel.cs
diff --git a/src/Umbraco.Abstractions/Models/PackageInstallResult.cs b/src/Umbraco.Core/Models/PackageInstallResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PackageInstallResult.cs
rename to src/Umbraco.Core/Models/PackageInstallResult.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/ActionRunAt.cs b/src/Umbraco.Core/Models/Packaging/ActionRunAt.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/ActionRunAt.cs
rename to src/Umbraco.Core/Models/Packaging/ActionRunAt.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/CompiledPackage.cs b/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/CompiledPackage.cs
rename to src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/CompiledPackageDocument.cs b/src/Umbraco.Core/Models/Packaging/CompiledPackageDocument.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/CompiledPackageDocument.cs
rename to src/Umbraco.Core/Models/Packaging/CompiledPackageDocument.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/CompiledPackageFile.cs b/src/Umbraco.Core/Models/Packaging/CompiledPackageFile.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/CompiledPackageFile.cs
rename to src/Umbraco.Core/Models/Packaging/CompiledPackageFile.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/IPackageInfo.cs b/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/IPackageInfo.cs
rename to src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/PackageAction.cs b/src/Umbraco.Core/Models/Packaging/PackageAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/PackageAction.cs
rename to src/Umbraco.Core/Models/Packaging/PackageAction.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/PreInstallWarnings.cs b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/PreInstallWarnings.cs
rename to src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
diff --git a/src/Umbraco.Abstractions/Models/Packaging/RequirementsType.cs b/src/Umbraco.Core/Models/Packaging/RequirementsType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Packaging/RequirementsType.cs
rename to src/Umbraco.Core/Models/Packaging/RequirementsType.cs
diff --git a/src/Umbraco.Abstractions/Models/PagedResult.cs b/src/Umbraco.Core/Models/PagedResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PagedResult.cs
rename to src/Umbraco.Core/Models/PagedResult.cs
diff --git a/src/Umbraco.Abstractions/Models/PagedResultOfT.cs b/src/Umbraco.Core/Models/PagedResultOfT.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PagedResultOfT.cs
rename to src/Umbraco.Core/Models/PagedResultOfT.cs
diff --git a/src/Umbraco.Abstractions/Models/PartialView.cs b/src/Umbraco.Core/Models/PartialView.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PartialView.cs
rename to src/Umbraco.Core/Models/PartialView.cs
diff --git a/src/Umbraco.Abstractions/Models/PartialViewMacroModel.cs b/src/Umbraco.Core/Models/PartialViewMacroModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PartialViewMacroModel.cs
rename to src/Umbraco.Core/Models/PartialViewMacroModel.cs
diff --git a/src/Umbraco.Abstractions/Models/PartialViewMacroModelExtensions.cs b/src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PartialViewMacroModelExtensions.cs
rename to src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/PartialViewType.cs b/src/Umbraco.Core/Models/PartialViewType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PartialViewType.cs
rename to src/Umbraco.Core/Models/PartialViewType.cs
diff --git a/src/Umbraco.Abstractions/Models/PasswordChangedModel.cs b/src/Umbraco.Core/Models/PasswordChangedModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PasswordChangedModel.cs
rename to src/Umbraco.Core/Models/PasswordChangedModel.cs
diff --git a/src/Umbraco.Abstractions/Models/PostRedirectModel.cs b/src/Umbraco.Core/Models/PostRedirectModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PostRedirectModel.cs
rename to src/Umbraco.Core/Models/PostRedirectModel.cs
diff --git a/src/Umbraco.Abstractions/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PropertyGroup.cs
rename to src/Umbraco.Core/Models/PropertyGroup.cs
diff --git a/src/Umbraco.Abstractions/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PropertyGroupCollection.cs
rename to src/Umbraco.Core/Models/PropertyGroupCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/PropertyTypeCollection.cs b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PropertyTypeCollection.cs
rename to src/Umbraco.Core/Models/PropertyTypeCollection.cs
diff --git a/src/Umbraco.Abstractions/Models/PublicAccessEntry.cs b/src/Umbraco.Core/Models/PublicAccessEntry.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublicAccessEntry.cs
rename to src/Umbraco.Core/Models/PublicAccessEntry.cs
diff --git a/src/Umbraco.Abstractions/Models/PublicAccessRule.cs b/src/Umbraco.Core/Models/PublicAccessRule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublicAccessRule.cs
rename to src/Umbraco.Core/Models/PublicAccessRule.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/Fallback.cs b/src/Umbraco.Core/Models/PublishedContent/Fallback.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/Fallback.cs
rename to src/Umbraco.Core/Models/PublishedContent/Fallback.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/HttpContextVariationContextAccessor.cs b/src/Umbraco.Core/Models/PublishedContent/HttpContextVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/HttpContextVariationContextAccessor.cs
rename to src/Umbraco.Core/Models/PublishedContent/HttpContextVariationContextAccessor.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/HybridVariationContextAccessor.cs b/src/Umbraco.Core/Models/PublishedContent/HybridVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/HybridVariationContextAccessor.cs
rename to src/Umbraco.Core/Models/PublishedContent/HybridVariationContextAccessor.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/ILivePublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/ILivePublishedModelFactory.cs
rename to src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContent.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContentType.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedContentTypeFactory.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedElement.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedElement.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedElement.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedElement.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedModelFactory.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedProperty.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedProperty.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedPropertyType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedPropertyType.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedPropertyType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IPublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IPublishedValueFallback.cs
rename to src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IVariationContextAccessor.cs b/src/Umbraco.Core/Models/PublishedContent/IVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IVariationContextAccessor.cs
rename to src/Umbraco.Core/Models/PublishedContent/IVariationContextAccessor.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/IndexedArrayItem.cs b/src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/IndexedArrayItem.cs
rename to src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/ModelType.cs b/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/ModelType.cs
rename to src/Umbraco.Core/Models/PublishedContent/ModelType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/NoopPublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/NoopPublishedModelFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/NoopPublishedModelFactory.cs
rename to src/Umbraco.Core/Models/PublishedContent/NoopPublishedModelFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/NoopPublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/NoopPublishedValueFallback.cs
rename to src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentBase.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentBase.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentType.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentTypeConverter.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentTypeConverter.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedContentWrapped.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedCultureInfos.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedCultureInfos.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedDataType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedDataType.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedElementModel.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedElementModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedElementModel.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedElementModel.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedElementWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedElementWrapped.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedElementWrapped.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedElementWrapped.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedItemType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedItemType.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedModelAttribute.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedModelAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedModelAttribute.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedModelAttribute.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedPropertyBase.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedPropertyBase.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedPropertyType.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedSearchResult.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedSearchResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedSearchResult.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedSearchResult.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/PublishedValueFallback.cs
rename to src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/RawValueProperty.cs b/src/Umbraco.Core/Models/PublishedContent/RawValueProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/RawValueProperty.cs
rename to src/Umbraco.Core/Models/PublishedContent/RawValueProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs b/src/Umbraco.Core/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
rename to src/Umbraco.Core/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/UrlMode.cs b/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/UrlMode.cs
rename to src/Umbraco.Core/Models/PublishedContent/UrlMode.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/VariationContext.cs b/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/VariationContext.cs
rename to src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedContent/VariationContextAccessorExtensions.cs b/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedContent/VariationContextAccessorExtensions.cs
rename to src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/PublishedState.cs b/src/Umbraco.Core/Models/PublishedState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/PublishedState.cs
rename to src/Umbraco.Core/Models/PublishedState.cs
diff --git a/src/Umbraco.Abstractions/Models/Range.cs b/src/Umbraco.Core/Models/Range.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Range.cs
rename to src/Umbraco.Core/Models/Range.cs
diff --git a/src/Umbraco.Abstractions/Models/RedirectUrl.cs b/src/Umbraco.Core/Models/RedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/RedirectUrl.cs
rename to src/Umbraco.Core/Models/RedirectUrl.cs
diff --git a/src/Umbraco.Abstractions/Models/Relation.cs b/src/Umbraco.Core/Models/Relation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Relation.cs
rename to src/Umbraco.Core/Models/Relation.cs
diff --git a/src/Umbraco.Abstractions/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/RelationType.cs
rename to src/Umbraco.Core/Models/RelationType.cs
diff --git a/src/Umbraco.Abstractions/Models/RequestPasswordResetModel.cs b/src/Umbraco.Core/Models/RequestPasswordResetModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/RequestPasswordResetModel.cs
rename to src/Umbraco.Core/Models/RequestPasswordResetModel.cs
diff --git a/src/Umbraco.Abstractions/Models/Script.cs b/src/Umbraco.Core/Models/Script.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Script.cs
rename to src/Umbraco.Core/Models/Script.cs
diff --git a/src/Umbraco.Abstractions/Models/SendCodeViewModel.cs b/src/Umbraco.Core/Models/SendCodeViewModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/SendCodeViewModel.cs
rename to src/Umbraco.Core/Models/SendCodeViewModel.cs
diff --git a/src/Umbraco.Abstractions/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ServerRegistration.cs
rename to src/Umbraco.Core/Models/ServerRegistration.cs
diff --git a/src/Umbraco.Abstractions/Models/SetPasswordModel.cs b/src/Umbraco.Core/Models/SetPasswordModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/SetPasswordModel.cs
rename to src/Umbraco.Core/Models/SetPasswordModel.cs
diff --git a/src/Umbraco.Abstractions/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/SimpleContentType.cs
rename to src/Umbraco.Core/Models/SimpleContentType.cs
diff --git a/src/Umbraco.Abstractions/Models/Stylesheet.cs b/src/Umbraco.Core/Models/Stylesheet.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Stylesheet.cs
rename to src/Umbraco.Core/Models/Stylesheet.cs
diff --git a/src/Umbraco.Abstractions/Models/StylesheetProperty.cs b/src/Umbraco.Core/Models/StylesheetProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/StylesheetProperty.cs
rename to src/Umbraco.Core/Models/StylesheetProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/Tag.cs b/src/Umbraco.Core/Models/Tag.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Tag.cs
rename to src/Umbraco.Core/Models/Tag.cs
diff --git a/src/Umbraco.Abstractions/Models/TagModel.cs b/src/Umbraco.Core/Models/TagModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TagModel.cs
rename to src/Umbraco.Core/Models/TagModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TaggableObjectTypes.cs b/src/Umbraco.Core/Models/TaggableObjectTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TaggableObjectTypes.cs
rename to src/Umbraco.Core/Models/TaggableObjectTypes.cs
diff --git a/src/Umbraco.Abstractions/Models/TaggedEntity.cs b/src/Umbraco.Core/Models/TaggedEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TaggedEntity.cs
rename to src/Umbraco.Core/Models/TaggedEntity.cs
diff --git a/src/Umbraco.Abstractions/Models/TaggedProperty.cs b/src/Umbraco.Core/Models/TaggedProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TaggedProperty.cs
rename to src/Umbraco.Core/Models/TaggedProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/TagsStorageType.cs b/src/Umbraco.Core/Models/TagsStorageType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TagsStorageType.cs
rename to src/Umbraco.Core/Models/TagsStorageType.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateNode.cs b/src/Umbraco.Core/Models/TemplateNode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateNode.cs
rename to src/Umbraco.Core/Models/TemplateNode.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/ContentTypeModel.cs b/src/Umbraco.Core/Models/TemplateQuery/ContentTypeModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/ContentTypeModel.cs
rename to src/Umbraco.Core/Models/TemplateQuery/ContentTypeModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/Operator.cs b/src/Umbraco.Core/Models/TemplateQuery/Operator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/Operator.cs
rename to src/Umbraco.Core/Models/TemplateQuery/Operator.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/OperatorFactory.cs b/src/Umbraco.Core/Models/TemplateQuery/OperatorFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/OperatorFactory.cs
rename to src/Umbraco.Core/Models/TemplateQuery/OperatorFactory.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/OperatorTerm.cs b/src/Umbraco.Core/Models/TemplateQuery/OperatorTerm.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/OperatorTerm.cs
rename to src/Umbraco.Core/Models/TemplateQuery/OperatorTerm.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/PropertyModel.cs b/src/Umbraco.Core/Models/TemplateQuery/PropertyModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/PropertyModel.cs
rename to src/Umbraco.Core/Models/TemplateQuery/PropertyModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Core/Models/TemplateQuery/QueryCondition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/QueryCondition.cs
rename to src/Umbraco.Core/Models/TemplateQuery/QueryCondition.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/QueryConditionExtensions.cs b/src/Umbraco.Core/Models/TemplateQuery/QueryConditionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/QueryConditionExtensions.cs
rename to src/Umbraco.Core/Models/TemplateQuery/QueryConditionExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/QueryModel.cs b/src/Umbraco.Core/Models/TemplateQuery/QueryModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/QueryModel.cs
rename to src/Umbraco.Core/Models/TemplateQuery/QueryModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/QueryResultModel.cs b/src/Umbraco.Core/Models/TemplateQuery/QueryResultModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/QueryResultModel.cs
rename to src/Umbraco.Core/Models/TemplateQuery/QueryResultModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/SortExpression.cs b/src/Umbraco.Core/Models/TemplateQuery/SortExpression.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/SortExpression.cs
rename to src/Umbraco.Core/Models/TemplateQuery/SortExpression.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/SourceModel.cs b/src/Umbraco.Core/Models/TemplateQuery/SourceModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/SourceModel.cs
rename to src/Umbraco.Core/Models/TemplateQuery/SourceModel.cs
diff --git a/src/Umbraco.Abstractions/Models/TemplateQuery/TemplateQueryResult.cs b/src/Umbraco.Core/Models/TemplateQuery/TemplateQueryResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/TemplateQuery/TemplateQueryResult.cs
rename to src/Umbraco.Core/Models/TemplateQuery/TemplateQueryResult.cs
diff --git a/src/Umbraco.Abstractions/Models/Trees/ActionMenuItem.cs b/src/Umbraco.Core/Models/Trees/ActionMenuItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Trees/ActionMenuItem.cs
rename to src/Umbraco.Core/Models/Trees/ActionMenuItem.cs
diff --git a/src/Umbraco.Abstractions/Models/Trees/CreateChildEntity.cs b/src/Umbraco.Core/Models/Trees/CreateChildEntity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Trees/CreateChildEntity.cs
rename to src/Umbraco.Core/Models/Trees/CreateChildEntity.cs
diff --git a/src/Umbraco.Abstractions/Models/Trees/ExportMember.cs b/src/Umbraco.Core/Models/Trees/ExportMember.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Trees/ExportMember.cs
rename to src/Umbraco.Core/Models/Trees/ExportMember.cs
diff --git a/src/Umbraco.Abstractions/Models/Trees/MenuItem.cs b/src/Umbraco.Core/Models/Trees/MenuItem.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Trees/MenuItem.cs
rename to src/Umbraco.Core/Models/Trees/MenuItem.cs
diff --git a/src/Umbraco.Abstractions/Models/Trees/RefreshNode.cs b/src/Umbraco.Core/Models/Trees/RefreshNode.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Trees/RefreshNode.cs
rename to src/Umbraco.Core/Models/Trees/RefreshNode.cs
diff --git a/src/Umbraco.Abstractions/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UmbracoDomain.cs
rename to src/Umbraco.Core/Models/UmbracoDomain.cs
diff --git a/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs
rename to src/Umbraco.Core/Models/UmbracoObjectTypes.cs
diff --git a/src/Umbraco.Abstractions/Models/UmbracoProperty.cs b/src/Umbraco.Core/Models/UmbracoProperty.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UmbracoProperty.cs
rename to src/Umbraco.Core/Models/UmbracoProperty.cs
diff --git a/src/Umbraco.Abstractions/Models/UmbracoUserExtensions.cs b/src/Umbraco.Core/Models/UmbracoUserExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UmbracoUserExtensions.cs
rename to src/Umbraco.Core/Models/UmbracoUserExtensions.cs
diff --git a/src/Umbraco.Abstractions/Models/UnLinkLoginModel.cs b/src/Umbraco.Core/Models/UnLinkLoginModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UnLinkLoginModel.cs
rename to src/Umbraco.Core/Models/UnLinkLoginModel.cs
diff --git a/src/Umbraco.Abstractions/Models/UpgradeCheckResponse.cs b/src/Umbraco.Core/Models/UpgradeCheckResponse.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UpgradeCheckResponse.cs
rename to src/Umbraco.Core/Models/UpgradeCheckResponse.cs
diff --git a/src/Umbraco.Abstractions/Models/UserTourStatus.cs b/src/Umbraco.Core/Models/UserTourStatus.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/UserTourStatus.cs
rename to src/Umbraco.Core/Models/UserTourStatus.cs
diff --git a/src/Umbraco.Abstractions/Models/ValidatePasswordResetCodeModel.cs b/src/Umbraco.Core/Models/ValidatePasswordResetCodeModel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ValidatePasswordResetCodeModel.cs
rename to src/Umbraco.Core/Models/ValidatePasswordResetCodeModel.cs
diff --git a/src/Umbraco.Abstractions/Models/Validation/RequiredForPersistenceAttribute.cs b/src/Umbraco.Core/Models/Validation/RequiredForPersistenceAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/Validation/RequiredForPersistenceAttribute.cs
rename to src/Umbraco.Core/Models/Validation/RequiredForPersistenceAttribute.cs
diff --git a/src/Umbraco.Abstractions/Models/ValueStorageType.cs b/src/Umbraco.Core/Models/ValueStorageType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/ValueStorageType.cs
rename to src/Umbraco.Core/Models/ValueStorageType.cs
diff --git a/src/Umbraco.Abstractions/MonitorLock.cs b/src/Umbraco.Core/MonitorLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/MonitorLock.cs
rename to src/Umbraco.Core/MonitorLock.cs
diff --git a/src/Umbraco.Abstractions/NameValueCollectionExtensions.cs b/src/Umbraco.Core/NameValueCollectionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/NameValueCollectionExtensions.cs
rename to src/Umbraco.Core/NameValueCollectionExtensions.cs
diff --git a/src/Umbraco.Abstractions/NamedUdiRange.cs b/src/Umbraco.Core/NamedUdiRange.cs
similarity index 100%
rename from src/Umbraco.Abstractions/NamedUdiRange.cs
rename to src/Umbraco.Core/NamedUdiRange.cs
diff --git a/src/Umbraco.Abstractions/Net/IIpResolver.cs b/src/Umbraco.Core/Net/IIpResolver.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Net/IIpResolver.cs
rename to src/Umbraco.Core/Net/IIpResolver.cs
diff --git a/src/Umbraco.Abstractions/Net/ISessionIdResolver.cs b/src/Umbraco.Core/Net/ISessionIdResolver.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Net/ISessionIdResolver.cs
rename to src/Umbraco.Core/Net/ISessionIdResolver.cs
diff --git a/src/Umbraco.Abstractions/NetworkHelper.cs b/src/Umbraco.Core/NetworkHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/NetworkHelper.cs
rename to src/Umbraco.Core/NetworkHelper.cs
diff --git a/src/Umbraco.Abstractions/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ObjectExtensions.cs
rename to src/Umbraco.Core/ObjectExtensions.cs
diff --git a/src/Umbraco.Abstractions/PackageActions/AllowDoctype.cs b/src/Umbraco.Core/PackageActions/AllowDoctype.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PackageActions/AllowDoctype.cs
rename to src/Umbraco.Core/PackageActions/AllowDoctype.cs
diff --git a/src/Umbraco.Abstractions/PackageActions/IPackageAction.cs b/src/Umbraco.Core/PackageActions/IPackageAction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PackageActions/IPackageAction.cs
rename to src/Umbraco.Core/PackageActions/IPackageAction.cs
diff --git a/src/Umbraco.Abstractions/PackageActions/PackageActionCollection.cs b/src/Umbraco.Core/PackageActions/PackageActionCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PackageActions/PackageActionCollection.cs
rename to src/Umbraco.Core/PackageActions/PackageActionCollection.cs
diff --git a/src/Umbraco.Abstractions/PackageActions/PackageActionCollectionBuilder.cs b/src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PackageActions/PackageActionCollectionBuilder.cs
rename to src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/PackageActions/PublishRootDocument.cs b/src/Umbraco.Core/PackageActions/PublishRootDocument.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PackageActions/PublishRootDocument.cs
rename to src/Umbraco.Core/PackageActions/PublishRootDocument.cs
diff --git a/src/Umbraco.Abstractions/Packaging/CompiledPackageXmlParser.cs b/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/CompiledPackageXmlParser.cs
rename to src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
diff --git a/src/Umbraco.Abstractions/Packaging/ConflictingPackageData.cs b/src/Umbraco.Core/Packaging/ConflictingPackageData.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/ConflictingPackageData.cs
rename to src/Umbraco.Core/Packaging/ConflictingPackageData.cs
diff --git a/src/Umbraco.Abstractions/Packaging/ICreatedPackagesRepository.cs b/src/Umbraco.Core/Packaging/ICreatedPackagesRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/ICreatedPackagesRepository.cs
rename to src/Umbraco.Core/Packaging/ICreatedPackagesRepository.cs
diff --git a/src/Umbraco.Abstractions/Packaging/IInstalledPackagesRepository.cs b/src/Umbraco.Core/Packaging/IInstalledPackagesRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/IInstalledPackagesRepository.cs
rename to src/Umbraco.Core/Packaging/IInstalledPackagesRepository.cs
diff --git a/src/Umbraco.Abstractions/Packaging/IPackageActionRunner.cs b/src/Umbraco.Core/Packaging/IPackageActionRunner.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/IPackageActionRunner.cs
rename to src/Umbraco.Core/Packaging/IPackageActionRunner.cs
diff --git a/src/Umbraco.Abstractions/Packaging/IPackageDefinitionRepository.cs b/src/Umbraco.Core/Packaging/IPackageDefinitionRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/IPackageDefinitionRepository.cs
rename to src/Umbraco.Core/Packaging/IPackageDefinitionRepository.cs
diff --git a/src/Umbraco.Abstractions/Packaging/IPackageInstallation.cs b/src/Umbraco.Core/Packaging/IPackageInstallation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/IPackageInstallation.cs
rename to src/Umbraco.Core/Packaging/IPackageInstallation.cs
diff --git a/src/Umbraco.Abstractions/Packaging/InstallationSummary.cs b/src/Umbraco.Core/Packaging/InstallationSummary.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/InstallationSummary.cs
rename to src/Umbraco.Core/Packaging/InstallationSummary.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageActionRunner.cs b/src/Umbraco.Core/Packaging/PackageActionRunner.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageActionRunner.cs
rename to src/Umbraco.Core/Packaging/PackageActionRunner.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageDefinition.cs b/src/Umbraco.Core/Packaging/PackageDefinition.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageDefinition.cs
rename to src/Umbraco.Core/Packaging/PackageDefinition.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageDefinitionXmlParser.cs b/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageDefinitionXmlParser.cs
rename to src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageExtraction.cs b/src/Umbraco.Core/Packaging/PackageExtraction.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageExtraction.cs
rename to src/Umbraco.Core/Packaging/PackageExtraction.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageFileInstallation.cs b/src/Umbraco.Core/Packaging/PackageFileInstallation.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageFileInstallation.cs
rename to src/Umbraco.Core/Packaging/PackageFileInstallation.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackageInstallType.cs b/src/Umbraco.Core/Packaging/PackageInstallType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackageInstallType.cs
rename to src/Umbraco.Core/Packaging/PackageInstallType.cs
diff --git a/src/Umbraco.Abstractions/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/PackagesRepository.cs
rename to src/Umbraco.Core/Packaging/PackagesRepository.cs
diff --git a/src/Umbraco.Abstractions/Packaging/UninstallationSummary.cs b/src/Umbraco.Core/Packaging/UninstallationSummary.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Packaging/UninstallationSummary.cs
rename to src/Umbraco.Core/Packaging/UninstallationSummary.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Constants-DatabaseSchema.cs
rename to src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Constants-DbProviderNames.cs b/src/Umbraco.Core/Persistence/Constants-DbProviderNames.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Constants-DbProviderNames.cs
rename to src/Umbraco.Core/Persistence/Constants-DbProviderNames.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Constants-Locks.cs b/src/Umbraco.Core/Persistence/Constants-Locks.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Constants-Locks.cs
rename to src/Umbraco.Core/Persistence/Constants-Locks.cs
diff --git a/src/Umbraco.Abstractions/Persistence/IQueryRepository.cs b/src/Umbraco.Core/Persistence/IQueryRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/IQueryRepository.cs
rename to src/Umbraco.Core/Persistence/IQueryRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/IReadRepository.cs b/src/Umbraco.Core/Persistence/IReadRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/IReadRepository.cs
rename to src/Umbraco.Core/Persistence/IReadRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs b/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs
rename to src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/IRepository.cs b/src/Umbraco.Core/Persistence/IRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/IRepository.cs
rename to src/Umbraco.Core/Persistence/IRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/IWriteRepository.cs b/src/Umbraco.Core/Persistence/IWriteRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/IWriteRepository.cs
rename to src/Umbraco.Core/Persistence/IWriteRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs b/src/Umbraco.Core/Persistence/Querying/IQuery.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs
rename to src/Umbraco.Core/Persistence/Querying/IQuery.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Querying/StringPropertyMatchType.cs b/src/Umbraco.Core/Persistence/Querying/StringPropertyMatchType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Querying/StringPropertyMatchType.cs
rename to src/Umbraco.Core/Persistence/Querying/StringPropertyMatchType.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Querying/ValuePropertyMatchType.cs b/src/Umbraco.Core/Persistence/Querying/ValuePropertyMatchType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Querying/ValuePropertyMatchType.cs
rename to src/Umbraco.Core/Persistence/Querying/ValuePropertyMatchType.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IAuditEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IAuditEntryRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IAuditEntryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IAuditEntryRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IConsentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IConsentRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IConsentRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IConsentRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IContentTypeCommonRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IDataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IDataTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IDictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IDictionaryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IDocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IDocumentTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IDomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IDomainRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IEntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IEntityContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IExternalLoginRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IInstallationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IInstallationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/ILanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/ILanguageRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IMacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IMediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IMediaTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IMemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IMemberGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/INotificationsRepository.cs b/src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/INotificationsRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IRedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IRedirectUrlRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IRelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IRelationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IRelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IRelationTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IServerRegistrationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/ITagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/ITagRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IUpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IUpgradeCheckRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IUserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IUserGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/InstallationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/InstallationRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/InstallationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/InstallationRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/RepositoryCacheKeys.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryCacheKeys.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/RepositoryCacheKeys.cs
rename to src/Umbraco.Core/Persistence/Repositories/RepositoryCacheKeys.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/UpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/UpgradeCheckRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs
diff --git a/src/Umbraco.Abstractions/Persistence/SqlExtensionsStatics.cs b/src/Umbraco.Core/Persistence/SqlExtensionsStatics.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/SqlExtensionsStatics.cs
rename to src/Umbraco.Core/Persistence/SqlExtensionsStatics.cs
diff --git a/src/Umbraco.Abstractions/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Properties/AssemblyInfo.cs
rename to src/Umbraco.Core/Properties/AssemblyInfo.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ColorPickerConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ColorPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ColorPickerConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/ColorPickerConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ConfigurationField.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ConfigurationField.cs
rename to src/Umbraco.Core/PropertyEditors/ConfigurationField.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ConfigurationFieldAttribute.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationFieldAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ConfigurationFieldAttribute.cs
rename to src/Umbraco.Core/PropertyEditors/ConfigurationFieldAttribute.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ContentPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ContentPickerConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/ContentPickerConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DataEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DataEditorAttribute.cs
rename to src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DataEditorCollection.cs b/src/Umbraco.Core/PropertyEditors/DataEditorCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DataEditorCollection.cs
rename to src/Umbraco.Core/PropertyEditors/DataEditorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DataEditorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/DataEditorCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DataEditorCollectionBuilder.cs
rename to src/Umbraco.Core/PropertyEditors/DataEditorCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DateTimeConfiguration.cs b/src/Umbraco.Core/PropertyEditors/DateTimeConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DateTimeConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/DateTimeConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DefaultPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DefaultPropertyIndexValueFactory.cs
rename to src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DefaultPropertyValueConverterAttribute.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
rename to src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/DropDownFlexibleConfiguration.cs b/src/Umbraco.Core/PropertyEditors/DropDownFlexibleConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/DropDownFlexibleConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/DropDownFlexibleConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/EditorType.cs b/src/Umbraco.Core/PropertyEditors/EditorType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/EditorType.cs
rename to src/Umbraco.Core/PropertyEditors/EditorType.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/EmailAddressConfiguration.cs b/src/Umbraco.Core/PropertyEditors/EmailAddressConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/EmailAddressConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/EmailAddressConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/GridEditor.cs b/src/Umbraco.Core/PropertyEditors/GridEditor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/GridEditor.cs
rename to src/Umbraco.Core/PropertyEditors/GridEditor.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IConfigurationEditor.cs b/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IConfigurationEditor.cs
rename to src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IConfigureValueType.cs b/src/Umbraco.Core/PropertyEditors/IConfigureValueType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IConfigureValueType.cs
rename to src/Umbraco.Core/PropertyEditors/IConfigureValueType.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IDataEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IDataEditor.cs
rename to src/Umbraco.Core/PropertyEditors/IDataEditor.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IIgnoreUserStartNodesConfig.cs b/src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IIgnoreUserStartNodesConfig.cs
rename to src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IManifestValueValidator.cs b/src/Umbraco.Core/PropertyEditors/IManifestValueValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IManifestValueValidator.cs
rename to src/Umbraco.Core/PropertyEditors/IManifestValueValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IPropertyIndexValueFactory.cs
rename to src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IPropertyValueConverter.cs b/src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IPropertyValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IValueFormatValidator.cs b/src/Umbraco.Core/PropertyEditors/IValueFormatValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IValueFormatValidator.cs
rename to src/Umbraco.Core/PropertyEditors/IValueFormatValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IValueRequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/IValueRequiredValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IValueRequiredValidator.cs
rename to src/Umbraco.Core/PropertyEditors/IValueRequiredValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/IValueValidator.cs b/src/Umbraco.Core/PropertyEditors/IValueValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/IValueValidator.cs
rename to src/Umbraco.Core/PropertyEditors/IValueValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ImageCropperConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ImageCropperConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ImageCropperConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/ImageCropperConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/LabelConfiguration.cs b/src/Umbraco.Core/PropertyEditors/LabelConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/LabelConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/LabelConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollection.cs b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollection.cs
rename to src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
rename to src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs b/src/Umbraco.Core/PropertyEditors/MarkdownConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/MarkdownConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MediaPickerConfiguration.cs b/src/Umbraco.Core/PropertyEditors/MediaPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MediaPickerConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/MediaPickerConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MediaUrlGeneratorCollection.cs b/src/Umbraco.Core/PropertyEditors/MediaUrlGeneratorCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MediaUrlGeneratorCollection.cs
rename to src/Umbraco.Core/PropertyEditors/MediaUrlGeneratorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MediaUrlGeneratorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/MediaUrlGeneratorCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MediaUrlGeneratorCollectionBuilder.cs
rename to src/Umbraco.Core/PropertyEditors/MediaUrlGeneratorCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs b/src/Umbraco.Core/PropertyEditors/MultiUrlPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/MultiUrlPickerConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/MultipleTextStringConfiguration.cs b/src/Umbraco.Core/PropertyEditors/MultipleTextStringConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/MultipleTextStringConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/MultipleTextStringConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ParameterEditorCollection.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ParameterEditorCollection.cs
rename to src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyCacheLevel.cs b/src/Umbraco.Core/PropertyEditors/PropertyCacheLevel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyCacheLevel.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyCacheLevel.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyEditorCollection.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyEditorCollection.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyEditorTagsExtensions.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyEditorTagsExtensions.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterBase.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterBase.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterCollection.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterCollection.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterCollectionBuilder.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/PropertyValueLevel.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueLevel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/PropertyValueLevel.cs
rename to src/Umbraco.Core/PropertyEditors/PropertyValueLevel.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/SliderConfiguration.cs b/src/Umbraco.Core/PropertyEditors/SliderConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/SliderConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/SliderConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/TagConfiguration.cs b/src/Umbraco.Core/PropertyEditors/TagConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/TagConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/TagConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/TagsPropertyEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/TagsPropertyEditorAttribute.cs
rename to src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/TextAreaConfiguration.cs b/src/Umbraco.Core/PropertyEditors/TextAreaConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/TextAreaConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/TextAreaConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/TextboxConfiguration.cs b/src/Umbraco.Core/PropertyEditors/TextboxConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/TextboxConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/TextboxConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Core/PropertyEditors/TrueFalseConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/TrueFalseConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/TrueFalseConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/DecimalValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/DecimalValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/DelimitedValueValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/DelimitedValueValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/EmailValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/EmailValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/IntegerValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/IntegerValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/RegexValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/RegexValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/Validators/RequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/Validators/RequiredValidator.cs
rename to src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/DatePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/DecimalValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/DecimalValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/IntegerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/IntegerValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MustBeStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MustBeStringValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/MustBeStringValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/MustBeStringValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/SliderValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/TagsValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/TagsValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/TextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/TextStringValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/TextStringValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/TextStringValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/UploadPropertyConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/UploadPropertyConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/UploadPropertyConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/UploadPropertyConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueConverters/YesNoValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/YesNoValueConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueConverters/YesNoValueConverter.cs
rename to src/Umbraco.Core/PropertyEditors/ValueConverters/YesNoValueConverter.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueListConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ValueListConfiguration.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueListConfiguration.cs
rename to src/Umbraco.Core/PropertyEditors/ValueListConfiguration.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ValueTypes.cs b/src/Umbraco.Core/PropertyEditors/ValueTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PropertyEditors/ValueTypes.cs
rename to src/Umbraco.Core/PropertyEditors/ValueTypes.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/DefaultCultureAccessor.cs b/src/Umbraco.Core/PublishedCache/DefaultCultureAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/DefaultCultureAccessor.cs
rename to src/Umbraco.Core/PublishedCache/DefaultCultureAccessor.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IDefaultCultureAccessor.cs b/src/Umbraco.Core/PublishedCache/IDefaultCultureAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IDefaultCultureAccessor.cs
rename to src/Umbraco.Core/PublishedCache/IDefaultCultureAccessor.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IDomainCache.cs b/src/Umbraco.Core/PublishedCache/IDomainCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IDomainCache.cs
rename to src/Umbraco.Core/PublishedCache/IDomainCache.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedCache.cs b/src/Umbraco.Core/PublishedCache/IPublishedCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedCache.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedCache.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedContentCache.cs b/src/Umbraco.Core/PublishedCache/IPublishedContentCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedContentCache.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedContentCache.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedMediaCache.cs b/src/Umbraco.Core/PublishedCache/IPublishedMediaCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedMediaCache.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedMediaCache.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedMemberCache.cs b/src/Umbraco.Core/PublishedCache/IPublishedMemberCache.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedMemberCache.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedMemberCache.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshot.cs b/src/Umbraco.Core/PublishedCache/IPublishedSnapshot.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshot.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedSnapshot.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshotAccessor.cs b/src/Umbraco.Core/PublishedCache/IPublishedSnapshotAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshotAccessor.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedSnapshotAccessor.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshotService.cs b/src/Umbraco.Core/PublishedCache/IPublishedSnapshotService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/IPublishedSnapshotService.cs
rename to src/Umbraco.Core/PublishedCache/IPublishedSnapshotService.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/PublishedCacheBase.cs b/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/PublishedCacheBase.cs
rename to src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/PublishedElement.cs b/src/Umbraco.Core/PublishedCache/PublishedElement.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/PublishedElement.cs
rename to src/Umbraco.Core/PublishedCache/PublishedElement.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/PublishedElementPropertyBase.cs b/src/Umbraco.Core/PublishedCache/PublishedElementPropertyBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/PublishedElementPropertyBase.cs
rename to src/Umbraco.Core/PublishedCache/PublishedElementPropertyBase.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/PublishedMember.cs b/src/Umbraco.Core/PublishedCache/PublishedMember.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/PublishedMember.cs
rename to src/Umbraco.Core/PublishedCache/PublishedMember.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/PublishedSnapshotServiceBase.cs b/src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/PublishedSnapshotServiceBase.cs
rename to src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/UmbracoContextPublishedSnapshotAccessor.cs b/src/Umbraco.Core/PublishedCache/UmbracoContextPublishedSnapshotAccessor.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedCache/UmbracoContextPublishedSnapshotAccessor.cs
rename to src/Umbraco.Core/PublishedCache/UmbracoContextPublishedSnapshotAccessor.cs
diff --git a/src/Umbraco.Abstractions/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedContentExtensions.cs
rename to src/Umbraco.Core/PublishedContentExtensions.cs
diff --git a/src/Umbraco.Abstractions/PublishedElementExtensions.cs b/src/Umbraco.Core/PublishedElementExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedElementExtensions.cs
rename to src/Umbraco.Core/PublishedElementExtensions.cs
diff --git a/src/Umbraco.Abstractions/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedModelFactoryExtensions.cs
rename to src/Umbraco.Core/PublishedModelFactoryExtensions.cs
diff --git a/src/Umbraco.Abstractions/PublishedPropertyExtension.cs b/src/Umbraco.Core/PublishedPropertyExtension.cs
similarity index 100%
rename from src/Umbraco.Abstractions/PublishedPropertyExtension.cs
rename to src/Umbraco.Core/PublishedPropertyExtension.cs
diff --git a/src/Umbraco.Abstractions/ReadLock.cs b/src/Umbraco.Core/ReadLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ReadLock.cs
rename to src/Umbraco.Core/ReadLock.cs
diff --git a/src/Umbraco.Abstractions/ReflectionUtilities.cs b/src/Umbraco.Core/ReflectionUtilities.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ReflectionUtilities.cs
rename to src/Umbraco.Core/ReflectionUtilities.cs
diff --git a/src/Umbraco.Abstractions/RegisterExtensions.cs b/src/Umbraco.Core/RegisterExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/RegisterExtensions.cs
rename to src/Umbraco.Core/RegisterExtensions.cs
diff --git a/src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs b/src/Umbraco.Core/Routing/AliasUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
rename to src/Umbraco.Core/Routing/AliasUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderByRedirectUrl.cs
rename to src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderByUrl.cs b/src/Umbraco.Core/Routing/ContentFinderByUrl.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderByUrl.cs
rename to src/Umbraco.Core/Routing/ContentFinderByUrl.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Core/Routing/ContentFinderByUrlAlias.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderByUrlAlias.cs
rename to src/Umbraco.Core/Routing/ContentFinderByUrlAlias.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderByUrlAndTemplate.cs
rename to src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderCollection.cs b/src/Umbraco.Core/Routing/ContentFinderCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderCollection.cs
rename to src/Umbraco.Core/Routing/ContentFinderCollection.cs
diff --git a/src/Umbraco.Abstractions/Routing/ContentFinderCollectionBuilder.cs b/src/Umbraco.Core/Routing/ContentFinderCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ContentFinderCollectionBuilder.cs
rename to src/Umbraco.Core/Routing/ContentFinderCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Core/Routing/DefaultMediaUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
rename to src/Umbraco.Core/Routing/DefaultMediaUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs b/src/Umbraco.Core/Routing/DefaultUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
rename to src/Umbraco.Core/Routing/DefaultUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/Domain.cs b/src/Umbraco.Core/Routing/Domain.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/Domain.cs
rename to src/Umbraco.Core/Routing/Domain.cs
diff --git a/src/Umbraco.Abstractions/Routing/DomainAndUri.cs b/src/Umbraco.Core/Routing/DomainAndUri.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/DomainAndUri.cs
rename to src/Umbraco.Core/Routing/DomainAndUri.cs
diff --git a/src/Umbraco.Abstractions/Routing/DomainUtilities.cs b/src/Umbraco.Core/Routing/DomainUtilities.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/DomainUtilities.cs
rename to src/Umbraco.Core/Routing/DomainUtilities.cs
diff --git a/src/Umbraco.Abstractions/Routing/EnsureRoutableOutcome.cs b/src/Umbraco.Core/Routing/EnsureRoutableOutcome.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/EnsureRoutableOutcome.cs
rename to src/Umbraco.Core/Routing/EnsureRoutableOutcome.cs
diff --git a/src/Umbraco.Abstractions/Routing/IContentFinder.cs b/src/Umbraco.Core/Routing/IContentFinder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IContentFinder.cs
rename to src/Umbraco.Core/Routing/IContentFinder.cs
diff --git a/src/Umbraco.Abstractions/Routing/IContentLastChanceFinder.cs b/src/Umbraco.Core/Routing/IContentLastChanceFinder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IContentLastChanceFinder.cs
rename to src/Umbraco.Core/Routing/IContentLastChanceFinder.cs
diff --git a/src/Umbraco.Abstractions/Routing/IMediaUrlProvider.cs b/src/Umbraco.Core/Routing/IMediaUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IMediaUrlProvider.cs
rename to src/Umbraco.Core/Routing/IMediaUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/IPublishedRequest.cs b/src/Umbraco.Core/Routing/IPublishedRequest.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IPublishedRequest.cs
rename to src/Umbraco.Core/Routing/IPublishedRequest.cs
diff --git a/src/Umbraco.Abstractions/Routing/IPublishedRouter.cs b/src/Umbraco.Core/Routing/IPublishedRouter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IPublishedRouter.cs
rename to src/Umbraco.Core/Routing/IPublishedRouter.cs
diff --git a/src/Umbraco.Abstractions/Routing/IPublishedUrlProvider.cs b/src/Umbraco.Core/Routing/IPublishedUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IPublishedUrlProvider.cs
rename to src/Umbraco.Core/Routing/IPublishedUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/ISiteDomainHelper.cs b/src/Umbraco.Core/Routing/ISiteDomainHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/ISiteDomainHelper.cs
rename to src/Umbraco.Core/Routing/ISiteDomainHelper.cs
diff --git a/src/Umbraco.Abstractions/Routing/IUrlProvider.cs b/src/Umbraco.Core/Routing/IUrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/IUrlProvider.cs
rename to src/Umbraco.Core/Routing/IUrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/MediaUrlProviderCollection.cs b/src/Umbraco.Core/Routing/MediaUrlProviderCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/MediaUrlProviderCollection.cs
rename to src/Umbraco.Core/Routing/MediaUrlProviderCollection.cs
diff --git a/src/Umbraco.Abstractions/Routing/MediaUrlProviderCollectionBuilder.cs b/src/Umbraco.Core/Routing/MediaUrlProviderCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/MediaUrlProviderCollectionBuilder.cs
rename to src/Umbraco.Core/Routing/MediaUrlProviderCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Routing/PublishedRequest.cs b/src/Umbraco.Core/Routing/PublishedRequest.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/PublishedRequest.cs
rename to src/Umbraco.Core/Routing/PublishedRequest.cs
diff --git a/src/Umbraco.Abstractions/Routing/RoutableAttemptEventArgs.cs b/src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/RoutableAttemptEventArgs.cs
rename to src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Routing/SiteDomainHelper.cs b/src/Umbraco.Core/Routing/SiteDomainHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/SiteDomainHelper.cs
rename to src/Umbraco.Core/Routing/SiteDomainHelper.cs
diff --git a/src/Umbraco.Abstractions/Routing/UmbracoRequestEventArgs.cs b/src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UmbracoRequestEventArgs.cs
rename to src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Routing/UriUtility.cs b/src/Umbraco.Core/Routing/UriUtility.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UriUtility.cs
rename to src/Umbraco.Core/Routing/UriUtility.cs
diff --git a/src/Umbraco.Abstractions/Routing/UrlInfo.cs b/src/Umbraco.Core/Routing/UrlInfo.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UrlInfo.cs
rename to src/Umbraco.Core/Routing/UrlInfo.cs
diff --git a/src/Umbraco.Abstractions/Routing/UrlProvider.cs b/src/Umbraco.Core/Routing/UrlProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UrlProvider.cs
rename to src/Umbraco.Core/Routing/UrlProvider.cs
diff --git a/src/Umbraco.Abstractions/Routing/UrlProviderCollection.cs b/src/Umbraco.Core/Routing/UrlProviderCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UrlProviderCollection.cs
rename to src/Umbraco.Core/Routing/UrlProviderCollection.cs
diff --git a/src/Umbraco.Abstractions/Routing/UrlProviderCollectionBuilder.cs b/src/Umbraco.Core/Routing/UrlProviderCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UrlProviderCollectionBuilder.cs
rename to src/Umbraco.Core/Routing/UrlProviderCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
rename to src/Umbraco.Core/Routing/UrlProviderExtensions.cs
diff --git a/src/Umbraco.Abstractions/Runtime/IMainDom.cs b/src/Umbraco.Core/Runtime/IMainDom.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Runtime/IMainDom.cs
rename to src/Umbraco.Core/Runtime/IMainDom.cs
diff --git a/src/Umbraco.Abstractions/Runtime/IMainDomLock.cs b/src/Umbraco.Core/Runtime/IMainDomLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Runtime/IMainDomLock.cs
rename to src/Umbraco.Core/Runtime/IMainDomLock.cs
diff --git a/src/Umbraco.Abstractions/Runtime/IUmbracoBootPermissionChecker.cs b/src/Umbraco.Core/Runtime/IUmbracoBootPermissionChecker.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Runtime/IUmbracoBootPermissionChecker.cs
rename to src/Umbraco.Core/Runtime/IUmbracoBootPermissionChecker.cs
diff --git a/src/Umbraco.Abstractions/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Runtime/MainDom.cs
rename to src/Umbraco.Core/Runtime/MainDom.cs
diff --git a/src/Umbraco.Abstractions/RuntimeLevel.cs b/src/Umbraco.Core/RuntimeLevel.cs
similarity index 100%
rename from src/Umbraco.Abstractions/RuntimeLevel.cs
rename to src/Umbraco.Core/RuntimeLevel.cs
diff --git a/src/Umbraco.Abstractions/RuntimeLevelReason.cs b/src/Umbraco.Core/RuntimeLevelReason.cs
similarity index 100%
rename from src/Umbraco.Abstractions/RuntimeLevelReason.cs
rename to src/Umbraco.Core/RuntimeLevelReason.cs
diff --git a/src/Umbraco.Abstractions/SafeCallContext.cs b/src/Umbraco.Core/SafeCallContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/SafeCallContext.cs
rename to src/Umbraco.Core/SafeCallContext.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/BackgroundTaskRunnerOptions.cs b/src/Umbraco.Core/Scheduling/BackgroundTaskRunnerOptions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/BackgroundTaskRunnerOptions.cs
rename to src/Umbraco.Core/Scheduling/BackgroundTaskRunnerOptions.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/IBackgroundTask.cs b/src/Umbraco.Core/Scheduling/IBackgroundTask.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/IBackgroundTask.cs
rename to src/Umbraco.Core/Scheduling/IBackgroundTask.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/IBackgroundTaskRunner.cs b/src/Umbraco.Core/Scheduling/IBackgroundTaskRunner.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/IBackgroundTaskRunner.cs
rename to src/Umbraco.Core/Scheduling/IBackgroundTaskRunner.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/ILatchedBackgroundTask.cs b/src/Umbraco.Core/Scheduling/ILatchedBackgroundTask.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/ILatchedBackgroundTask.cs
rename to src/Umbraco.Core/Scheduling/ILatchedBackgroundTask.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/KeepAlive.cs b/src/Umbraco.Core/Scheduling/KeepAlive.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/KeepAlive.cs
rename to src/Umbraco.Core/Scheduling/KeepAlive.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/LatchedBackgroundTaskBase.cs b/src/Umbraco.Core/Scheduling/LatchedBackgroundTaskBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/LatchedBackgroundTaskBase.cs
rename to src/Umbraco.Core/Scheduling/LatchedBackgroundTaskBase.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/RecurringTaskBase.cs b/src/Umbraco.Core/Scheduling/RecurringTaskBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/RecurringTaskBase.cs
rename to src/Umbraco.Core/Scheduling/RecurringTaskBase.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/TaskAndFactoryExtensions.cs b/src/Umbraco.Core/Scheduling/TaskAndFactoryExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/TaskAndFactoryExtensions.cs
rename to src/Umbraco.Core/Scheduling/TaskAndFactoryExtensions.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/TaskEventArgs.cs b/src/Umbraco.Core/Scheduling/TaskEventArgs.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/TaskEventArgs.cs
rename to src/Umbraco.Core/Scheduling/TaskEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/TempFileCleanup.cs b/src/Umbraco.Core/Scheduling/TempFileCleanup.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/TempFileCleanup.cs
rename to src/Umbraco.Core/Scheduling/TempFileCleanup.cs
diff --git a/src/Umbraco.Abstractions/Scheduling/ThreadingTaskImmutable.cs b/src/Umbraco.Core/Scheduling/ThreadingTaskImmutable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scheduling/ThreadingTaskImmutable.cs
rename to src/Umbraco.Core/Scheduling/ThreadingTaskImmutable.cs
diff --git a/src/Umbraco.Abstractions/Scoping/CallContext.cs b/src/Umbraco.Core/Scoping/CallContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scoping/CallContext.cs
rename to src/Umbraco.Core/Scoping/CallContext.cs
diff --git a/src/Umbraco.Abstractions/Scoping/IInstanceIdentifiable.cs b/src/Umbraco.Core/Scoping/IInstanceIdentifiable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scoping/IInstanceIdentifiable.cs
rename to src/Umbraco.Core/Scoping/IInstanceIdentifiable.cs
diff --git a/src/Umbraco.Abstractions/Scoping/IScopeContext.cs b/src/Umbraco.Core/Scoping/IScopeContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Scoping/IScopeContext.cs
rename to src/Umbraco.Core/Scoping/IScopeContext.cs
diff --git a/src/Umbraco.Abstractions/Search/SearchableTreeAttribute.cs b/src/Umbraco.Core/Search/SearchableTreeAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Search/SearchableTreeAttribute.cs
rename to src/Umbraco.Core/Search/SearchableTreeAttribute.cs
diff --git a/src/Umbraco.Abstractions/Sections/ContentSection.cs b/src/Umbraco.Core/Sections/ContentSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/ContentSection.cs
rename to src/Umbraco.Core/Sections/ContentSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/FormsSection.cs b/src/Umbraco.Core/Sections/FormsSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/FormsSection.cs
rename to src/Umbraco.Core/Sections/FormsSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/ISection.cs b/src/Umbraco.Core/Sections/ISection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/ISection.cs
rename to src/Umbraco.Core/Sections/ISection.cs
diff --git a/src/Umbraco.Abstractions/Sections/MediaSection.cs b/src/Umbraco.Core/Sections/MediaSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/MediaSection.cs
rename to src/Umbraco.Core/Sections/MediaSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/MembersSection.cs b/src/Umbraco.Core/Sections/MembersSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/MembersSection.cs
rename to src/Umbraco.Core/Sections/MembersSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/PackagesSection.cs b/src/Umbraco.Core/Sections/PackagesSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/PackagesSection.cs
rename to src/Umbraco.Core/Sections/PackagesSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/SectionCollection.cs b/src/Umbraco.Core/Sections/SectionCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/SectionCollection.cs
rename to src/Umbraco.Core/Sections/SectionCollection.cs
diff --git a/src/Umbraco.Abstractions/Sections/SectionCollectionBuilder.cs b/src/Umbraco.Core/Sections/SectionCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/SectionCollectionBuilder.cs
rename to src/Umbraco.Core/Sections/SectionCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Sections/SettingsSection.cs b/src/Umbraco.Core/Sections/SettingsSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/SettingsSection.cs
rename to src/Umbraco.Core/Sections/SettingsSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/TranslationSection.cs b/src/Umbraco.Core/Sections/TranslationSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/TranslationSection.cs
rename to src/Umbraco.Core/Sections/TranslationSection.cs
diff --git a/src/Umbraco.Abstractions/Sections/UsersSection.cs b/src/Umbraco.Core/Sections/UsersSection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sections/UsersSection.cs
rename to src/Umbraco.Core/Sections/UsersSection.cs
diff --git a/src/Umbraco.Abstractions/Security/IPasswordHasher.cs b/src/Umbraco.Core/Security/IPasswordHasher.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Security/IPasswordHasher.cs
rename to src/Umbraco.Core/Security/IPasswordHasher.cs
diff --git a/src/Umbraco.Abstractions/Security/IWebSecurity.cs b/src/Umbraco.Core/Security/IWebSecurity.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Security/IWebSecurity.cs
rename to src/Umbraco.Core/Security/IWebSecurity.cs
diff --git a/src/Umbraco.Abstractions/Security/PasswordGenerator.cs b/src/Umbraco.Core/Security/PasswordGenerator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Security/PasswordGenerator.cs
rename to src/Umbraco.Core/Security/PasswordGenerator.cs
diff --git a/src/Umbraco.Abstractions/Security/ValidateRequestAttempt.cs b/src/Umbraco.Core/Security/ValidateRequestAttempt.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Security/ValidateRequestAttempt.cs
rename to src/Umbraco.Core/Security/ValidateRequestAttempt.cs
diff --git a/src/Umbraco.Abstractions/SemVersionExtensions.cs b/src/Umbraco.Core/SemVersionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/SemVersionExtensions.cs
rename to src/Umbraco.Core/SemVersionExtensions.cs
diff --git a/src/Umbraco.Abstractions/Semver/Semver.cs b/src/Umbraco.Core/Semver/Semver.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Semver/Semver.cs
rename to src/Umbraco.Core/Semver/Semver.cs
diff --git a/src/Umbraco.Abstractions/Serialization/IJsonSerializer.cs b/src/Umbraco.Core/Serialization/IJsonSerializer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Serialization/IJsonSerializer.cs
rename to src/Umbraco.Core/Serialization/IJsonSerializer.cs
diff --git a/src/Umbraco.Abstractions/ServiceContextExtensions.cs b/src/Umbraco.Core/ServiceContextExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ServiceContextExtensions.cs
rename to src/Umbraco.Core/ServiceContextExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/ContentTypeChange.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/ContentTypeChange.cs
rename to src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeExtensions.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeExtensions.cs
rename to src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeTypes.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeTypes.cs
rename to src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/DomainChangeTypes.cs b/src/Umbraco.Core/Services/Changes/DomainChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/DomainChangeTypes.cs
rename to src/Umbraco.Core/Services/Changes/DomainChangeTypes.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/TreeChange.cs b/src/Umbraco.Core/Services/Changes/TreeChange.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/TreeChange.cs
rename to src/Umbraco.Core/Services/Changes/TreeChange.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/TreeChangeExtensions.cs b/src/Umbraco.Core/Services/Changes/TreeChangeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/TreeChangeExtensions.cs
rename to src/Umbraco.Core/Services/Changes/TreeChangeExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/Changes/TreeChangeTypes.cs b/src/Umbraco.Core/Services/Changes/TreeChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Changes/TreeChangeTypes.cs
rename to src/Umbraco.Core/Services/Changes/TreeChangeTypes.cs
diff --git a/src/Umbraco.Abstractions/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ContentServiceExtensions.cs
rename to src/Umbraco.Core/Services/ContentServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/ContentTypeServiceExtensions.cs b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ContentTypeServiceExtensions.cs
rename to src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/DateTypeServiceExtensions.cs b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/DateTypeServiceExtensions.cs
rename to src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/IAuditService.cs b/src/Umbraco.Core/Services/IAuditService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IAuditService.cs
rename to src/Umbraco.Core/Services/IAuditService.cs
diff --git a/src/Umbraco.Abstractions/Services/IConsentService.cs b/src/Umbraco.Core/Services/IConsentService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IConsentService.cs
rename to src/Umbraco.Core/Services/IConsentService.cs
diff --git a/src/Umbraco.Abstractions/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IContentService.cs
rename to src/Umbraco.Core/Services/IContentService.cs
diff --git a/src/Umbraco.Abstractions/Services/IContentServiceBase.cs b/src/Umbraco.Core/Services/IContentServiceBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IContentServiceBase.cs
rename to src/Umbraco.Core/Services/IContentServiceBase.cs
diff --git a/src/Umbraco.Abstractions/Services/IContentTypeBaseServiceProvider.cs b/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IContentTypeBaseServiceProvider.cs
rename to src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
diff --git a/src/Umbraco.Abstractions/Services/IContentTypeService.cs b/src/Umbraco.Core/Services/IContentTypeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IContentTypeService.cs
rename to src/Umbraco.Core/Services/IContentTypeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IContentTypeServiceBase.cs
rename to src/Umbraco.Core/Services/IContentTypeServiceBase.cs
diff --git a/src/Umbraco.Abstractions/Services/IDashboardService.cs b/src/Umbraco.Core/Services/IDashboardService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IDashboardService.cs
rename to src/Umbraco.Core/Services/IDashboardService.cs
diff --git a/src/Umbraco.Abstractions/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IDataTypeService.cs
rename to src/Umbraco.Core/Services/IDataTypeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IDomainService.cs b/src/Umbraco.Core/Services/IDomainService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IDomainService.cs
rename to src/Umbraco.Core/Services/IDomainService.cs
diff --git a/src/Umbraco.Abstractions/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IEntityService.cs
rename to src/Umbraco.Core/Services/IEntityService.cs
diff --git a/src/Umbraco.Abstractions/Services/IEntityXmlSerializer.cs b/src/Umbraco.Core/Services/IEntityXmlSerializer.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IEntityXmlSerializer.cs
rename to src/Umbraco.Core/Services/IEntityXmlSerializer.cs
diff --git a/src/Umbraco.Abstractions/Services/IExternalLoginService.cs b/src/Umbraco.Core/Services/IExternalLoginService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IExternalLoginService.cs
rename to src/Umbraco.Core/Services/IExternalLoginService.cs
diff --git a/src/Umbraco.Abstractions/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IFileService.cs
rename to src/Umbraco.Core/Services/IFileService.cs
diff --git a/src/Umbraco.Abstractions/Services/IIdKeyMap.cs b/src/Umbraco.Core/Services/IIdKeyMap.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IIdKeyMap.cs
rename to src/Umbraco.Core/Services/IIdKeyMap.cs
diff --git a/src/Umbraco.Abstractions/Services/IKeyValueService.cs b/src/Umbraco.Core/Services/IKeyValueService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IKeyValueService.cs
rename to src/Umbraco.Core/Services/IKeyValueService.cs
diff --git a/src/Umbraco.Abstractions/Services/ILocalizationService.cs b/src/Umbraco.Core/Services/ILocalizationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ILocalizationService.cs
rename to src/Umbraco.Core/Services/ILocalizationService.cs
diff --git a/src/Umbraco.Abstractions/Services/ILocalizedTextService.cs b/src/Umbraco.Core/Services/ILocalizedTextService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ILocalizedTextService.cs
rename to src/Umbraco.Core/Services/ILocalizedTextService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMacroService.cs b/src/Umbraco.Core/Services/IMacroService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMacroService.cs
rename to src/Umbraco.Core/Services/IMacroService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMediaService.cs
rename to src/Umbraco.Core/Services/IMediaService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMediaTypeService.cs b/src/Umbraco.Core/Services/IMediaTypeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMediaTypeService.cs
rename to src/Umbraco.Core/Services/IMediaTypeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMemberGroupService.cs b/src/Umbraco.Core/Services/IMemberGroupService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMemberGroupService.cs
rename to src/Umbraco.Core/Services/IMemberGroupService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMemberService.cs b/src/Umbraco.Core/Services/IMemberService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMemberService.cs
rename to src/Umbraco.Core/Services/IMemberService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMemberTypeService.cs b/src/Umbraco.Core/Services/IMemberTypeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMemberTypeService.cs
rename to src/Umbraco.Core/Services/IMemberTypeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMembershipMemberService.cs b/src/Umbraco.Core/Services/IMembershipMemberService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMembershipMemberService.cs
rename to src/Umbraco.Core/Services/IMembershipMemberService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMembershipRoleService.cs b/src/Umbraco.Core/Services/IMembershipRoleService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMembershipRoleService.cs
rename to src/Umbraco.Core/Services/IMembershipRoleService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMembershipUserService.cs b/src/Umbraco.Core/Services/IMembershipUserService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IMembershipUserService.cs
rename to src/Umbraco.Core/Services/IMembershipUserService.cs
diff --git a/src/Umbraco.Abstractions/Services/INotificationService.cs b/src/Umbraco.Core/Services/INotificationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/INotificationService.cs
rename to src/Umbraco.Core/Services/INotificationService.cs
diff --git a/src/Umbraco.Abstractions/Services/IPackagingService.cs b/src/Umbraco.Core/Services/IPackagingService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IPackagingService.cs
rename to src/Umbraco.Core/Services/IPackagingService.cs
diff --git a/src/Umbraco.Abstractions/Services/IPropertyValidationService.cs b/src/Umbraco.Core/Services/IPropertyValidationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IPropertyValidationService.cs
rename to src/Umbraco.Core/Services/IPropertyValidationService.cs
diff --git a/src/Umbraco.Abstractions/Services/IPublicAccessService.cs b/src/Umbraco.Core/Services/IPublicAccessService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IPublicAccessService.cs
rename to src/Umbraco.Core/Services/IPublicAccessService.cs
diff --git a/src/Umbraco.Abstractions/Services/IRedirectUrlService.cs b/src/Umbraco.Core/Services/IRedirectUrlService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IRedirectUrlService.cs
rename to src/Umbraco.Core/Services/IRedirectUrlService.cs
diff --git a/src/Umbraco.Abstractions/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IRelationService.cs
rename to src/Umbraco.Core/Services/IRelationService.cs
diff --git a/src/Umbraco.Abstractions/Services/IRuntime.cs b/src/Umbraco.Core/Services/IRuntime.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IRuntime.cs
rename to src/Umbraco.Core/Services/IRuntime.cs
diff --git a/src/Umbraco.Abstractions/Services/IRuntimeState.cs b/src/Umbraco.Core/Services/IRuntimeState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IRuntimeState.cs
rename to src/Umbraco.Core/Services/IRuntimeState.cs
diff --git a/src/Umbraco.Abstractions/Services/ISectionService.cs b/src/Umbraco.Core/Services/ISectionService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ISectionService.cs
rename to src/Umbraco.Core/Services/ISectionService.cs
diff --git a/src/Umbraco.Abstractions/Services/IServerRegistrationService.cs b/src/Umbraco.Core/Services/IServerRegistrationService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IServerRegistrationService.cs
rename to src/Umbraco.Core/Services/IServerRegistrationService.cs
diff --git a/src/Umbraco.Abstractions/Services/IService.cs b/src/Umbraco.Core/Services/IService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IService.cs
rename to src/Umbraco.Core/Services/IService.cs
diff --git a/src/Umbraco.Abstractions/Services/ITagService.cs b/src/Umbraco.Core/Services/ITagService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ITagService.cs
rename to src/Umbraco.Core/Services/ITagService.cs
diff --git a/src/Umbraco.Abstractions/Services/ITreeService.cs b/src/Umbraco.Core/Services/ITreeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ITreeService.cs
rename to src/Umbraco.Core/Services/ITreeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IUpgradeService.cs b/src/Umbraco.Core/Services/IUpgradeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IUpgradeService.cs
rename to src/Umbraco.Core/Services/IUpgradeService.cs
diff --git a/src/Umbraco.Abstractions/Services/IUserService.cs b/src/Umbraco.Core/Services/IUserService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/IUserService.cs
rename to src/Umbraco.Core/Services/IUserService.cs
diff --git a/src/Umbraco.Abstractions/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/LocalizedTextServiceExtensions.cs
rename to src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/MediaServiceExtensions.cs b/src/Umbraco.Core/Services/MediaServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/MediaServiceExtensions.cs
rename to src/Umbraco.Core/Services/MediaServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/MoveOperationStatusType.cs b/src/Umbraco.Core/Services/MoveOperationStatusType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/MoveOperationStatusType.cs
rename to src/Umbraco.Core/Services/MoveOperationStatusType.cs
diff --git a/src/Umbraco.Abstractions/Services/OperationResult.cs b/src/Umbraco.Core/Services/OperationResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/OperationResult.cs
rename to src/Umbraco.Core/Services/OperationResult.cs
diff --git a/src/Umbraco.Abstractions/Services/OperationResultType.cs b/src/Umbraco.Core/Services/OperationResultType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/OperationResultType.cs
rename to src/Umbraco.Core/Services/OperationResultType.cs
diff --git a/src/Umbraco.Abstractions/Services/Ordering.cs b/src/Umbraco.Core/Services/Ordering.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/Ordering.cs
rename to src/Umbraco.Core/Services/Ordering.cs
diff --git a/src/Umbraco.Abstractions/Services/PublicAccessServiceExtensions.cs b/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/PublicAccessServiceExtensions.cs
rename to src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Services/PublishResult.cs b/src/Umbraco.Core/Services/PublishResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/PublishResult.cs
rename to src/Umbraco.Core/Services/PublishResult.cs
diff --git a/src/Umbraco.Abstractions/Services/PublishResultType.cs b/src/Umbraco.Core/Services/PublishResultType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/PublishResultType.cs
rename to src/Umbraco.Core/Services/PublishResultType.cs
diff --git a/src/Umbraco.Abstractions/Services/SectionService.cs b/src/Umbraco.Core/Services/SectionService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/SectionService.cs
rename to src/Umbraco.Core/Services/SectionService.cs
diff --git a/src/Umbraco.Abstractions/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/ServiceContext.cs
rename to src/Umbraco.Core/Services/ServiceContext.cs
diff --git a/src/Umbraco.Abstractions/Services/TreeService.cs b/src/Umbraco.Core/Services/TreeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/TreeService.cs
rename to src/Umbraco.Core/Services/TreeService.cs
diff --git a/src/Umbraco.Abstractions/Services/UpgradeService.cs b/src/Umbraco.Core/Services/UpgradeService.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/UpgradeService.cs
rename to src/Umbraco.Core/Services/UpgradeService.cs
diff --git a/src/Umbraco.Abstractions/Services/UserServiceExtensions.cs b/src/Umbraco.Core/Services/UserServiceExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Services/UserServiceExtensions.cs
rename to src/Umbraco.Core/Services/UserServiceExtensions.cs
diff --git a/src/Umbraco.Abstractions/Settable.cs b/src/Umbraco.Core/Settable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Settable.cs
rename to src/Umbraco.Core/Settable.cs
diff --git a/src/Umbraco.Abstractions/SimpleMainDom.cs b/src/Umbraco.Core/SimpleMainDom.cs
similarity index 100%
rename from src/Umbraco.Abstractions/SimpleMainDom.cs
rename to src/Umbraco.Core/SimpleMainDom.cs
diff --git a/src/Umbraco.Abstractions/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/StringExtensions.cs
rename to src/Umbraco.Core/StringExtensions.cs
diff --git a/src/Umbraco.Abstractions/StringUdi.cs b/src/Umbraco.Core/StringUdi.cs
similarity index 100%
rename from src/Umbraco.Abstractions/StringUdi.cs
rename to src/Umbraco.Core/StringUdi.cs
diff --git a/src/Umbraco.Abstractions/Strings/CleanStringType.cs b/src/Umbraco.Core/Strings/CleanStringType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/CleanStringType.cs
rename to src/Umbraco.Core/Strings/CleanStringType.cs
diff --git a/src/Umbraco.Abstractions/Strings/Css/StylesheetHelper.cs b/src/Umbraco.Core/Strings/Css/StylesheetHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/Css/StylesheetHelper.cs
rename to src/Umbraco.Core/Strings/Css/StylesheetHelper.cs
diff --git a/src/Umbraco.Abstractions/Strings/Css/StylesheetRule.cs b/src/Umbraco.Core/Strings/Css/StylesheetRule.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/Css/StylesheetRule.cs
rename to src/Umbraco.Core/Strings/Css/StylesheetRule.cs
diff --git a/src/Umbraco.Abstractions/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/DefaultShortStringHelper.cs
rename to src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
diff --git a/src/Umbraco.Abstractions/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/DefaultShortStringHelperConfig.cs
rename to src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
diff --git a/src/Umbraco.Abstractions/Strings/DefaultUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/DefaultUrlSegmentProvider.cs
rename to src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs
diff --git a/src/Umbraco.Abstractions/Strings/Diff.cs b/src/Umbraco.Core/Strings/Diff.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/Diff.cs
rename to src/Umbraco.Core/Strings/Diff.cs
diff --git a/src/Umbraco.Abstractions/Strings/HtmlEncodedString.cs b/src/Umbraco.Core/Strings/HtmlEncodedString.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/HtmlEncodedString.cs
rename to src/Umbraco.Core/Strings/HtmlEncodedString.cs
diff --git a/src/Umbraco.Abstractions/Strings/IHtmlEncodedString.cs b/src/Umbraco.Core/Strings/IHtmlEncodedString.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/IHtmlEncodedString.cs
rename to src/Umbraco.Core/Strings/IHtmlEncodedString.cs
diff --git a/src/Umbraco.Abstractions/Strings/IShortStringHelper.cs b/src/Umbraco.Core/Strings/IShortStringHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/IShortStringHelper.cs
rename to src/Umbraco.Core/Strings/IShortStringHelper.cs
diff --git a/src/Umbraco.Abstractions/Strings/IUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/IUrlSegmentProvider.cs
rename to src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
diff --git a/src/Umbraco.Abstractions/Strings/PathUtility.cs b/src/Umbraco.Core/Strings/PathUtility.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/PathUtility.cs
rename to src/Umbraco.Core/Strings/PathUtility.cs
diff --git a/src/Umbraco.Abstractions/Strings/UrlSegmentProviderCollection.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/UrlSegmentProviderCollection.cs
rename to src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs
diff --git a/src/Umbraco.Abstractions/Strings/UrlSegmentProviderCollectionBuilder.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/UrlSegmentProviderCollectionBuilder.cs
rename to src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Strings/Utf8ToAsciiConverter.cs b/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Strings/Utf8ToAsciiConverter.cs
rename to src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
diff --git a/src/Umbraco.Abstractions/Sync/DatabaseServerMessengerOptions.cs b/src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/DatabaseServerMessengerOptions.cs
rename to src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs
diff --git a/src/Umbraco.Abstractions/Sync/DatabaseServerRegistrar.cs b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/DatabaseServerRegistrar.cs
rename to src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
diff --git a/src/Umbraco.Abstractions/Sync/DatabaseServerRegistrarOptions.cs b/src/Umbraco.Core/Sync/DatabaseServerRegistrarOptions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/DatabaseServerRegistrarOptions.cs
rename to src/Umbraco.Core/Sync/DatabaseServerRegistrarOptions.cs
diff --git a/src/Umbraco.Abstractions/Sync/IServerAddress.cs b/src/Umbraco.Core/Sync/IServerAddress.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/IServerAddress.cs
rename to src/Umbraco.Core/Sync/IServerAddress.cs
diff --git a/src/Umbraco.Abstractions/Sync/IServerMessenger.cs b/src/Umbraco.Core/Sync/IServerMessenger.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/IServerMessenger.cs
rename to src/Umbraco.Core/Sync/IServerMessenger.cs
diff --git a/src/Umbraco.Abstractions/Sync/IServerRegistrar.cs b/src/Umbraco.Core/Sync/IServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/IServerRegistrar.cs
rename to src/Umbraco.Core/Sync/IServerRegistrar.cs
diff --git a/src/Umbraco.Abstractions/Sync/MessageType.cs b/src/Umbraco.Core/Sync/MessageType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/MessageType.cs
rename to src/Umbraco.Core/Sync/MessageType.cs
diff --git a/src/Umbraco.Abstractions/Sync/RefreshMethodType.cs b/src/Umbraco.Core/Sync/RefreshMethodType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/RefreshMethodType.cs
rename to src/Umbraco.Core/Sync/RefreshMethodType.cs
diff --git a/src/Umbraco.Abstractions/Sync/ServerRole.cs b/src/Umbraco.Core/Sync/ServerRole.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/ServerRole.cs
rename to src/Umbraco.Core/Sync/ServerRole.cs
diff --git a/src/Umbraco.Abstractions/Sync/SingleServerRegistrar.cs b/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Sync/SingleServerRegistrar.cs
rename to src/Umbraco.Core/Sync/SingleServerRegistrar.cs
diff --git a/src/Umbraco.Abstractions/SystemLock.cs b/src/Umbraco.Core/SystemLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/SystemLock.cs
rename to src/Umbraco.Core/SystemLock.cs
diff --git a/src/Umbraco.Abstractions/Templates/HtmlImageSourceParser.cs b/src/Umbraco.Core/Templates/HtmlImageSourceParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Templates/HtmlImageSourceParser.cs
rename to src/Umbraco.Core/Templates/HtmlImageSourceParser.cs
diff --git a/src/Umbraco.Abstractions/Templates/HtmlLocalLinkParser.cs b/src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Templates/HtmlLocalLinkParser.cs
rename to src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
diff --git a/src/Umbraco.Abstractions/Templates/HtmlUrlParser.cs b/src/Umbraco.Core/Templates/HtmlUrlParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Templates/HtmlUrlParser.cs
rename to src/Umbraco.Core/Templates/HtmlUrlParser.cs
diff --git a/src/Umbraco.Abstractions/ThreadExtensions.cs b/src/Umbraco.Core/ThreadExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/ThreadExtensions.cs
rename to src/Umbraco.Core/ThreadExtensions.cs
diff --git a/src/Umbraco.Abstractions/Tour/BackOfficeTourFilter.cs b/src/Umbraco.Core/Tour/BackOfficeTourFilter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Tour/BackOfficeTourFilter.cs
rename to src/Umbraco.Core/Tour/BackOfficeTourFilter.cs
diff --git a/src/Umbraco.Abstractions/Tour/TourFilterCollection.cs b/src/Umbraco.Core/Tour/TourFilterCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Tour/TourFilterCollection.cs
rename to src/Umbraco.Core/Tour/TourFilterCollection.cs
diff --git a/src/Umbraco.Abstractions/Tour/TourFilterCollectionBuilder.cs b/src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Tour/TourFilterCollectionBuilder.cs
rename to src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs
diff --git a/src/Umbraco.Abstractions/Trees/ActionUrlMethod.cs b/src/Umbraco.Core/Trees/ActionUrlMethod.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/ActionUrlMethod.cs
rename to src/Umbraco.Core/Trees/ActionUrlMethod.cs
diff --git a/src/Umbraco.Abstractions/Trees/CoreTreeAttribute.cs b/src/Umbraco.Core/Trees/CoreTreeAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/CoreTreeAttribute.cs
rename to src/Umbraco.Core/Trees/CoreTreeAttribute.cs
diff --git a/src/Umbraco.Abstractions/Trees/ITree.cs b/src/Umbraco.Core/Trees/ITree.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/ITree.cs
rename to src/Umbraco.Core/Trees/ITree.cs
diff --git a/src/Umbraco.Abstractions/Trees/Tree.cs b/src/Umbraco.Core/Trees/Tree.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/Tree.cs
rename to src/Umbraco.Core/Trees/Tree.cs
diff --git a/src/Umbraco.Abstractions/Trees/TreeCollection.cs b/src/Umbraco.Core/Trees/TreeCollection.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/TreeCollection.cs
rename to src/Umbraco.Core/Trees/TreeCollection.cs
diff --git a/src/Umbraco.Abstractions/Trees/TreeUse.cs b/src/Umbraco.Core/Trees/TreeUse.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Trees/TreeUse.cs
rename to src/Umbraco.Core/Trees/TreeUse.cs
diff --git a/src/Umbraco.Abstractions/TypeExtensions.cs b/src/Umbraco.Core/TypeExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/TypeExtensions.cs
rename to src/Umbraco.Core/TypeExtensions.cs
diff --git a/src/Umbraco.Abstractions/TypeLoaderExtensions.cs b/src/Umbraco.Core/TypeLoaderExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/TypeLoaderExtensions.cs
rename to src/Umbraco.Core/TypeLoaderExtensions.cs
diff --git a/src/Umbraco.Abstractions/Udi.cs b/src/Umbraco.Core/Udi.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Udi.cs
rename to src/Umbraco.Core/Udi.cs
diff --git a/src/Umbraco.Abstractions/UdiDefinitionAttribute.cs b/src/Umbraco.Core/UdiDefinitionAttribute.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiDefinitionAttribute.cs
rename to src/Umbraco.Core/UdiDefinitionAttribute.cs
diff --git a/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs b/src/Umbraco.Core/UdiEntityTypeHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiEntityTypeHelper.cs
rename to src/Umbraco.Core/UdiEntityTypeHelper.cs
diff --git a/src/Umbraco.Abstractions/UdiGetterExtensions.cs b/src/Umbraco.Core/UdiGetterExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiGetterExtensions.cs
rename to src/Umbraco.Core/UdiGetterExtensions.cs
diff --git a/src/Umbraco.Abstractions/UdiParser.cs b/src/Umbraco.Core/UdiParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiParser.cs
rename to src/Umbraco.Core/UdiParser.cs
diff --git a/src/Umbraco.Abstractions/UdiParserServiceConnectors.cs b/src/Umbraco.Core/UdiParserServiceConnectors.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiParserServiceConnectors.cs
rename to src/Umbraco.Core/UdiParserServiceConnectors.cs
diff --git a/src/Umbraco.Abstractions/UdiRange.cs b/src/Umbraco.Core/UdiRange.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiRange.cs
rename to src/Umbraco.Core/UdiRange.cs
diff --git a/src/Umbraco.Abstractions/UdiType.cs b/src/Umbraco.Core/UdiType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiType.cs
rename to src/Umbraco.Core/UdiType.cs
diff --git a/src/Umbraco.Abstractions/UdiTypeConverter.cs b/src/Umbraco.Core/UdiTypeConverter.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UdiTypeConverter.cs
rename to src/Umbraco.Core/UdiTypeConverter.cs
diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
similarity index 96%
rename from src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
rename to src/Umbraco.Core/Umbraco.Core.csproj
index 52322f979a..7a15e7fbed 100644
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>7.3</LangVersion>
+        <LangVersion>8</LangVersion>
         <RootNamespace>Umbraco.Core</RootNamespace>
         <AssemblyVersion>9.0.0</AssemblyVersion>
         <InformationalVersion>9.0.0</InformationalVersion>
diff --git a/src/Umbraco.Abstractions/UmbracoContextReference.cs b/src/Umbraco.Core/UmbracoContextReference.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UmbracoContextReference.cs
rename to src/Umbraco.Core/UmbracoContextReference.cs
diff --git a/src/Umbraco.Abstractions/UnknownTypeUdi.cs b/src/Umbraco.Core/UnknownTypeUdi.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UnknownTypeUdi.cs
rename to src/Umbraco.Core/UnknownTypeUdi.cs
diff --git a/src/Umbraco.Abstractions/UpgradeResult.cs b/src/Umbraco.Core/UpgradeResult.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UpgradeResult.cs
rename to src/Umbraco.Core/UpgradeResult.cs
diff --git a/src/Umbraco.Abstractions/UpgradeableReadLock.cs b/src/Umbraco.Core/UpgradeableReadLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UpgradeableReadLock.cs
rename to src/Umbraco.Core/UpgradeableReadLock.cs
diff --git a/src/Umbraco.Abstractions/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UriExtensions.cs
rename to src/Umbraco.Core/UriExtensions.cs
diff --git a/src/Umbraco.Abstractions/UriUtilityCore.cs b/src/Umbraco.Core/UriUtilityCore.cs
similarity index 100%
rename from src/Umbraco.Abstractions/UriUtilityCore.cs
rename to src/Umbraco.Core/UriUtilityCore.cs
diff --git a/src/Umbraco.Abstractions/VersionExtensions.cs b/src/Umbraco.Core/VersionExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/VersionExtensions.cs
rename to src/Umbraco.Core/VersionExtensions.cs
diff --git a/src/Umbraco.Abstractions/WaitHandleExtensions.cs b/src/Umbraco.Core/WaitHandleExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/WaitHandleExtensions.cs
rename to src/Umbraco.Core/WaitHandleExtensions.cs
diff --git a/src/Umbraco.Abstractions/WriteLock.cs b/src/Umbraco.Core/WriteLock.cs
similarity index 100%
rename from src/Umbraco.Abstractions/WriteLock.cs
rename to src/Umbraco.Core/WriteLock.cs
diff --git a/src/Umbraco.Abstractions/Xml/DynamicContext.cs b/src/Umbraco.Core/Xml/DynamicContext.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/DynamicContext.cs
rename to src/Umbraco.Core/Xml/DynamicContext.cs
diff --git a/src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs b/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
rename to src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/INavigableContent.cs b/src/Umbraco.Core/Xml/XPath/INavigableContent.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/INavigableContent.cs
rename to src/Umbraco.Core/Xml/XPath/INavigableContent.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/INavigableContentType.cs b/src/Umbraco.Core/Xml/XPath/INavigableContentType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/INavigableContentType.cs
rename to src/Umbraco.Core/Xml/XPath/INavigableContentType.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/INavigableFieldType.cs b/src/Umbraco.Core/Xml/XPath/INavigableFieldType.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/INavigableFieldType.cs
rename to src/Umbraco.Core/Xml/XPath/INavigableFieldType.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/INavigableSource.cs b/src/Umbraco.Core/Xml/XPath/INavigableSource.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/INavigableSource.cs
rename to src/Umbraco.Core/Xml/XPath/INavigableSource.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/MacroNavigator.cs b/src/Umbraco.Core/Xml/XPath/MacroNavigator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/MacroNavigator.cs
rename to src/Umbraco.Core/Xml/XPath/MacroNavigator.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/NavigableNavigator.cs b/src/Umbraco.Core/Xml/XPath/NavigableNavigator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/NavigableNavigator.cs
rename to src/Umbraco.Core/Xml/XPath/NavigableNavigator.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPath/RenamedRootNavigator.cs b/src/Umbraco.Core/Xml/XPath/RenamedRootNavigator.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPath/RenamedRootNavigator.cs
rename to src/Umbraco.Core/Xml/XPath/RenamedRootNavigator.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPathNavigatorExtensions.cs b/src/Umbraco.Core/Xml/XPathNavigatorExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPathNavigatorExtensions.cs
rename to src/Umbraco.Core/Xml/XPathNavigatorExtensions.cs
diff --git a/src/Umbraco.Abstractions/Xml/XPathVariable.cs b/src/Umbraco.Core/Xml/XPathVariable.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XPathVariable.cs
rename to src/Umbraco.Core/Xml/XPathVariable.cs
diff --git a/src/Umbraco.Abstractions/Xml/XmlHelper.cs b/src/Umbraco.Core/Xml/XmlHelper.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XmlHelper.cs
rename to src/Umbraco.Core/Xml/XmlHelper.cs
diff --git a/src/Umbraco.Abstractions/Xml/XmlNamespaces.cs b/src/Umbraco.Core/Xml/XmlNamespaces.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XmlNamespaces.cs
rename to src/Umbraco.Core/Xml/XmlNamespaces.cs
diff --git a/src/Umbraco.Abstractions/Xml/XmlNodeListFactory.cs b/src/Umbraco.Core/Xml/XmlNodeListFactory.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Xml/XmlNodeListFactory.cs
rename to src/Umbraco.Core/Xml/XmlNodeListFactory.cs
diff --git a/src/Umbraco.Abstractions/XmlExtensions.cs b/src/Umbraco.Core/XmlExtensions.cs
similarity index 100%
rename from src/Umbraco.Abstractions/XmlExtensions.cs
rename to src/Umbraco.Core/XmlExtensions.cs
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 264f487b70..a65e4e4eda 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 03fab50692..d14fbb4470 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
   </ItemGroup>
 
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index b3b291a286..4682df8054 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -46,10 +46,6 @@
       <None Remove="obj\**" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
             <_Parameter1>Umbraco.Tests</_Parameter1>
@@ -63,4 +59,8 @@
       <Compile Remove="obj\**" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 0ed95c3283..5e71b2d9ec 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -101,9 +101,9 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
+      <Name>Umbraco.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 4c369ec2fa..50607130b4 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.TestData/Umbraco.TestData.csproj b/src/Umbraco.TestData/Umbraco.TestData.csproj
index a79a417b33..e79ecfd589 100644
--- a/src/Umbraco.TestData/Umbraco.TestData.csproj
+++ b/src/Umbraco.TestData/Umbraco.TestData.csproj
@@ -49,9 +49,9 @@
     <None Include="readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
+      <Name>Umbraco.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index be120eea08..c64c0e0da4 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -66,9 +66,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
+      <Name>Umbraco.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
diff --git a/src/Umbraco.Tests/Published/ModelTypeTests.cs b/src/Umbraco.Tests/Published/ModelTypeTests.cs
index 1dab67b351..f698c20fa2 100644
--- a/src/Umbraco.Tests/Published/ModelTypeTests.cs
+++ b/src/Umbraco.Tests/Published/ModelTypeTests.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Published
             // there's an "*" there because the arrays are not true SZArray - but that changes when we map
             Assert.AreEqual("{alias1}[*]", ModelType.For("alias1").MakeArrayType().FullName);
             // note the inner assembly qualified name
-            Assert.AreEqual("System.Collections.Generic.IEnumerable`1[[{alias1}[*], Umbraco.Abstractions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=null]]", typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1").MakeArrayType()).FullName);
+            Assert.AreEqual("System.Collections.Generic.IEnumerable`1[[{alias1}[*], Umbraco.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=null]]", typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1").MakeArrayType()).FullName);
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index bbc16b29ec..d8dfc238dd 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -375,7 +375,7 @@ namespace Umbraco.Tests.Testing
         {
             return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false, new[]
             {
-                Assembly.Load("Umbraco.Abstractions"),
+                Assembly.Load("Umbraco.Core"),
                 Assembly.Load("Umbraco.Web"),
                 Assembly.Load("Umbraco.Tests"),
                 Assembly.Load("Umbraco.Infrastructure")
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 16e4ca2c11..5f8dcbe51d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -557,14 +557,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
-      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj">
       <Project>{0fad7d2a-d7dd-45b1-91fd-488bb6cdacea}</Project>
       <Name>Umbraco.Examine.Lucene</Name>
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 06939a3266..3b6456c62b 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 63212b2fd4..7a7b1bada5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -112,9 +112,9 @@
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
+      <Name>Umbraco.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj">
       <Project>{0fad7d2a-d7dd-45b1-91fd-488bb6cdacea}</Project>
diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs
index 2785e7832d..9d13af2fb6 100644
--- a/src/Umbraco.Web/PublishedElementExtensions.cs
+++ b/src/Umbraco.Web/PublishedElementExtensions.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web
         //
         // besides, for tests, Current support setting a fallback without even a container
         //
-        // Update to this comment 8/2/2020: issue as been ameliorated by creating extensions methods in Umbraco.Abstractions
+        // Update to this comment 8/2/2020: issue as been ameliorated by creating extensions methods in Umbraco.Core
         // that accept the dependencies as arguments for many of these extension methods, and can be used within the Umbraco code-base.
         // For site developers, the "friendly" extension methods using service location have been maintained, delegating to the ones that
         // take the dependencies as parameters.
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c73ccb5b3d..b9808e08e5 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -103,14 +103,14 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
-      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
-      <Name>Umbraco.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
       <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
       <Name>Umbraco.Examine</Name>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 2b9f9d004b..05dee0b90b 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -99,7 +99,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplates", "IssueTemp
 		..\.github\ISSUE_TEMPLATE\5_Security_issue.md = ..\.github\ISSUE_TEMPLATE\5_Security_issue.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Abstractions", "Umbraco.Abstractions\Umbraco.Abstractions.csproj", "{29AA69D9-B597-4395-8D42-43B1263C240A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Core", "Umbraco.Core\Umbraco.Core.csproj", "{29AA69D9-B597-4395-8D42-43B1263C240A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.ModelsBuilder.Embedded", "Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj", "{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}"
 EndProject