diff --git a/src/Umbraco.Web/Models/AnchorsModel.cs b/src/Umbraco.Abstractions/Models/AnchorsModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/AnchorsModel.cs
rename to src/Umbraco.Abstractions/Models/AnchorsModel.cs
diff --git a/src/Umbraco.Web/Models/ChangingPasswordModel.cs b/src/Umbraco.Abstractions/Models/ChangingPasswordModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ChangingPasswordModel.cs
rename to src/Umbraco.Abstractions/Models/ChangingPasswordModel.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/AuditLog.cs b/src/Umbraco.Abstractions/Models/ContentEditing/AuditLog.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/AuditLog.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/AuditLog.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentDomainsAndCulture.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ContentDomainsAndCulture.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentDomainsAndCulture.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ContentDomainsAndCulture.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyBasic.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ContentPropertyBasic.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentSaveAction.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ContentSaveAction.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentSaveAction.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ContentSaveAction.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentSavedState.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ContentSavedState.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentSavedState.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ContentSavedState.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryOverviewDisplay.cs b/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionaryOverviewDisplay.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs b/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/DictionaryOverviewTranslationDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationDisplay.cs b/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationDisplay.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs b/src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationSave.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/DictionaryTranslationSave.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DomainDisplay.cs b/src/Umbraco.Abstractions/Models/ContentEditing/DomainDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DomainDisplay.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/DomainDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/IContentProperties.cs b/src/Umbraco.Abstractions/Models/ContentEditing/IContentProperties.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/IContentProperties.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/IContentProperties.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/IContentSave.cs b/src/Umbraco.Abstractions/Models/ContentEditing/IContentSave.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/IContentSave.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/IContentSave.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/IHaveUploadedFiles.cs b/src/Umbraco.Abstractions/Models/ContentEditing/IHaveUploadedFiles.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/IHaveUploadedFiles.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/IHaveUploadedFiles.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ITabbedContent.cs b/src/Umbraco.Abstractions/Models/ContentEditing/ITabbedContent.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ITabbedContent.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/ITabbedContent.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/Language.cs b/src/Umbraco.Abstractions/Models/ContentEditing/Language.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/Language.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/Language.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs b/src/Umbraco.Abstractions/Models/ContentEditing/LinkDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/LinkDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/NotificationStyle.cs b/src/Umbraco.Abstractions/Models/ContentEditing/NotificationStyle.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/NotificationStyle.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/NotificationStyle.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/Permission.cs b/src/Umbraco.Abstractions/Models/ContentEditing/Permission.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/Permission.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/Permission.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeValidation.cs b/src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeValidation.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/PropertyTypeValidation.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/PropertyTypeValidation.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/Tab.cs b/src/Umbraco.Abstractions/Models/ContentEditing/Tab.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/Tab.cs
rename to src/Umbraco.Abstractions/Models/ContentEditing/Tab.cs
diff --git a/src/Umbraco.Web/Models/ContentModel.cs b/src/Umbraco.Abstractions/Models/ContentModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentModel.cs
rename to src/Umbraco.Abstractions/Models/ContentModel.cs
diff --git a/src/Umbraco.Web/Models/ContentModelOfTContent.cs b/src/Umbraco.Abstractions/Models/ContentModelOfTContent.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentModelOfTContent.cs
rename to src/Umbraco.Abstractions/Models/ContentModelOfTContent.cs
diff --git a/src/Umbraco.Web/Models/IContentModel.cs b/src/Umbraco.Abstractions/Models/IContentModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/IContentModel.cs
rename to src/Umbraco.Abstractions/Models/IContentModel.cs
diff --git a/src/Umbraco.Web/Models/ImageCropAnchor.cs b/src/Umbraco.Abstractions/Models/ImageCropAnchor.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ImageCropAnchor.cs
rename to src/Umbraco.Abstractions/Models/ImageCropAnchor.cs
diff --git a/src/Umbraco.Web/Models/ImageCropMode.cs b/src/Umbraco.Abstractions/Models/ImageCropMode.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ImageCropMode.cs
rename to src/Umbraco.Abstractions/Models/ImageCropMode.cs
diff --git a/src/Umbraco.Web/Models/ImageCropRatioMode.cs b/src/Umbraco.Abstractions/Models/ImageCropRatioMode.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ImageCropRatioMode.cs
rename to src/Umbraco.Abstractions/Models/ImageCropRatioMode.cs
diff --git a/src/Umbraco.Web/Models/Link.cs b/src/Umbraco.Abstractions/Models/Link.cs
similarity index 100%
rename from src/Umbraco.Web/Models/Link.cs
rename to src/Umbraco.Abstractions/Models/Link.cs
diff --git a/src/Umbraco.Web/Models/LinkType.cs b/src/Umbraco.Abstractions/Models/LinkType.cs
similarity index 100%
rename from src/Umbraco.Web/Models/LinkType.cs
rename to src/Umbraco.Abstractions/Models/LinkType.cs
diff --git a/src/Umbraco.Web/Models/LoginModel.cs b/src/Umbraco.Abstractions/Models/LoginModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/LoginModel.cs
rename to src/Umbraco.Abstractions/Models/LoginModel.cs
diff --git a/src/Umbraco.Web/Models/PackageInstallModel.cs b/src/Umbraco.Abstractions/Models/PackageInstallModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PackageInstallModel.cs
rename to src/Umbraco.Abstractions/Models/PackageInstallModel.cs
diff --git a/src/Umbraco.Web/Models/PackageInstallResult.cs b/src/Umbraco.Abstractions/Models/PackageInstallResult.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PackageInstallResult.cs
rename to src/Umbraco.Abstractions/Models/PackageInstallResult.cs
diff --git a/src/Umbraco.Web/Models/PartialViewMacroModel.cs b/src/Umbraco.Abstractions/Models/PartialViewMacroModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PartialViewMacroModel.cs
rename to src/Umbraco.Abstractions/Models/PartialViewMacroModel.cs
diff --git a/src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs b/src/Umbraco.Abstractions/Models/PartialViewMacroModelExtensions.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs
rename to src/Umbraco.Abstractions/Models/PartialViewMacroModelExtensions.cs
diff --git a/src/Umbraco.Web/Models/PasswordChangedModel.cs b/src/Umbraco.Abstractions/Models/PasswordChangedModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PasswordChangedModel.cs
rename to src/Umbraco.Abstractions/Models/PasswordChangedModel.cs
diff --git a/src/Umbraco.Web/Models/PostRedirectModel.cs b/src/Umbraco.Abstractions/Models/PostRedirectModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/PostRedirectModel.cs
rename to src/Umbraco.Abstractions/Models/PostRedirectModel.cs
diff --git a/src/Umbraco.Web/Models/RequestPasswordResetModel.cs b/src/Umbraco.Abstractions/Models/RequestPasswordResetModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/RequestPasswordResetModel.cs
rename to src/Umbraco.Abstractions/Models/RequestPasswordResetModel.cs
diff --git a/src/Umbraco.Web/Models/SendCodeViewModel.cs b/src/Umbraco.Abstractions/Models/SendCodeViewModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/SendCodeViewModel.cs
rename to src/Umbraco.Abstractions/Models/SendCodeViewModel.cs
diff --git a/src/Umbraco.Web/Models/SetPasswordModel.cs b/src/Umbraco.Abstractions/Models/SetPasswordModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/SetPasswordModel.cs
rename to src/Umbraco.Abstractions/Models/SetPasswordModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/ContentTypeModel.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/ContentTypeModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/ContentTypeModel.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/ContentTypeModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/Operator.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/Operator.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/Operator.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/Operator.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/OperatorFactory.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/OperatorFactory.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/OperatorTerm.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/OperatorTerm.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/OperatorTerm.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/OperatorTerm.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/PropertyModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/PropertyModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/QueryCondition.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/QueryCondition.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/QueryConditionExtensions.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/QueryConditionExtensions.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryModel.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/QueryModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/QueryModel.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/QueryModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryResultModel.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/QueryResultModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/QueryResultModel.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/QueryResultModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/SortExpression.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/SortExpression.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/SortExpression.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/SortExpression.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/SourceModel.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/SourceModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/SourceModel.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/SourceModel.cs
diff --git a/src/Umbraco.Web/Models/TemplateQuery/TemplateQueryResult.cs b/src/Umbraco.Abstractions/Models/TemplateQuery/TemplateQueryResult.cs
similarity index 100%
rename from src/Umbraco.Web/Models/TemplateQuery/TemplateQueryResult.cs
rename to src/Umbraco.Abstractions/Models/TemplateQuery/TemplateQueryResult.cs
diff --git a/src/Umbraco.Web/Models/UmbracoProperty.cs b/src/Umbraco.Abstractions/Models/UmbracoProperty.cs
similarity index 100%
rename from src/Umbraco.Web/Models/UmbracoProperty.cs
rename to src/Umbraco.Abstractions/Models/UmbracoProperty.cs
diff --git a/src/Umbraco.Web/Models/UnLinkLoginModel.cs b/src/Umbraco.Abstractions/Models/UnLinkLoginModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/UnLinkLoginModel.cs
rename to src/Umbraco.Abstractions/Models/UnLinkLoginModel.cs
diff --git a/src/Umbraco.Web/Models/UpgradeCheckResponse.cs b/src/Umbraco.Abstractions/Models/UpgradeCheckResponse.cs
similarity index 82%
rename from src/Umbraco.Web/Models/UpgradeCheckResponse.cs
rename to src/Umbraco.Abstractions/Models/UpgradeCheckResponse.cs
index 6b15e33625..854f6cc4de 100644
--- a/src/Umbraco.Web/Models/UpgradeCheckResponse.cs
+++ b/src/Umbraco.Abstractions/Models/UpgradeCheckResponse.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
-using System.Web;
-using Umbraco.Core.Composing;
+using System.Net;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Models
@@ -22,7 +21,7 @@ namespace Umbraco.Web.Models
         {
             Type = upgradeType;
             Comment = upgradeComment;
-            Url = upgradeUrl + "?version=" + HttpUtility.UrlEncode(umbracoVersion.Current.ToString(3));
+            Url = upgradeUrl + "?version=" + WebUtility.UrlEncode(umbracoVersion.Current.ToString(3));
         }
     }
 }
