diff --git a/src/Umbraco.Core/Composing/BuilderCollectionBase.cs b/src/Umbraco.Abstractions/Composing/BuilderCollectionBase.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/BuilderCollectionBase.cs
rename to src/Umbraco.Abstractions/Composing/BuilderCollectionBase.cs
diff --git a/src/Umbraco.Core/Composing/DisableAttribute.cs b/src/Umbraco.Abstractions/Composing/DisableAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/DisableAttribute.cs
rename to src/Umbraco.Abstractions/Composing/DisableAttribute.cs
diff --git a/src/Umbraco.Core/Composing/DisableComposerAttribute.cs b/src/Umbraco.Abstractions/Composing/DisableComposerAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/DisableComposerAttribute.cs
rename to src/Umbraco.Abstractions/Composing/DisableComposerAttribute.cs
diff --git a/src/Umbraco.Core/Composing/EnableAttribute.cs b/src/Umbraco.Abstractions/Composing/EnableAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/EnableAttribute.cs
rename to src/Umbraco.Abstractions/Composing/EnableAttribute.cs
diff --git a/src/Umbraco.Core/Composing/EnableComposerAttribute.cs b/src/Umbraco.Abstractions/Composing/EnableComposerAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/EnableComposerAttribute.cs
rename to src/Umbraco.Abstractions/Composing/EnableComposerAttribute.cs
diff --git a/src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs b/src/Umbraco.Abstractions/Composing/HideFromTypeFinderAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs
rename to src/Umbraco.Abstractions/Composing/HideFromTypeFinderAttribute.cs
diff --git a/src/Umbraco.Core/Composing/IBuilderCollection.cs b/src/Umbraco.Abstractions/Composing/IBuilderCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IBuilderCollection.cs
rename to src/Umbraco.Abstractions/Composing/IBuilderCollection.cs
diff --git a/src/Umbraco.Core/Composing/ICollectionBuilder.cs b/src/Umbraco.Abstractions/Composing/ICollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/ICollectionBuilder.cs
rename to src/Umbraco.Abstractions/Composing/ICollectionBuilder.cs
diff --git a/src/Umbraco.Core/Composing/IComponent.cs b/src/Umbraco.Abstractions/Composing/IComponent.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IComponent.cs
rename to src/Umbraco.Abstractions/Composing/IComponent.cs
diff --git a/src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs b/src/Umbraco.Abstractions/Composing/RuntimeLevelAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs
rename to src/Umbraco.Abstractions/Composing/RuntimeLevelAttribute.cs
diff --git a/src/Umbraco.Core/Composing/WeightAttribute.cs b/src/Umbraco.Abstractions/Composing/WeightAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/WeightAttribute.cs
rename to src/Umbraco.Abstractions/Composing/WeightAttribute.cs
diff --git a/src/Umbraco.Core/DelegateExtensions.cs b/src/Umbraco.Abstractions/DelegateExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/DelegateExtensions.cs
rename to src/Umbraco.Abstractions/DelegateExtensions.cs
diff --git a/src/Umbraco.Core/ExpressionExtensions.cs b/src/Umbraco.Abstractions/ExpressionExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/ExpressionExtensions.cs
rename to src/Umbraco.Abstractions/ExpressionExtensions.cs
diff --git a/src/Umbraco.Core/IDisposeOnRequestEnd.cs b/src/Umbraco.Abstractions/IDisposeOnRequestEnd.cs
similarity index 100%
rename from src/Umbraco.Core/IDisposeOnRequestEnd.cs
rename to src/Umbraco.Abstractions/IDisposeOnRequestEnd.cs
diff --git a/src/Umbraco.Core/KeyValuePairExtensions.cs b/src/Umbraco.Abstractions/KeyValuePairExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/KeyValuePairExtensions.cs
rename to src/Umbraco.Abstractions/KeyValuePairExtensions.cs
diff --git a/src/Umbraco.Core/Models/MigrationEntry.cs b/src/Umbraco.Abstractions/Models/MigrationEntry.cs
similarity index 100%
rename from src/Umbraco.Core/Models/MigrationEntry.cs
rename to src/Umbraco.Abstractions/Models/MigrationEntry.cs
diff --git a/src/Umbraco.Core/Models/Notification.cs b/src/Umbraco.Abstractions/Models/Notification.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Notification.cs
rename to src/Umbraco.Abstractions/Models/Notification.cs
diff --git a/src/Umbraco.Core/Models/NotificationEmailBodyParams.cs b/src/Umbraco.Abstractions/Models/NotificationEmailBodyParams.cs
similarity index 100%
rename from src/Umbraco.Core/Models/NotificationEmailBodyParams.cs
rename to src/Umbraco.Abstractions/Models/NotificationEmailBodyParams.cs
diff --git a/src/Umbraco.Core/Models/NotificationEmailSubjectParams.cs b/src/Umbraco.Abstractions/Models/NotificationEmailSubjectParams.cs
similarity index 100%
rename from src/Umbraco.Core/Models/NotificationEmailSubjectParams.cs
rename to src/Umbraco.Abstractions/Models/NotificationEmailSubjectParams.cs
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Abstractions/Models/ServerRegistration.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ServerRegistration.cs
rename to src/Umbraco.Abstractions/Models/ServerRegistration.cs
diff --git a/src/Umbraco.Core/NetworkHelper.cs b/src/Umbraco.Abstractions/NetworkHelper.cs
similarity index 97%
rename from src/Umbraco.Core/NetworkHelper.cs
rename to src/Umbraco.Abstractions/NetworkHelper.cs
index 8f7c7c1eb8..1929e45ee3 100644
--- a/src/Umbraco.Core/NetworkHelper.cs
+++ b/src/Umbraco.Abstractions/NetworkHelper.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Currently just used to get the machine name in med trust and to format a machine name for use with file names
     /// </summary>
