diff --git a/src/Umbraco.Core/Models/ContentCultureInfos.cs b/src/Umbraco.Abstractions/Models/ContentCultureInfos.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentCultureInfos.cs
rename to src/Umbraco.Abstractions/Models/ContentCultureInfos.cs
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs b/src/Umbraco.Abstractions/Models/ContentCultureInfosCollection.cs
similarity index 97%
rename from src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
rename to src/Umbraco.Abstractions/Models/ContentCultureInfosCollection.cs
index 52f6f9adb6..d3ce5ab044 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
+++ b/src/Umbraco.Abstractions/Models/ContentCultureInfosCollection.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Exceptions;
@@ -17,7 +16,7 @@ namespace Umbraco.Core.Models
         public ContentCultureInfosCollection()
             : base(x => x.Culture, StringComparer.InvariantCultureIgnoreCase)
         { }
-        
+
         /// <summary>
         /// Adds or updates a <see cref="ContentCultureInfos"/> instance.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/Editors/ContentPropertyData.cs b/src/Umbraco.Abstractions/Models/Editors/ContentPropertyData.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Editors/ContentPropertyData.cs
rename to src/Umbraco.Abstractions/Models/Editors/ContentPropertyData.cs
diff --git a/src/Umbraco.Core/Models/Editors/ContentPropertyFile.cs b/src/Umbraco.Abstractions/Models/Editors/ContentPropertyFile.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Editors/ContentPropertyFile.cs
rename to src/Umbraco.Abstractions/Models/Editors/ContentPropertyFile.cs
diff --git a/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs b/src/Umbraco.Abstractions/Models/Identity/IIdentityUserLogin.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
rename to src/Umbraco.Abstractions/Models/Identity/IIdentityUserLogin.cs
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUserClaim.cs b/src/Umbraco.Abstractions/Models/Identity/IdentityUserClaim.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Identity/IdentityUserClaim.cs
rename to src/Umbraco.Abstractions/Models/Identity/IdentityUserClaim.cs
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs b/src/Umbraco.Abstractions/Models/Identity/IdentityUserLogin.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
rename to src/Umbraco.Abstractions/Models/Identity/IdentityUserLogin.cs
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUserRole.cs b/src/Umbraco.Abstractions/Models/Identity/IdentityUserRole.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Identity/IdentityUserRole.cs
rename to src/Umbraco.Abstractions/Models/Identity/IdentityUserRole.cs
diff --git a/src/Umbraco.Core/Models/Membership/EntityPermission.cs b/src/Umbraco.Abstractions/Models/Membership/EntityPermission.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/EntityPermission.cs
rename to src/Umbraco.Abstractions/Models/Membership/EntityPermission.cs
diff --git a/src/Umbraco.Core/Models/Membership/EntityPermissionCollection.cs b/src/Umbraco.Abstractions/Models/Membership/EntityPermissionCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/EntityPermissionCollection.cs
rename to src/Umbraco.Abstractions/Models/Membership/EntityPermissionCollection.cs
diff --git a/src/Umbraco.Core/Models/Membership/EntityPermissionSet.cs b/src/Umbraco.Abstractions/Models/Membership/EntityPermissionSet.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/EntityPermissionSet.cs
rename to src/Umbraco.Abstractions/Models/Membership/EntityPermissionSet.cs
diff --git a/src/Umbraco.Core/Models/Membership/MemberCountType.cs b/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/MemberCountType.cs
rename to src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
diff --git a/src/Umbraco.Core/Models/Membership/MemberExportModel.cs b/src/Umbraco.Abstractions/Models/Membership/MemberExportModel.cs
similarity index 93%
rename from src/Umbraco.Core/Models/Membership/MemberExportModel.cs
rename to src/Umbraco.Abstractions/Models/Membership/MemberExportModel.cs
index 7153d380b4..7a87033ac2 100644
--- a/src/Umbraco.Core/Models/Membership/MemberExportModel.cs
+++ b/src/Umbraco.Abstractions/Models/Membership/MemberExportModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Models.Membership
 {
-    internal class MemberExportModel
+    public class MemberExportModel
     {
         public int Id { get; set; }
         public Guid Key { get; set; }
diff --git a/src/Umbraco.Core/Models/Membership/MemberExportProperty.cs b/src/Umbraco.Abstractions/Models/Membership/MemberExportProperty.cs
similarity index 89%
rename from src/Umbraco.Core/Models/Membership/MemberExportProperty.cs
rename to src/Umbraco.Abstractions/Models/Membership/MemberExportProperty.cs
index 546d9255ea..3d20eb9123 100644
--- a/src/Umbraco.Core/Models/Membership/MemberExportProperty.cs
+++ b/src/Umbraco.Abstractions/Models/Membership/MemberExportProperty.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Models.Membership
 {
-    internal class MemberExportProperty
+    public class MemberExportProperty
     {
         public int Id { get; set; }
         public string Alias { get; set; }
diff --git a/src/Umbraco.Core/Models/Membership/MembershipScenario.cs b/src/Umbraco.Abstractions/Models/Membership/MembershipScenario.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/MembershipScenario.cs
rename to src/Umbraco.Abstractions/Models/Membership/MembershipScenario.cs
diff --git a/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs b/src/Umbraco.Abstractions/Models/Membership/ReadOnlyUserGroup.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
rename to src/Umbraco.Abstractions/Models/Membership/ReadOnlyUserGroup.cs
diff --git a/src/Umbraco.Core/Models/Membership/UserProfile.cs b/src/Umbraco.Abstractions/Models/Membership/UserProfile.cs
similarity index 94%
rename from src/Umbraco.Core/Models/Membership/UserProfile.cs
rename to src/Umbraco.Abstractions/Models/Membership/UserProfile.cs
index 8d7ae5437b..14b08dd3cd 100644
--- a/src/Umbraco.Core/Models/Membership/UserProfile.cs
+++ b/src/Umbraco.Abstractions/Models/Membership/UserProfile.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Models.Membership
 {
-    internal class UserProfile : IProfile, IEquatable<UserProfile>
+    public class UserProfile : IProfile, IEquatable<UserProfile>
     {
         public UserProfile(int id, string name)
         {
diff --git a/src/Umbraco.Core/Models/Packaging/ActionRunAt.cs b/src/Umbraco.Abstractions/Models/Packaging/ActionRunAt.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Packaging/ActionRunAt.cs
rename to src/Umbraco.Abstractions/Models/Packaging/ActionRunAt.cs
diff --git a/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs b/src/Umbraco.Abstractions/Models/Packaging/IPackageInfo.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
rename to src/Umbraco.Abstractions/Models/Packaging/IPackageInfo.cs
diff --git a/src/Umbraco.Core/Models/Packaging/PackageAction.cs b/src/Umbraco.Abstractions/Models/Packaging/PackageAction.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Packaging/PackageAction.cs
rename to src/Umbraco.Abstractions/Models/Packaging/PackageAction.cs
diff --git a/src/Umbraco.Core/Models/Packaging/RequirementsType.cs b/src/Umbraco.Abstractions/Models/Packaging/RequirementsType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Packaging/RequirementsType.cs
rename to src/Umbraco.Abstractions/Models/Packaging/RequirementsType.cs
diff --git a/src/Umbraco.Core/Models/Script.cs b/src/Umbraco.Abstractions/Models/Script.cs
similarity index 84%
rename from src/Umbraco.Core/Models/Script.cs
rename to src/Umbraco.Abstractions/Models/Script.cs
index bd8f71299c..b6e49f72ee 100644
--- a/src/Umbraco.Core/Models/Script.cs
+++ b/src/Umbraco.Abstractions/Models/Script.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.Serialization;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
+
 
 namespace Umbraco.Core.Models
 {
@@ -16,7 +15,7 @@ namespace Umbraco.Core.Models
             : this(path, (Func<File, string>) null)
         { }
 
-        internal Script(string path, Func<File, string> getFileContent)
+        public Script(string path, Func<File, string> getFileContent)
             : base(path, getFileContent)
         { }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 89f1bcdb66..03458c8e9e 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -208,11 +208,18 @@
     <Compile Include="Models\IDataEditor.cs" />
     <Compile Include="Models\IDataType.cs" />
     <Compile Include="Models\IDataValueEditor.cs" />
+    <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\IMedia.cs" />
     <Compile Include="Models\IMediaType.cs" />
     <Compile Include="Models\IMember.cs" />
     <Compile Include="Models\IMemberType.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\Packaging\PackageDefinition.cs" />
+    <Compile Include="Models\Property.cs" />
+    <Compile Include="Models\PropertyCollection.cs" />
     <Compile Include="Models\PublicAccessEntry.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
@@ -398,21 +405,12 @@
     <Compile Include="Models\ContentScheduleCollection.cs" />
     <Compile Include="Models\ContentTagsExtensions.cs" />
     <Compile Include="Models\ContentTypeBaseExtensions.cs" />
-    <Compile Include="Models\ContentCultureInfos.cs" />
-    <Compile Include="Models\ContentCultureInfosCollection.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
-    <Compile Include="Models\Editors\ContentPropertyFile.cs" />
-    <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
-    <Compile Include="Models\Membership\MemberExportModel.cs" />
-    <Compile Include="Models\Membership\MemberExportProperty.cs" />
     <Compile Include="Models\NotificationEmailBodyParams.cs" />
     <Compile Include="Models\NotificationEmailSubjectParams.cs" />
-    <Compile Include="Models\Packaging\ActionRunAt.cs" />
     <Compile Include="Models\Packaging\CompiledPackage.cs" />
     <Compile Include="Models\Packaging\CompiledPackageDocument.cs" />
     <Compile Include="Models\Packaging\CompiledPackageFile.cs" />
-    <Compile Include="Models\Packaging\IPackageInfo.cs" />
-    <Compile Include="Models\Packaging\PackageDefinition.cs" />
     <Compile Include="Models\PathValidationExtensions.cs" />
     <Compile Include="Models\PropertyTagsExtensions.cs" />
     <Compile Include="Models\PublishedContent\Fallback.cs" />
@@ -438,7 +436,6 @@
     <Compile Include="Packaging\PackageFileInstallation.cs" />
     <Compile Include="Packaging\PackageInstallType.cs" />
     <Compile Include="Packaging\PackagesRepository.cs" />
-    <Compile Include="Models\Packaging\RequirementsType.cs" />
     <Compile Include="Persistence\Dtos\AuditEntryDto.cs" />
     <Compile Include="Persistence\Dtos\ConsentDto.cs" />
     <Compile Include="Persistence\Dtos\ContentScheduleDto.cs" />
@@ -620,16 +617,11 @@
     <Compile Include="Models\DictionaryItem.cs" />
     <Compile Include="Models\DictionaryItemExtensions.cs" />
     <Compile Include="Models\DictionaryTranslation.cs" />
-    <Compile Include="Models\Editors\ContentPropertyData.cs" />
     <Compile Include="Models\EntityContainer.cs" />
     <Compile Include="Models\EntityExtensions.cs" />
     <Compile Include="Models\GridValue.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
-    <Compile Include="Models\Identity\IdentityUserClaim.cs" />
-    <Compile Include="Models\Identity\IdentityUserLogin.cs" />
-    <Compile Include="Models\Identity\IdentityUserRole.cs" />
-    <Compile Include="Models\Identity\IIdentityUserLogin.cs" />
     <Compile Include="Models\Language.cs" />
     <Compile Include="Models\Macro.cs" />
     <Compile Include="Models\Media.cs" />
@@ -637,29 +629,16 @@
     <Compile Include="Models\MediaType.cs" />
     <Compile Include="Models\Member.cs" />
     <Compile Include="Models\MemberGroup.cs" />
-    <Compile Include="Models\Membership\ContentPermissionSet.cs" />
-    <Compile Include="Models\Membership\EntityPermission.cs" />
-    <Compile Include="Models\Membership\EntityPermissionCollection.cs" />
-    <Compile Include="Models\Membership\EntityPermissionSet.cs" />
-    <Compile Include="Models\Membership\MemberCountType.cs" />
-    <Compile Include="Models\Membership\MembershipScenario.cs" />
     <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
-    <Compile Include="Models\Membership\ReadOnlyUserGroup.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipUser.cs" />
     <Compile Include="Models\Membership\User.cs" />
-    <Compile Include="Models\Membership\UserGroup.cs" />
-    <Compile Include="Models\Membership\UserGroupExtensions.cs" />
-    <Compile Include="Models\Membership\UserProfile.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\PackageAction.cs" />
     <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
-    <Compile Include="Models\Property.cs" />
-    <Compile Include="Models\PropertyCollection.cs" />
     <Compile Include="Models\PropertyGroup.cs" />
     <Compile Include="Models\PropertyGroupCollection.cs" />
     <Compile Include="Models\PropertyType.cs" />
@@ -737,7 +716,6 @@
     <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
     <Compile Include="Models\Relation.cs" />
     <Compile Include="Models\RelationType.cs" />
-    <Compile Include="Models\Script.cs" />
     <Compile Include="Models\ServerRegistration.cs" />
     <Compile Include="Models\Stylesheet.cs" />
     <Compile Include="Models\StylesheetProperty.cs" />
@@ -1370,8 +1348,5 @@
       <Name>Umbraco.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\Entities" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file