diff --git a/src/Umbraco.Web/Models/UserTourStatus.cs b/src/Umbraco.Abstractions/Models/UserTourStatus.cs
similarity index 100%
rename from src/Umbraco.Web/Models/UserTourStatus.cs
rename to src/Umbraco.Abstractions/Models/UserTourStatus.cs
diff --git a/src/Umbraco.Web/Models/ValidatePasswordResetCodeModel.cs b/src/Umbraco.Abstractions/Models/ValidatePasswordResetCodeModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ValidatePasswordResetCodeModel.cs
rename to src/Umbraco.Abstractions/Models/ValidatePasswordResetCodeModel.cs
diff --git a/src/Umbraco.Web/Models/BackOfficeTour.cs b/src/Umbraco.Infrastructure/Models/BackOfficeTour.cs
similarity index 100%
rename from src/Umbraco.Web/Models/BackOfficeTour.cs
rename to src/Umbraco.Infrastructure/Models/BackOfficeTour.cs
diff --git a/src/Umbraco.Web/Models/BackOfficeTourFile.cs b/src/Umbraco.Infrastructure/Models/BackOfficeTourFile.cs
similarity index 100%
rename from src/Umbraco.Web/Models/BackOfficeTourFile.cs
rename to src/Umbraco.Infrastructure/Models/BackOfficeTourFile.cs
diff --git a/src/Umbraco.Web/Models/BackOfficeTourStep.cs b/src/Umbraco.Infrastructure/Models/BackOfficeTourStep.cs
similarity index 100%
rename from src/Umbraco.Web/Models/BackOfficeTourStep.cs
rename to src/Umbraco.Infrastructure/Models/BackOfficeTourStep.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/AssignedContentPermissions.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/AssignedContentPermissions.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/AssignedContentPermissions.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/AssignedContentPermissions.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/AssignedUserGroupPermissions.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/AssignedUserGroupPermissions.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/AssignedUserGroupPermissions.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/AssignedUserGroupPermissions.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemBasic.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemBasic.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/ContentPropertyDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/ContentPropertyDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryDisplay.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/DictionaryDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionaryDisplay.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/DictionaryDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionarySave.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/DictionarySave.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DictionarySave.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/DictionarySave.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/DomainSave.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/DomainSave.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/DomainSave.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/DomainSave.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/EditorNavigation.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/EditorNavigation.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/EditorNavigation.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/EditorNavigation.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/EntityBasic.cs
similarity index 97%
rename from src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/EntityBasic.cs
index 6cb2ccffaf..512bc1517d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
+++ b/src/Umbraco.Infrastructure/Models/ContentEditing/EntityBasic.cs
@@ -3,12 +3,10 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
-using System.Web.Http.ModelBinding;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models.Validation;
 using Umbraco.Core.Serialization;