-    internal class NetworkHelper
+    public class NetworkHelper
     {
         /// <summary>
         /// Returns the machine name that is safe to use in file paths.
diff --git a/src/Umbraco.Core/PropertyEditors/EditorType.cs b/src/Umbraco.Abstractions/PropertyEditors/EditorType.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/EditorType.cs
rename to src/Umbraco.Abstractions/PropertyEditors/EditorType.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IConfigureValueType.cs b/src/Umbraco.Abstractions/PropertyEditors/IConfigureValueType.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IConfigureValueType.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IConfigureValueType.cs
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyCacheLevel.cs b/src/Umbraco.Abstractions/PropertyEditors/PropertyCacheLevel.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/PropertyCacheLevel.cs
rename to src/Umbraco.Abstractions/PropertyEditors/PropertyCacheLevel.cs
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueLevel.cs b/src/Umbraco.Abstractions/PropertyEditors/PropertyValueLevel.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/PropertyValueLevel.cs
rename to src/Umbraco.Abstractions/PropertyEditors/PropertyValueLevel.cs
diff --git a/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs b/src/Umbraco.Abstractions/PropertyEditors/TagsPropertyEditorAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
rename to src/Umbraco.Abstractions/PropertyEditors/TagsPropertyEditorAttribute.cs
diff --git a/src/Umbraco.Core/PropertyEditors/ValueTypes.cs b/src/Umbraco.Abstractions/PropertyEditors/ValueTypes.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/ValueTypes.cs
rename to src/Umbraco.Abstractions/PropertyEditors/ValueTypes.cs
diff --git a/src/Umbraco.Core/SemVersionExtensions.cs b/src/Umbraco.Abstractions/SemVersionExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/SemVersionExtensions.cs
rename to src/Umbraco.Abstractions/SemVersionExtensions.cs
diff --git a/src/Umbraco.Core/Serialization/AbstractSerializationService.cs b/src/Umbraco.Abstractions/Serialization/AbstractSerializationService.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/AbstractSerializationService.cs
rename to src/Umbraco.Abstractions/Serialization/AbstractSerializationService.cs
diff --git a/src/Umbraco.Core/Serialization/Formatter.cs b/src/Umbraco.Abstractions/Serialization/Formatter.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/Formatter.cs
rename to src/Umbraco.Abstractions/Serialization/Formatter.cs
diff --git a/src/Umbraco.Core/Serialization/IFormatter.cs b/src/Umbraco.Abstractions/Serialization/IFormatter.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/IFormatter.cs
rename to src/Umbraco.Abstractions/Serialization/IFormatter.cs
diff --git a/src/Umbraco.Core/Serialization/ISerializer.cs b/src/Umbraco.Abstractions/Serialization/ISerializer.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/ISerializer.cs
rename to src/Umbraco.Abstractions/Serialization/ISerializer.cs
diff --git a/src/Umbraco.Core/Serialization/IStreamedResult.cs b/src/Umbraco.Abstractions/Serialization/IStreamedResult.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/IStreamedResult.cs
rename to src/Umbraco.Abstractions/Serialization/IStreamedResult.cs
diff --git a/src/Umbraco.Core/Serialization/SerializationService.cs b/src/Umbraco.Abstractions/Serialization/SerializationService.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/SerializationService.cs
rename to src/Umbraco.Abstractions/Serialization/SerializationService.cs
diff --git a/src/Umbraco.Core/Serialization/StreamResultExtensions.cs b/src/Umbraco.Abstractions/Serialization/StreamResultExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/Serialization/StreamResultExtensions.cs
rename to src/Umbraco.Abstractions/Serialization/StreamResultExtensions.cs
diff --git a/src/Umbraco.Core/Serialization/StreamedResult.cs b/src/Umbraco.Abstractions/Serialization/StreamedResult.cs
similarity index 86%
rename from src/Umbraco.Core/Serialization/StreamedResult.cs
rename to src/Umbraco.Abstractions/Serialization/StreamedResult.cs
index 6bb192cf8a..d1c42e976c 100644
--- a/src/Umbraco.Core/Serialization/StreamedResult.cs
+++ b/src/Umbraco.Abstractions/Serialization/StreamedResult.cs
@@ -4,7 +4,7 @@ namespace Umbraco.Core.Serialization
 {
     public class StreamedResult : IStreamedResult
     {
-        internal StreamedResult(Stream stream, bool success)
+        public StreamedResult(Stream stream, bool success)
         {
             ResultStream = stream;
             Success = success;
diff --git a/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs b/src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
rename to src/Umbraco.Abstractions/Services/Changes/ContentTypeChangeTypes.cs
diff --git a/src/Umbraco.Core/Services/Changes/DomainChangeTypes.cs b/src/Umbraco.Abstractions/Services/Changes/DomainChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Core/Services/Changes/DomainChangeTypes.cs
rename to src/Umbraco.Abstractions/Services/Changes/DomainChangeTypes.cs
diff --git a/src/Umbraco.Core/Services/Changes/TreeChangeTypes.cs b/src/Umbraco.Abstractions/Services/Changes/TreeChangeTypes.cs
similarity index 100%
rename from src/Umbraco.Core/Services/Changes/TreeChangeTypes.cs
rename to src/Umbraco.Abstractions/Services/Changes/TreeChangeTypes.cs
diff --git a/src/Umbraco.Core/Services/IDomainService.cs b/src/Umbraco.Abstractions/Services/IDomainService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IDomainService.cs
rename to src/Umbraco.Abstractions/Services/IDomainService.cs
diff --git a/src/Umbraco.Core/Services/IKeyValueService.cs b/src/Umbraco.Abstractions/Services/IKeyValueService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IKeyValueService.cs
rename to src/Umbraco.Abstractions/Services/IKeyValueService.cs
diff --git a/src/Umbraco.Core/Services/ILocalizedTextService.cs b/src/Umbraco.Abstractions/Services/ILocalizedTextService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/ILocalizedTextService.cs
rename to src/Umbraco.Abstractions/Services/ILocalizedTextService.cs
diff --git a/src/Umbraco.Core/Services/IMemberGroupService.cs b/src/Umbraco.Abstractions/Services/IMemberGroupService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IMemberGroupService.cs
rename to src/Umbraco.Abstractions/Services/IMemberGroupService.cs
diff --git a/src/Umbraco.Core/Services/IRedirectUrlService.cs b/src/Umbraco.Abstractions/Services/IRedirectUrlService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IRedirectUrlService.cs
rename to src/Umbraco.Abstractions/Services/IRedirectUrlService.cs
diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Abstractions/Services/IRelationService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IRelationService.cs
rename to src/Umbraco.Abstractions/Services/IRelationService.cs
diff --git a/src/Umbraco.Abstractions/IRuntime.cs b/src/Umbraco.Abstractions/Services/IRuntime.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IRuntime.cs
rename to src/Umbraco.Abstractions/Services/IRuntime.cs
diff --git a/src/Umbraco.Abstractions/IRuntimeState.cs b/src/Umbraco.Abstractions/Services/IRuntimeState.cs
similarity index 100%
rename from src/Umbraco.Abstractions/IRuntimeState.cs
rename to src/Umbraco.Abstractions/Services/IRuntimeState.cs
diff --git a/src/Umbraco.Core/Services/IServerRegistrationService.cs b/src/Umbraco.Abstractions/Services/IServerRegistrationService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IServerRegistrationService.cs
rename to src/Umbraco.Abstractions/Services/IServerRegistrationService.cs
diff --git a/src/Umbraco.Core/Services/ITagService.cs b/src/Umbraco.Abstractions/Services/ITagService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/ITagService.cs
rename to src/Umbraco.Abstractions/Services/ITagService.cs
diff --git a/src/Umbraco.Core/Services/MoveOperationStatusType.cs b/src/Umbraco.Abstractions/Services/MoveOperationStatusType.cs
similarity index 100%
rename from src/Umbraco.Core/Services/MoveOperationStatusType.cs
rename to src/Umbraco.Abstractions/Services/MoveOperationStatusType.cs
diff --git a/src/Umbraco.Core/Services/OperationResult.cs b/src/Umbraco.Abstractions/Services/OperationResult.cs
similarity index 99%
rename from src/Umbraco.Core/Services/OperationResult.cs
rename to src/Umbraco.Abstractions/Services/OperationResult.cs
index d5cdcd79fc..2f0c09e272 100644
--- a/src/Umbraco.Core/Services/OperationResult.cs
+++ b/src/Umbraco.Abstractions/Services/OperationResult.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Events;
 namespace Umbraco.Core.Services
 {
     // TODO: no need for Attempt<OperationResult> - the operation result SHOULD KNOW if it's a success or a failure!
-    // but then each WhateverResultType must 
+    // but then each WhateverResultType must
 
     /// <summary>
     /// Represents the result of a service operation.
@@ -120,7 +120,7 @@ namespace Umbraco.Core.Services
 
         // TODO: this exists to support services that still return Attempt<OperationResult>
         // these services should directly return an OperationResult, and then this static class should be deleted
-        internal static class Attempt
+        public static class Attempt
         {
             /// <summary>
             /// Creates a successful operation attempt.
diff --git a/src/Umbraco.Core/Services/OperationResultType.cs b/src/Umbraco.Abstractions/Services/OperationResultType.cs
similarity index 100%
rename from src/Umbraco.Core/Services/OperationResultType.cs
rename to src/Umbraco.Abstractions/Services/OperationResultType.cs
diff --git a/src/Umbraco.Core/Services/Ordering.cs b/src/Umbraco.Abstractions/Services/Ordering.cs
similarity index 97%
rename from src/Umbraco.Core/Services/Ordering.cs
rename to src/Umbraco.Abstractions/Services/Ordering.cs
index 9713aa6bf5..b2f4cf4808 100644
--- a/src/Umbraco.Core/Services/Ordering.cs
+++ b/src/Umbraco.Abstractions/Services/Ordering.cs
@@ -1,6 +1,4 @@
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-
-namespace Umbraco.Core.Services
+namespace Umbraco.Core.Services
 {
     /// <summary>
     /// Represents ordering information.
diff --git a/src/Umbraco.Core/Services/PublishResultType.cs b/src/Umbraco.Abstractions/Services/PublishResultType.cs
similarity index 100%
rename from src/Umbraco.Core/Services/PublishResultType.cs
rename to src/Umbraco.Abstractions/Services/PublishResultType.cs
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Abstractions/Strings/DefaultShortStringHelper.cs
similarity index 100%
rename from src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
rename to src/Umbraco.Abstractions/Strings/DefaultShortStringHelper.cs
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Abstractions/Strings/DefaultShortStringHelperConfig.cs
similarity index 100%
rename from src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
rename to src/Umbraco.Abstractions/Strings/DefaultShortStringHelperConfig.cs
diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs b/src/Umbraco.Abstractions/Sync/DatabaseServerMessengerOptions.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs
rename to src/Umbraco.Abstractions/Sync/DatabaseServerMessengerOptions.cs
diff --git a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs b/src/Umbraco.Abstractions/Sync/DatabaseServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
rename to src/Umbraco.Abstractions/Sync/DatabaseServerRegistrar.cs
diff --git a/src/Umbraco.Core/Sync/DatabaseServerRegistrarOptions.cs b/src/Umbraco.Abstractions/Sync/DatabaseServerRegistrarOptions.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/DatabaseServerRegistrarOptions.cs
rename to src/Umbraco.Abstractions/Sync/DatabaseServerRegistrarOptions.cs
diff --git a/src/Umbraco.Core/Sync/IServerMessenger.cs b/src/Umbraco.Abstractions/Sync/IServerMessenger.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/IServerMessenger.cs
rename to src/Umbraco.Abstractions/Sync/IServerMessenger.cs
diff --git a/src/Umbraco.Core/Sync/IServerRegistrar.cs b/src/Umbraco.Abstractions/Sync/IServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/IServerRegistrar.cs
rename to src/Umbraco.Abstractions/Sync/IServerRegistrar.cs
diff --git a/src/Umbraco.Core/Sync/MessageType.cs b/src/Umbraco.Abstractions/Sync/MessageType.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/MessageType.cs
rename to src/Umbraco.Abstractions/Sync/MessageType.cs
diff --git a/src/Umbraco.Core/Sync/RefreshMethodType.cs b/src/Umbraco.Abstractions/Sync/RefreshMethodType.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/RefreshMethodType.cs
rename to src/Umbraco.Abstractions/Sync/RefreshMethodType.cs
diff --git a/src/Umbraco.Core/Sync/SingleServerRegistrar.cs b/src/Umbraco.Abstractions/Sync/SingleServerRegistrar.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/SingleServerRegistrar.cs
rename to src/Umbraco.Abstractions/Sync/SingleServerRegistrar.cs
diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
index 6f7272beee..5449318e7a 100644
--- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
+++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Models
         [FriendlyName("Member Group")]
         [UmbracoUdiType(Constants.UdiEntityType.MemberGroup)]
         MemberGroup,
-        
+
         /// <summary>
         /// "Media Type
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IDataEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
similarity index 98%
rename from src/Umbraco.Core/Models/IDataEditor.cs
rename to src/Umbraco.Core/PropertyEditors/IDataEditor.cs
index e7aa68459e..3685cc6494 100644
--- a/src/Umbraco.Core/Models/IDataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index 9cd4a58c65..1e1bc8d293 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -2,7 +2,6 @@
 using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 924dcaa11a..27462d10fd 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -144,29 +144,23 @@
     <Compile Include="Cache\DictionaryAppCache.cs" />
     <Compile Include="Cache\TypedCacheRefresherBase.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
+    <Compile Include="Composing\CollectionBuilderBase.cs" />
     <Compile Include="Composing\ComponentComposer.cs" />
+    <Compile Include="Composing\ComposeAfterAttribute.cs" />
+    <Compile Include="Composing\ComposeBeforeAttribute.cs" />
     <Compile Include="Composing\Composers.cs" />
     <Compile Include="Composing\Composition.cs" />
+    <Compile Include="Composing\IComposer.cs" />
+    <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\SetCollectionBuilderBase.cs" />
     <Compile Include="CompositionExtensions.cs" />
-    <Compile Include="Composing\DisableAttribute.cs" />
-    <Compile Include="Composing\DisableComposerAttribute.cs" />
-    <Compile Include="Composing\EnableAttribute.cs" />
-    <Compile Include="Composing\EnableComposerAttribute.cs" />
-    <Compile Include="Composing\IComposer.cs" />
     <Compile Include="Composing\ICoreComposer.cs" />
-    <Compile Include="Composing\IComponent.cs" />
     <Compile Include="Composing\IUserComposer.cs" />
     <Compile Include="Compose\ManifestWatcherComposer.cs" />
     <Compile Include="Compose\RelateOnCopyComposer.cs" />
     <Compile Include="Compose\RelateOnTrashComposer.cs" />
-    <Compile Include="Composing\ComposeAfterAttribute.cs" />
-    <Compile Include="Composing\ComposeBeforeAttribute.cs" />
-    <Compile Include="Composing\RuntimeLevelAttribute.cs" />
     <Compile Include="Composing\ComponentCollection.cs" />
     <Compile Include="Composing\ComponentCollectionBuilder.cs" />
-    <Compile Include="Composing\BuilderCollectionBase.cs" />
-    <Compile Include="Composing\CollectionBuilderBase.cs" />
     <Compile Include="Composing\CompositionExtensions\Configuration.cs" />
     <Compile Include="Composing\CompositionExtensions\CoreMappingProfiles.cs" />
     <Compile Include="Composing\CompositionExtensions\FileSystems.cs" />
@@ -212,11 +206,7 @@
     <Compile Include="Events\RollbackEventArgs.cs" />
     <Compile Include="Events\SendToPublishEventArgs.cs" />
     <Compile Include="FactoryExtensions.cs" />
-    <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
-    <Compile Include="Composing\HideFromTypeFinderAttribute.cs" />
-    <Compile Include="Composing\IBuilderCollection.cs" />
-    <Compile Include="Composing\ICollectionBuilder.cs" />
     <Compile Include="Composing\LazyCollectionBuilderBase.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
@@ -240,7 +230,6 @@
     <Compile Include="Models\IContentType.cs" />
     <Compile Include="Models\IContentTypeBase.cs" />
     <Compile Include="Models\IContentTypeComposition.cs" />
-    <Compile Include="Models\IDataEditor.cs" />
     <Compile Include="Models\IDataType.cs" />
     <Compile Include="Models\IDataValueEditor.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
@@ -248,10 +237,13 @@
     <Compile Include="Models\IMediaType.cs" />
     <Compile Include="Models\IMember.cs" />
     <Compile Include="Models\IMemberType.cs" />
+    <Compile Include="Models\Language.cs" />
+    <Compile Include="Models\Macro.cs" />
     <Compile Include="Models\MacroProperty.cs" />
     <Compile Include="Models\Membership\ContentPermissionSet.cs" />
     <Compile Include="Models\Membership\UserGroup.cs" />
     <Compile Include="Models\Membership\UserGroupExtensions.cs" />
+    <Compile Include="Models\ObjectTypes.cs" />
     <Compile Include="Models\Packaging\PackageDefinition.cs" />
     <Compile Include="Models\Property.cs" />
     <Compile Include="Models\PropertyCollection.cs" />
@@ -275,14 +267,38 @@
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
+    <Compile Include="PropertyEditors\ConfigurationField.cs" />
+    <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
+    <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
     <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
+    <Compile Include="PropertyEditors\IDataEditor.cs" />
+    <Compile Include="PropertyEditors\IPropertyIndexValueFactory.cs" />
+    <Compile Include="PropertyEditors\IValueValidator.cs" />
+    <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
+    <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
+    <Compile Include="PropertyEditors\VoidEditor.cs" />
     <Compile Include="PublishedModelFactoryExtensions.cs" />
+    <Compile Include="Serialization\SerializationExtensions.cs" />
+    <Compile Include="Services\Changes\ContentTypeChange.cs" />
+    <Compile Include="Services\Changes\ContentTypeChangeExtensions.cs" />
+    <Compile Include="Services\Changes\TreeChange.cs" />
+    <Compile Include="Services\Changes\TreeChangeExtensions.cs" />
+    <Compile Include="Services\IDataTypeService.cs" />
+    <Compile Include="Services\IFileService.cs" />
+    <Compile Include="Services\ILocalizationService.cs" />
+    <Compile Include="Services\IMacroService.cs" />
+    <Compile Include="Services\IPackagingService.cs" />
+    <Compile Include="Services\LocalizedTextServiceExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
     <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
     <Compile Include="StringExtensions.cs" />
+    <Compile Include="Strings\DefaultUrlSegmentProvider.cs" />
+    <Compile Include="Strings\IUrlSegmentProvider.cs" />
+    <Compile Include="Strings\UrlSegmentProviderCollection.cs" />
+    <Compile Include="Sync\RefreshInstructionEnvelope.cs" />
+    <Compile Include="TypeExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
-    <Compile Include="Composing\WeightAttribute.cs" />
     <Compile Include="Composing\WeightedCollectionBuilderBase.cs" />
     <Compile Include="Configuration\CaseInsensitiveEnumConfigConverter.cs" />
     <Compile Include="Configuration\CommaDelimitedConfigurationElement.cs" />
@@ -345,7 +361,6 @@
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
     <Compile Include="IO\SupportingFileSystems.cs" />
-    <Compile Include="KeyValuePairExtensions.cs" />
     <Compile Include="Logging\Viewer\CountingFilter.cs" />
     <Compile Include="Logging\Viewer\ErrorCounterFilter.cs" />
     <Compile Include="Logging\Viewer\ExpressionFilter.cs" />
@@ -430,8 +445,6 @@
     <Compile Include="Models\ContentTagsExtensions.cs" />
     <Compile Include="Models\ContentTypeBaseExtensions.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
-    <Compile Include="Models\NotificationEmailBodyParams.cs" />
-    <Compile Include="Models\NotificationEmailSubjectParams.cs" />
     <Compile Include="Models\Packaging\CompiledPackage.cs" />
     <Compile Include="Models\Packaging\CompiledPackageDocument.cs" />
     <Compile Include="Models\Packaging\CompiledPackageFile.cs" />
@@ -476,17 +489,13 @@
     <Compile Include="Persistence\UmbracoPocoDataBuilder.cs" />
     <Compile Include="PropertyEditors\ColorPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ConfigurationEditorOfTConfiguration.cs" />
-    <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
     <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
     <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
-    <Compile Include="PropertyEditors\EditorType.cs" />
     <Compile Include="PropertyEditors\IConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\IConfigureValueType.cs" />
     <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
     <Compile Include="PropertyEditors\IManifestValueValidator.cs" />
     <Compile Include="PropertyEditors\IValueFormatValidator.cs" />
-    <Compile Include="PropertyEditors\IPropertyIndexValueFactory.cs" />
     <Compile Include="PropertyEditors\IValueRequiredValidator.cs" />
     <Compile Include="PropertyEditors\LabelConfiguration.cs" />
     <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
@@ -494,13 +503,11 @@
     <Compile Include="PropertyEditors\ParameterEditorCollection.cs" />
     <Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
     <Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
-    <Compile Include="PropertyEditors\PropertyValueLevel.cs" />
     <Compile Include="PropertyEditors\SliderConfiguration.cs" />
     <Compile Include="PropertyEditors\TagConfiguration.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
     <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
-    <Compile Include="PropertyEditors\VoidEditor.cs" />
     <Compile Include="ReflectionUtilities-Unused.cs" />
     <Compile Include="RuntimeOptions.cs" />
     <Compile Include="Runtime\CoreRuntime.cs" />
@@ -512,7 +519,6 @@
     <Compile Include="Migrations\Expressions\Delete\KeysAndIndexes\DeleteKeysAndIndexesBuilder.cs" />
     <Compile Include="Migrations\IMigrationBuilder.cs" />
     <Compile Include="Migrations\Install\DatabaseBuilder.cs" />
-    <Compile Include="DelegateExtensions.cs" />
     <Compile Include="Deploy\ArtifactBase.cs" />
     <Compile Include="Deploy\ArtifactDependency.cs" />
     <Compile Include="Deploy\ArtifactDependencyCollection.cs" />
@@ -543,11 +549,9 @@
     <Compile Include="Events\TransientEventMessagesFactory.cs" />
     <Compile Include="Events\UninstallPackageEventArgs.cs" />
     <Compile Include="Composing\LightInject\LightInjectException.cs" />
-    <Compile Include="ExpressionExtensions.cs" />
     <Compile Include="FileResources\Files.Designer.cs" />
     <Compile Include="GuidUdi.cs" />
     <Compile Include="HttpContextExtensions.cs" />
-    <Compile Include="IDisposeOnRequestEnd.cs" />
     <Compile Include="IO\FileSecurityException.cs" />
     <Compile Include="IO\FileSystemExtensions.cs" />
     <Compile Include="IO\FileSystems.cs" />
@@ -599,8 +603,6 @@
     <Compile Include="Models\GridValue.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
-    <Compile Include="Models\Language.cs" />
-    <Compile Include="Models\Macro.cs" />
     <Compile Include="Models\Media.cs" />
     <Compile Include="Models\MediaExtensions.cs" />
     <Compile Include="Models\MediaType.cs" />
@@ -612,8 +614,6 @@
     <Compile Include="Models\Membership\User.cs" />
     <Compile Include="Models\MemberType.cs" />
     <Compile Include="Models\MemberTypePropertyProfileAccess.cs" />
-    <Compile Include="Models\MigrationEntry.cs" />
-    <Compile Include="Models\Notification.cs" />
     <Compile Include="Models\Packaging\InstallationSummary.cs" />
     <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
     <Compile Include="Models\PropertyGroup.cs" />
@@ -679,15 +679,12 @@
     <Compile Include="Persistence\Dtos\UserGroup2NodePermissionDto.cs" />
     <Compile Include="Persistence\Dtos\UserGroupDto.cs" />
     <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
-    <Compile Include="Models\ServerRegistration.cs" />
     <Compile Include="Models\UmbracoDomain.cs" />
     <Compile Include="Models\UmbracoObjectTypes.cs" />
-    <Compile Include="Models\ObjectTypes.cs" />
     <Compile Include="Models\UserExtensions.cs" />
     <Compile Include="Models\Validation\RequiredForPersistenceAttribute.cs" />
     <Compile Include="NamedUdiRange.cs" />
     <Compile Include="NameValueCollectionExtensions.cs" />
-    <Compile Include="NetworkHelper.cs" />
     <Compile Include="ObjectExtensions.cs" />
     <Compile Include="Packaging\ConflictingPackageData.cs" />
     <Compile Include="Models\Packaging\UninstallationSummary.cs" />
@@ -1053,22 +1050,14 @@
     <Compile Include="PropertyEditors\Validators\EmailValidator.cs" />
     <Compile Include="PropertyEditors\GridEditor.cs" />
     <Compile Include="PropertyEditors\Validators\IntegerValidator.cs" />
-    <Compile Include="PropertyEditors\IValueValidator.cs" />
     <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\DataEditor.cs" />
-    <Compile Include="PropertyEditors\ConfigurationField.cs" />
-    <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
-    <Compile Include="PropertyEditors\PropertyCacheLevel.cs" />
     <Compile Include="PropertyEditors\DataEditorCollection.cs" />
     <Compile Include="PropertyEditors\DataEditorCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\ValueTypes.cs" />
     <Compile Include="PropertyEditors\PropertyValueConverterBase.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\DataValueEditor.cs" />
     <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
     <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditorAttribute.cs" />
     <Compile Include="PropertyEditors\ManifestValueValidatorCollection.cs" />
     <Compile Include="PropertyEditors\ManifestValueValidatorCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
@@ -1123,37 +1112,20 @@
     <Compile Include="Security\UmbracoEmailMessage.cs" />
     <Compile Include="Security\UmbracoMembershipProviderBase.cs" />
     <Compile Include="Security\UserAwareMembershipProviderPasswordHasher.cs" />
-    <Compile Include="SemVersionExtensions.cs" />
-    <Compile Include="Serialization\AbstractSerializationService.cs" />
     <Compile Include="Serialization\CaseInsensitiveDictionaryConverter.cs" />
     <Compile Include="Serialization\ForceInt32Converter.cs" />
-    <Compile Include="Serialization\Formatter.cs" />
-    <Compile Include="Serialization\IFormatter.cs" />
-    <Compile Include="Serialization\ISerializer.cs" />
-    <Compile Include="Serialization\IStreamedResult.cs" />
     <Compile Include="Serialization\JsonReadConverter.cs" />
     <Compile Include="Serialization\JsonNetSerializer.cs" />
     <Compile Include="Serialization\JsonToStringConverter.cs" />
     <Compile Include="Serialization\KnownTypeUdiJsonConverter.cs" />
     <Compile Include="Serialization\NoTypeConverterJsonConverter.cs" />
     <Compile Include="Serialization\FuzzyBooleanConverter.cs" />
-    <Compile Include="Serialization\SerializationExtensions.cs" />
-    <Compile Include="Serialization\SerializationService.cs" />
-    <Compile Include="Serialization\StreamedResult.cs" />
-    <Compile Include="Serialization\StreamResultExtensions.cs" />
     <Compile Include="Serialization\UdiJsonConverter.cs" />
     <Compile Include="Serialization\UdiRangeJsonConverter.cs" />
     <Compile Include="ServiceContextExtensions.cs" />
     <Compile Include="Services\IContentTypeBaseServiceProvider.cs" />
     <Compile Include="Services\IEntityXmlSerializer.cs" />
     <Compile Include="Services\Implement\AuditService.cs" />
-    <Compile Include="Services\Changes\ContentTypeChange.cs" />
-    <Compile Include="Services\Changes\ContentTypeChangeExtensions.cs" />
-    <Compile Include="Services\Changes\ContentTypeChangeTypes.cs" />
-    <Compile Include="Services\Changes\DomainChangeTypes.cs" />
-    <Compile Include="Services\Changes\TreeChange.cs" />
-    <Compile Include="Services\Changes\TreeChangeExtensions.cs" />
-    <Compile Include="Services\Changes\TreeChangeTypes.cs" />
     <Compile Include="Services\Implement\ConsentService.cs" />
     <Compile Include="Services\Implement\ContentService.cs" />
     <Compile Include="Services\ContentServiceExtensions.cs" />
@@ -1174,19 +1146,11 @@
     <Compile Include="Services\IContentServiceBase.cs" />
     <Compile Include="Services\IContentTypeService.cs" />
     <Compile Include="Services\IContentTypeServiceBase.cs" />
-    <Compile Include="Services\IDataTypeService.cs" />
     <Compile Include="Services\IdkMap.cs" />
-    <Compile Include="Services\IDomainService.cs" />
     <Compile Include="Services\IEntityService.cs" />
     <Compile Include="Services\IExternalLoginService.cs" />
-    <Compile Include="Services\IFileService.cs" />
-    <Compile Include="Services\IKeyValueService.cs" />
-    <Compile Include="Services\ILocalizationService.cs" />
-    <Compile Include="Services\ILocalizedTextService.cs" />
-    <Compile Include="Services\IMacroService.cs" />
     <Compile Include="Services\IMediaService.cs" />
     <Compile Include="Services\IMediaTypeService.cs" />
-    <Compile Include="Services\IMemberGroupService.cs" />
     <Compile Include="Services\IMemberService.cs" />
     <Compile Include="Services\IMembershipMemberService.cs" />
     <Compile Include="Services\IMembershipRoleService.cs" />
@@ -1194,16 +1158,10 @@
     <Compile Include="Services\IMemberTypeService.cs" />
     <Compile Include="Services\Implement\KeyValueService.cs" />
     <Compile Include="Services\INotificationService.cs" />
-    <Compile Include="Services\IPackagingService.cs" />
     <Compile Include="Services\IPublicAccessService.cs" />
-    <Compile Include="Services\IRedirectUrlService.cs" />
-    <Compile Include="Services\IRelationService.cs" />
-    <Compile Include="Services\IServerRegistrationService.cs" />
-    <Compile Include="Services\ITagService.cs" />
     <Compile Include="Services\IUserService.cs" />
     <Compile Include="Services\Implement\LocalizationService.cs" />
     <Compile Include="Services\Implement\LocalizedTextService.cs" />
-    <Compile Include="Services\LocalizedTextServiceExtensions.cs" />
     <Compile Include="Services\Implement\LocalizedTextServiceFileSources.cs" />
     <Compile Include="Services\Implement\LocalizedTextServiceSupplementaryFileSource.cs" />
     <Compile Include="Services\Implement\MacroService.cs" />
@@ -1212,16 +1170,11 @@
     <Compile Include="Services\Implement\MemberGroupService.cs" />
     <Compile Include="Services\Implement\MemberService.cs" />
     <Compile Include="Services\Implement\MemberTypeService.cs" />
-    <Compile Include="Services\MoveOperationStatusType.cs" />
     <Compile Include="Services\Implement\NotificationService.cs" />
-    <Compile Include="Services\OperationResult.cs" />
-    <Compile Include="Services\OperationResultType.cs" />
     <Compile Include="Services\Implement\PackagingService.cs" />
     <Compile Include="Services\Implement\PublicAccessService.cs" />
-    <Compile Include="Services\Ordering.cs" />
     <Compile Include="Services\PublicAccessServiceExtensions.cs" />
     <Compile Include="Services\PublishResult.cs" />
-    <Compile Include="Services\PublishResultType.cs" />
     <Compile Include="Services\Implement\RedirectUrlService.cs" />
     <Compile Include="Services\Implement\RelationService.cs" />
     <Compile Include="Services\Implement\RepositoryService.cs" />
@@ -1234,27 +1187,12 @@
     <Compile Include="Compose\ManifestWatcherComponent.cs" />
     <Compile Include="Compose\RelateOnCopyComponent.cs" />
     <Compile Include="Compose\RelateOnTrashComponent.cs" />
-    <Compile Include="Strings\DefaultShortStringHelper.cs" />
-    <Compile Include="Strings\DefaultShortStringHelperConfig.cs" />
-    <Compile Include="Strings\DefaultUrlSegmentProvider.cs" />
-    <Compile Include="Strings\IUrlSegmentProvider.cs" />
-    <Compile Include="Strings\UrlSegmentProviderCollection.cs" />
     <Compile Include="Strings\UrlSegmentProviderCollectionBuilder.cs" />
     <Compile Include="StringUdi.cs" />
     <Compile Include="Sync\ApplicationUrlHelper.cs" />
     <Compile Include="Sync\DatabaseServerMessenger.cs" />
-    <Compile Include="Sync\DatabaseServerMessengerOptions.cs" />
-    <Compile Include="Sync\DatabaseServerRegistrar.cs" />
-    <Compile Include="Sync\DatabaseServerRegistrarOptions.cs" />
-    <Compile Include="Sync\IServerMessenger.cs" />
-    <Compile Include="Sync\IServerRegistrar.cs" />
-    <Compile Include="Sync\MessageType.cs" />
     <Compile Include="Sync\RefreshInstruction.cs" />
-    <Compile Include="Sync\RefreshInstructionEnvelope.cs" />
-    <Compile Include="Sync\RefreshMethodType.cs" />
     <Compile Include="Sync\ServerMessengerBase.cs" />
-    <Compile Include="Sync\SingleServerRegistrar.cs" />
-    <Compile Include="TypeExtensions.cs" />
     <Compile Include="Udi.cs" />
     <Compile Include="UdiDefinitionAttribute.cs" />
     <Compile Include="UdiEntityType.cs" />