diff --git a/src/Umbraco.Core/Models/AuditEntry.cs b/src/Umbraco.Abstractions/Models/AuditEntry.cs
similarity index 97%
rename from src/Umbraco.Core/Models/AuditEntry.cs
rename to src/Umbraco.Abstractions/Models/AuditEntry.cs
index d12163f394..5399e399c0 100644
--- a/src/Umbraco.Core/Models/AuditEntry.cs
+++ b/src/Umbraco.Abstractions/Models/AuditEntry.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    internal class AuditEntry : EntityBase, IAuditEntry
+    public class AuditEntry : EntityBase, IAuditEntry
     {
         private int _performingUserId;
         private string _performingDetails;
diff --git a/src/Umbraco.Core/Models/AuditItem.cs b/src/Umbraco.Abstractions/Models/AuditItem.cs
similarity index 100%
rename from src/Umbraco.Core/Models/AuditItem.cs
rename to src/Umbraco.Abstractions/Models/AuditItem.cs
diff --git a/src/Umbraco.Core/Models/ContentEditing/ContentApp.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ContentApp.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentEditing/ContentApp.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ContentApp.cs
diff --git a/src/Umbraco.Core/Models/ContentEditing/IContentAppFactory.cs b/src/Umbraco.Abstractions/Models/ContentEditing/IContentAppFactory.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentEditing/IContentAppFactory.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/IContentAppFactory.cs
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Abstractions/Models/File.cs
similarity index 98%
rename from src/Umbraco.Core/Models/File.cs
rename to src/Umbraco.Abstractions/Models/File.cs
index 845da4d053..b2be44d020 100644
--- a/src/Umbraco.Core/Models/File.cs
+++ b/src/Umbraco.Abstractions/Models/File.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models
         // cannot simply use HasIdentity as some classes (eg Script) override it
         // in a weird way.
         private string _content;
-        internal Func<File, string> GetFileContent { get; set; }
+        public Func<File, string> GetFileContent { get; set; }
 
         protected File(string path, Func<File, string> getFileContent = null)
         {
@@ -134,7 +134,7 @@ namespace Umbraco.Core.Models
         /// Gets or sets the file's virtual path (i.e. the file path relative to the root of the website)
         /// </summary>
         public string VirtualPath { get; set; }
-        
+
         // this exists so that class that manage name and alias differently, eg Template,
         // can implement their own cloning - (though really, not sure it's even needed)
         protected virtual void DeepCloneNameAndAlias(File clone)
diff --git a/src/Umbraco.Core/Models/Folder.cs b/src/Umbraco.Abstractions/Models/Folder.cs
similarity index 82%
rename from src/Umbraco.Core/Models/Folder.cs
rename to src/Umbraco.Abstractions/Models/Folder.cs
index e23f944604..9889726fdc 100644
--- a/src/Umbraco.Core/Models/Folder.cs
+++ b/src/Umbraco.Abstractions/Models/Folder.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Models
 {
-    internal sealed class Folder : EntityBase
+    public sealed class Folder : EntityBase
     {
         public Folder(string folderPath)
         {
diff --git a/src/Umbraco.Core/Models/Membership/IMembershipUser.cs b/src/Umbraco.Abstractions/Models/Membership/IMembershipUser.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/IMembershipUser.cs
rename to src/Umbraco.Abstractions/Models/Membership/IMembershipUser.cs
diff --git a/src/Umbraco.Core/Models/Membership/IProfile.cs b/src/Umbraco.Abstractions/Models/Membership/IProfile.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/IProfile.cs
rename to src/Umbraco.Abstractions/Models/Membership/IProfile.cs
diff --git a/src/Umbraco.Core/Models/Membership/IReadOnlyUserGroup.cs b/src/Umbraco.Abstractions/Models/Membership/IReadOnlyUserGroup.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/IReadOnlyUserGroup.cs
rename to src/Umbraco.Abstractions/Models/Membership/IReadOnlyUserGroup.cs
diff --git a/src/Umbraco.Core/Models/Membership/IUser.cs b/src/Umbraco.Abstractions/Models/Membership/IUser.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/IUser.cs
rename to src/Umbraco.Abstractions/Models/Membership/IUser.cs
diff --git a/src/Umbraco.Core/Models/Membership/IUserGroup.cs b/src/Umbraco.Abstractions/Models/Membership/IUserGroup.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/IUserGroup.cs
rename to src/Umbraco.Abstractions/Models/Membership/IUserGroup.cs
diff --git a/src/Umbraco.Core/Models/Membership/UserState.cs b/src/Umbraco.Abstractions/Models/Membership/UserState.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Membership/UserState.cs
rename to src/Umbraco.Abstractions/Models/Membership/UserState.cs
diff --git a/src/Umbraco.Core/Models/PagedResult.cs b/src/Umbraco.Abstractions/Models/PagedResult.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PagedResult.cs
rename to src/Umbraco.Abstractions/Models/PagedResult.cs
diff --git a/src/Umbraco.Core/Models/PartialView.cs b/src/Umbraco.Abstractions/Models/PartialView.cs
similarity index 84%
rename from src/Umbraco.Core/Models/PartialView.cs
rename to src/Umbraco.Abstractions/Models/PartialView.cs
index a0b32baecf..130d240c6d 100644
--- a/src/Umbraco.Core/Models/PartialView.cs
+++ b/src/Umbraco.Abstractions/Models/PartialView.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models
             : this(viewType, path, null)
         { }
 
-        internal PartialView(PartialViewType viewType, string path, Func<File, string> getFileContent)
+        public PartialView(PartialViewType viewType, string path, Func<File, string> getFileContent)
             : base(path, getFileContent)
         {
             ViewType = viewType;
diff --git a/src/Umbraco.Core/Models/PublicAccessRule.cs b/src/Umbraco.Abstractions/Models/PublicAccessRule.cs
similarity index 94%
rename from src/Umbraco.Core/Models/PublicAccessRule.cs
rename to src/Umbraco.Abstractions/Models/PublicAccessRule.cs
index bb6c1cdea2..482ddd0638 100644
--- a/src/Umbraco.Core/Models/PublicAccessRule.cs
+++ b/src/Umbraco.Abstractions/Models/PublicAccessRule.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Models
         {
         }
 
-        public Guid AccessEntryId { get; internal set; }
+        public Guid AccessEntryId { get; set; }
 
         public string RuleValue
         {
diff --git a/src/Umbraco.Core/Models/PublishedState.cs b/src/Umbraco.Abstractions/Models/PublishedState.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedState.cs
rename to src/Umbraco.Abstractions/Models/PublishedState.cs
diff --git a/src/Umbraco.Core/Models/Range.cs b/src/Umbraco.Abstractions/Models/Range.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Range.cs
rename to src/Umbraco.Abstractions/Models/Range.cs
diff --git a/src/Umbraco.Core/Models/RedirectUrl.cs b/src/Umbraco.Abstractions/Models/RedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Core/Models/RedirectUrl.cs
rename to src/Umbraco.Abstractions/Models/RedirectUrl.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 67bafd813f..89f1bcdb66 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -212,8 +212,11 @@
     <Compile Include="Models\IMediaType.cs" />
     <Compile Include="Models\IMember.cs" />
     <Compile Include="Models\IMemberType.cs" />
+    <Compile Include="Models\MacroProperty.cs" />
+    <Compile Include="Models\PublicAccessEntry.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
+    <Compile Include="Persistence\Factories\MacroFactory.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
@@ -389,9 +392,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\UpdateDefaultMandatoryLanguage.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UpdatePickerIntegerValuesToUdi.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
-    <Compile Include="Models\AuditEntry.cs" />
-    <Compile Include="Models\ContentEditing\ContentApp.cs" />
-    <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
     <Compile Include="Models\ContentSchedule.cs" />
     <Compile Include="Models\ContentScheduleAction.cs" />
@@ -607,7 +607,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLockTable.cs" />
     <Compile Include="Migrations\Upgrade\Upgrader.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
-    <Compile Include="Models\AuditItem.cs" />
     <Compile Include="Models\Content.cs" />
     <Compile Include="Models\ContentBase.cs" />
     <Compile Include="ContentExtensions.cs" />
@@ -624,8 +623,6 @@
     <Compile Include="Models\Editors\ContentPropertyData.cs" />
     <Compile Include="Models\EntityContainer.cs" />
     <Compile Include="Models\EntityExtensions.cs" />
-    <Compile Include="Models\File.cs" />
-    <Compile Include="Models\Folder.cs" />
     <Compile Include="Models\GridValue.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
@@ -635,7 +632,6 @@
     <Compile Include="Models\Identity\IIdentityUserLogin.cs" />
     <Compile Include="Models\Language.cs" />
     <Compile Include="Models\Macro.cs" />
-    <Compile Include="Models\MacroProperty.cs" />
     <Compile Include="Models\Media.cs" />
     <Compile Include="Models\MediaExtensions.cs" />
     <Compile Include="Models\MediaType.cs" />
@@ -645,11 +641,6 @@
     <Compile Include="Models\Membership\EntityPermission.cs" />
     <Compile Include="Models\Membership\EntityPermissionCollection.cs" />
     <Compile Include="Models\Membership\EntityPermissionSet.cs" />
-    <Compile Include="Models\Membership\IMembershipUser.cs" />
-    <Compile Include="Models\Membership\IProfile.cs" />
-    <Compile Include="Models\Membership\IReadOnlyUserGroup.cs" />
-    <Compile Include="Models\Membership\IUser.cs" />
-    <Compile Include="Models\Membership\IUserGroup.cs" />
     <Compile Include="Models\Membership\MemberCountType.cs" />
     <Compile Include="Models\Membership\MembershipScenario.cs" />
     <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
@@ -660,7 +651,6 @@
     <Compile Include="Models\Membership\UserGroup.cs" />
     <Compile Include="Models\Membership\UserGroupExtensions.cs" />
     <Compile Include="Models\Membership\UserProfile.cs" />
-    <Compile Include="Models\Membership\UserState.cs" />
     <Compile Include="Models\MemberType.cs" />
     <Compile Include="Models\MemberTypePropertyProfileAccess.cs" />
     <Compile Include="Models\MigrationEntry.cs" />
@@ -668,16 +658,12 @@
     <Compile Include="Models\Packaging\InstallationSummary.cs" />
     <Compile Include="Models\Packaging\PackageAction.cs" />
     <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
-    <Compile Include="Models\PagedResult.cs" />
-    <Compile Include="Models\PartialView.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" />
     <Compile Include="Models\PropertyTypeCollection.cs" />
-    <Compile Include="Models\PublicAccessEntry.cs" />
-    <Compile Include="Models\PublicAccessRule.cs" />
     <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContent.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
@@ -702,8 +688,6 @@
     <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
     <Compile Include="Models\PublishedContent\PublishedSearchResult.cs" />
     <Compile Include="Models\PublishedContent\RawValueProperty.cs" />
-    <Compile Include="Models\PublishedState.cs" />
-    <Compile Include="Models\Range.cs" />
     <Compile Include="Persistence\Dtos\AccessDto.cs" />
     <Compile Include="Persistence\Dtos\AccessRuleDto.cs" />
     <Compile Include="Persistence\Dtos\CacheInstructionDto.cs" />
@@ -751,7 +735,6 @@
     <Compile Include="Persistence\Dtos\UserGroup2NodePermissionDto.cs" />
     <Compile Include="Persistence\Dtos\UserGroupDto.cs" />
     <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
-    <Compile Include="Models\RedirectUrl.cs" />
     <Compile Include="Models\Relation.cs" />
     <Compile Include="Models\RelationType.cs" />
     <Compile Include="Models\Script.cs" />
@@ -818,7 +801,6 @@
     <Compile Include="Persistence\Factories\DictionaryTranslationFactory.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />
     <Compile Include="Persistence\Factories\LanguageFactory.cs" />
-    <Compile Include="Persistence\Factories\MacroFactory.cs" />
     <Compile Include="Persistence\Factories\ContentBaseFactory.cs" />
     <Compile Include="Persistence\Factories\MemberGroupFactory.cs" />
     <Compile Include="Persistence\Factories\PropertyFactory.cs" />