-using Umbraco.Web.WebApi;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
diff --git a/src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/GetAvailableCompositionsFilter.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/GetAvailableCompositionsFilter.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/IErrorModel.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/IErrorModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/IErrorModel.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/IErrorModel.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/INotificationModel.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/INotificationModel.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/MacroParameter.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/MacroParameter.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/MacroParameter.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/MacroParameter.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/MacroParameterDisplay.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/MacroParameterDisplay.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/MacroParameterDisplay.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/MacroParameterDisplay.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/Notification.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/Notification.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/Notification.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/Notification.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/TabbedContentItem.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/TabbedContentItem.cs
diff --git a/src/Umbraco.Web/Models/ContentEditing/UserProfile.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/UserProfile.cs
similarity index 100%
rename from src/Umbraco.Web/Models/ContentEditing/UserProfile.cs
rename to src/Umbraco.Infrastructure/Models/ContentEditing/UserProfile.cs
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 795ce65381..bb893ea1df 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -62,10 +62,6 @@
         </AssemblyAttribute>
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Models\Identity" />
-    </ItemGroup>
-
     <ItemGroup>
       <Compile Remove="obj\**" />
     </ItemGroup>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0ce7127a5b..f709408555 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -181,17 +181,16 @@
     <Compile Include="Logging\WebProfilerProvider.cs" />
     <Compile Include="Macros\IMacroRenderer.cs" />
     <Compile Include="Migrations\PostMigrations\PublishedSnapshotRebuilder.cs" />
-    <Compile Include="Models\AnchorsModel.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
     <Compile Include="Models\ContentEditing\DataTypeReferences.cs" />
-    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
     <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
     <Compile Include="Models\Mapping\CommonMapper.cs" />
     <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
-    <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
     <Compile Include="Mvc\ModelBindingExceptionFilter.cs" />
     <Compile Include="Mvc\StatusCodeFilterAttribute.cs" />
@@ -226,9 +225,6 @@
     <Compile Include="Security\UmbracoMembershipProviderBase.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
-    <Compile Include="Models\Link.cs" />
-    <Compile Include="Models\LinkType.cs" />
-    <Compile Include="Models\TemplateQuery\OperatorFactory.cs" />
     <Compile Include="StringExtensions.cs" />
     <Compile Include="Templates\HtmlLocalLinkParser.cs" />
     <Compile Include="Templates\HtmlImageSourceParser.cs" />
@@ -286,8 +282,6 @@
     <Compile Include="Editors\LogViewerController.cs" />
     <Compile Include="ImageProcessorLogger.cs" />
     <Compile Include="Macros\MacroTagParser.cs" />
-    <Compile Include="Models\ContentEditing\ContentDomainsAndCulture.cs" />
-    <Compile Include="Models\ContentEditing\ContentSavedState.cs" />
     <Compile Include="Trees\LogViewerTreeController.cs" />
     <Compile Include="Models\Mapping\ContentSavedStateMapper.cs" />
     <Compile Include="Mvc\ContainerControllerFactory.cs" />
@@ -304,7 +298,6 @@
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
-    <Compile Include="Models\ContentEditing\IContentSave.cs" />
     <Compile Include="WebApi\SerializeVersionAttribute.cs" />
     <Compile Include="WebApi\TrimModelBinder.cs" />
     <Compile Include="Editors\CodeFileController.cs" />
@@ -388,33 +381,15 @@
     <Compile Include="HealthCheck\HealthCheckStatus.cs" />
     <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
     <Compile Include="HealthCheck\StatusResultType.cs" />
-    <Compile Include="Models\BackOfficeTour.cs" />
-    <Compile Include="Models\BackOfficeTourFile.cs" />
-    <Compile Include="Models\BackOfficeTourStep.cs" />
-    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
     <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
     <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
     <Compile Include="Models\ContentEditing\ContentVariantSave.cs" />
     <Compile Include="Models\ContentEditing\ContentVariationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DomainDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DomainSave.cs" />
     <Compile Include="Models\ContentEditing\CreatedDocumentTypeCollectionResult.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
     <Compile Include="Editors\IEditorValidator.cs" />
     <Compile Include="Editors\EditorModelEventManager.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-    <Compile Include="Models\ContentEditing\IContentProperties.cs" />
-    <Compile Include="Models\ContentEditing\ITabbedContent.cs" />
     <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-    <Compile Include="Models\ContentEditing\Permission.cs" />
     <Compile Include="Models\ContentEditing\PostedFolder.cs" />
     <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
     <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
@@ -425,9 +400,7 @@
     <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
     <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
     <Compile Include="Models\ContentEditing\UserInvite.cs" />
-    <Compile Include="Models\ContentEditing\UserProfile.cs" />
     <Compile Include="Models\ContentEditing\UserSave.cs" />
-    <Compile Include="Models\ContentEditing\Language.cs" />
     <Compile Include="Models\ContentTypeImportModel.cs" />
     <Compile Include="Models\Mapping\AuditMapDefinition.cs" />
     <Compile Include="Models\Mapping\DictionaryMapDefinition.cs" />
@@ -439,9 +412,7 @@
     <Compile Include="Models\Mapping\ContentVariantMapper.cs" />
     <Compile Include="Models\PublishedContent\HttpContextVariationContextAccessor.cs" />
     <Compile Include="Models\PublishedContent\PublishedValueFallback.cs" />
-    <Compile Include="Models\SendCodeViewModel.cs" />
     <Compile Include="Models\Trees\ExportMember.cs" />
-    <Compile Include="Models\UserTourStatus.cs" />
     <Compile Include="Composing\ModuleInjector.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
@@ -597,7 +568,6 @@
     <Compile Include="Runtime\WebInitialComponent.cs" />
     <Compile Include="Editors\PublishedStatusController.cs" />
     <Compile Include="Editors\NuCacheStatusController.cs" />
-    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
     <Compile Include="Services\SectionService.cs" />
     <Compile Include="Trees\TreeAttribute.cs" />
     <Compile Include="Models\Trees\TreeNode.cs" />
@@ -617,10 +587,6 @@
     <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
     <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
     <Compile Include="Models\LocalPackageInstallModel.cs" />
-    <Compile Include="Models\PackageInstallResult.cs" />
-    <Compile Include="Models\SetPasswordModel.cs" />
-    <Compile Include="Models\RequestPasswordResetModel.cs" />
-    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
     <Compile Include="Mvc\ControllerContextExtensions.cs" />
     <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
     <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
@@ -660,7 +626,6 @@
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="IUmbracoComponentRenderer.cs" />
     <Compile Include="Models\Mapping\RelationMapDefinition.cs" />
-    <Compile Include="Models\UnLinkLoginModel.cs" />
     <Compile Include="Mvc\MvcVersionCheck.cs" />
     <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
     <Compile Include="Mvc\ProfilingView.cs" />
@@ -697,25 +662,12 @@
     <Compile Include="Editors\PackageInstallController.cs" />
     <Compile Include="Editors\RelationController.cs" />
     <Compile Include="GridTemplateExtensions.cs" />
-    <Compile Include="Models\PackageInstallModel.cs" />
     <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
     <Compile Include="Models\ContentEditing\MemberBasic.cs" />
     <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-    <Compile Include="Models\TemplateQuery\Operator.cs" />
-    <Compile Include="Models\TemplateQuery\OperatorTerm.cs" />
-    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
     <Compile Include="Editors\TemplateQueryController.cs" />
     <Compile Include="Models\ContentEditing\ContentBaseSave.cs" />
     <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-    <Compile Include="Models\ImageCropAnchor.cs" />
-    <Compile Include="Models\ImageCropMode.cs" />
     <Compile Include="Install\InstallException.cs" />
     <Compile Include="Install\InstallStatusTracker.cs" />
     <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
@@ -745,12 +697,6 @@
     <Compile Include="Install\Controllers\InstallApiController.cs" />
     <Compile Include="Install\Controllers\InstallController.cs" />
     <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-    <Compile Include="Models\ImageCropRatioMode.cs" />
-    <Compile Include="Models\IContentModel.cs" />
-    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-    <Compile Include="Models\PostRedirectModel.cs" />
     <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
     <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
     <Compile Include="Mvc\NotFoundHandler.cs" />
@@ -760,7 +706,6 @@
     <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
     <Compile Include="PropertyEditors\TagsDataController.cs" />
     <Compile Include="PublishedCache\PublishedMember.cs" />
-    <Compile Include="Models\ContentModelOfTContent.cs" />
     <Compile Include="Mvc\JsonNetResult.cs" />
     <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
     <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
@@ -770,13 +715,10 @@
     <Compile Include="Editors\MemberTypeController.cs" />
     <Compile Include="Editors\UpdateCheckController.cs" />
     <Compile Include="PasswordConfigurationExtensions.cs" />
-    <Compile Include="Models\ChangingPasswordModel.cs" />
     <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
     <Compile Include="Models\ContentEditing\StyleSheet.cs" />
     <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\ContentEditing\AuditLog.cs" />
     <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
     <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
     <Compile Include="Models\ContentEditing\MemberSave.cs" />
     <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
@@ -787,8 +729,6 @@
     <Compile Include="Models\Mapping\MacroMapDefinition.cs" />
     <Compile Include="Models\Mapping\MemberMapDefinition.cs" />
     <Compile Include="Models\Mapping\TagMapDefinition.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
     <Compile Include="PropertyEditors\ColorPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
@@ -886,11 +826,9 @@
     <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
     <Compile Include="PublishedPropertyExtension.cs" />
-    <Compile Include="Models\UmbracoProperty.cs" />
     <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
     <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
     <Compile Include="Models\RegisterModel.cs" />
-    <Compile Include="Models\LoginModel.cs" />
     <Compile Include="Editors\MediaTypeController.cs" />
     <Compile Include="Scheduling\IBackgroundTask.cs" />
     <Compile Include="Scheduling\KeepAlive.cs" />
@@ -902,17 +840,8 @@
     <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
     <Compile Include="HttpCookieExtensions.cs" />
     <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
     <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-    <Compile Include="Models\ContentEditing\Notification.cs" />
     <Compile Include="Models\ContentEditing\Section.cs" />
-    <Compile Include="Models\ContentEditing\Tab.cs" />
-    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
     <Compile Include="Models\ContentEditing\UserBasic.cs" />
     <Compile Include="Models\ContentEditing\UserDetail.cs" />
     <Compile Include="FormDataCollectionExtensions.cs" />
@@ -957,12 +886,9 @@
     <Compile Include="Trees\TreeRenderingEventArgs.cs" />
     <Compile Include="Trees\UrlHelperExtensions.cs" />
     <Compile Include="JavaScript\JsInitialization.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
     <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
     <Compile Include="Models\ContentEditing\ContentPropertyCollectionDto.cs" />
     <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
     <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
     <Compile Include="HttpRequestExtensions.cs" />
     <Compile Include="HttpUrlHelperExtensions.cs" />
@@ -972,7 +898,6 @@
     <Compile Include="Macros\PartialViewMacroController.cs" />
     <Compile Include="Macros\PartialViewMacroEngine.cs" />
     <Compile Include="Macros\PartialViewMacroPage.cs" />
-    <Compile Include="Models\PartialViewMacroModel.cs" />
     <Compile Include="Models\PublishedContentBase.cs" />
     <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
     <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
@@ -1073,7 +998,6 @@
     <Compile Include="Templates\TemplateRenderer.cs" />
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
     <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="Models\ContentEditing\NotificationStyle.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
     <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
@@ -1083,7 +1007,6 @@
     <Compile Include="Mvc\MasterControllerFactory.cs" />
     <Compile Include="Mvc\RenderActionInvoker.cs" />
     <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Models\ContentModel.cs" />
     <Compile Include="Mvc\ContentModelBinder.cs" />
     <Compile Include="Mvc\RenderMvcController.cs" />
     <Compile Include="Mvc\RenderRouteHandler.cs" />