diff --git a/build/Build.proj b/build/Build.proj index 5e5f3fd44a..498637ccd4 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -165,70 +165,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index e1b28e1d11..6f4ac938d7 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -39,6 +39,7 @@ 4.0 v4.0 + true bin\ @@ -199,6 +200,14 @@ {5BA5425F-27A7-4677-865E-82246498AA2E} SqlCE4Umbraco + + {255F5DF1-4E43-4758-AC05-7A0B68EB021B} + umbraco.editorControls + + + {89C09045-1064-466B-B94A-DB3AFE2A5853} + umbraco.MacroEngines + {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} umbraco.macroRenderings @@ -225,6 +234,10 @@ {511F6D8D-7717-440A-9A57-A507E9A8B27F} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + {CBDB56AC-FF02-4421-9FD4-ED82E339D8E2} + umbraco.webservices + {651E1350-91B6-44B7-BD60-7207006D7003} umbraco.presentation @@ -293,10 +306,12 @@ UI.xml + + - + @@ -323,13 +338,24 @@ + + + + + + + + + + + @@ -338,11 +364,15 @@ + + + + @@ -380,6 +410,8 @@ + + @@ -395,6 +427,8 @@ + + @@ -433,7 +467,16 @@ + + + + + + + + + @@ -447,6 +490,8 @@ + + @@ -463,6 +508,8 @@ + + @@ -473,6 +520,8 @@ + + @@ -488,6 +537,8 @@ + + @@ -497,6 +548,8 @@ + + @@ -508,15 +561,23 @@ + + + + + + + + @@ -544,6 +605,8 @@ + + @@ -1725,6 +1788,7 @@ + @@ -1745,7 +1809,16 @@ xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /D - True + True + True + 61637 + / + http://localhost:61637/ + False + False + + + False diff --git a/src/Umbraco.Web/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml similarity index 100% rename from src/Umbraco.Web/umbraco/config/lang/he.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/he.xml diff --git a/src/Umbraco.Web/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml similarity index 100% rename from src/Umbraco.Web/umbraco/config/lang/ja.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ja.xml diff --git a/src/Umbraco.Web/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml similarity index 100% rename from src/Umbraco.Web/umbraco/config/lang/zh.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/zh.xml diff --git a/src/Umbraco.Web.UI/umbraco/webservices/api/DocumentService.asmx b/src/Umbraco.Web.UI/umbraco/webservices/api/DocumentService.asmx index dcb6614dda..c10ccdeaa6 100644 --- a/src/Umbraco.Web.UI/umbraco/webservices/api/DocumentService.asmx +++ b/src/Umbraco.Web.UI/umbraco/webservices/api/DocumentService.asmx @@ -1 +1 @@ -<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class=umbraco.webservices.documents.documentService %> \ No newline at end of file +<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class="umbraco.webservices.documents.documentService" %> \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index ce55cd0e9b..0ad3996c92 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -233,139 +233,139 @@ Properties\SolutionInfo.cs - - + + database.ascx ASPXCodeBehind - + database.ascx - - - - + + + + ASPXCodeBehind - - - - - - + + + + + + skinning.ascx ASPXCodeBehind - + skinning.ascx - + loadStarterKitDesigns.ascx ASPXCodeBehind - + loadStarterKitDesigns.ascx - + loadStarterKits.ascx ASPXCodeBehind - + loadStarterKits.ascx - - - + + + p.aspx ASPXCodeBehind - + p.aspx Code - - + + Code - + default.aspx ASPXCodeBehind - + default.aspx - + Code - + default.aspx ASPXCodeBehind - + default.aspx - + defaultUser.ascx ASPXCodeBehind - + defaultUser.ascx - + license.ascx ASPXCodeBehind - + license.ascx - + renaming.ascx ASPXCodeBehind - + renaming.ascx - + theend.ascx ASPXCodeBehind - + theend.ascx - + validatePermissions.ascx ASPXCodeBehind - + validatePermissions.ascx - + welcome.ascx ASPXCodeBehind - + welcome.ascx - + Title.ascx ASPXCodeBehind - + Title.ascx - + Code - + Code - + Code - - + + Code @@ -373,1499 +373,1499 @@ True Settings.settings - + Code - - - + + + Code - + Code - + Code - + Code - - - - - - - + + + + + + + ASPXCodeBehind - + Code - + Code - + Code - - + + Code - + delete.aspx ASPXCodeBehind - + delete.aspx - + editContent.aspx ASPXCodeBehind - + editContent.aspx - + preview.aspx ASPXCodeBehind - + preview.aspx - + publish.aspx ASPXCodeBehind - + publish.aspx - + cacheBrowser.aspx ASPXCodeBehind - + cacheBrowser.aspx - + code - + Code - + Code - - + + Code - - - - - - - + + + + + + + ASPXCodeBehind rsd.aspx - + rsd.aspx - - + + ASPXCodeBehind wlwmanifest.aspx - + wlwmanifest.aspx - - - - - + + + + + ImageViewer.ascx ASPXCodeBehind - + ImageViewer.ascx - + ImageViewerUpdater.asmx Component - + UploadMediaImage.ascx ASPXCodeBehind - + UploadMediaImage.ascx - + ContentTypeControlNew.ascx ASPXCodeBehind - + ContentTypeControlNew.ascx - - + + GenericProperty.ascx ASPXCodeBehind - + GenericProperty.ascx - - - - - + + + + + passwordChanger.ascx ASPXCodeBehind - + passwordChanger.ascx - + ASPXCodeBehind ProgressBar.ascx - + ProgressBar.ascx - - + + ASPXCodeBehind - + Component - - - + + + Code - + TreeControl.ascx ASPXCodeBehind - + TreeControl.ascx - - - - - - - + + + + + + + DLRScripting.ascx ASPXCodeBehind - + DLRScripting.ascx - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + ChangePassword.ascx ASPXCodeBehind - + ChangePassword.ascx - + DesktopMediaUploader.ascx ASPXCodeBehind - + DesktopMediaUploader.ascx - + DeveloperDashboardIntro.ascx - + DeveloperDashboardVideos.ascx - + FeedProxy.aspx ASPXCodeBehind - + FeedProxy.aspx - + MediaDashboardIntro.ascx - + MediaDashboardVideos.ascx - + MembersDashboardIntro.ascx - + MembersDashboardVideos.ascx - + SettingsDashboardIntro.ascx - + SettingsDashboardVideos.ascx - + Applyskin.ascx ASPXCodeBehind - + Applyskin.ascx - + StartupDashboardIntro.ascx - + StartupDashboardKits.ascx - + StartupDashboardVideos.ascx - + StarterKits.aspx ASPXCodeBehind - + StarterKits.aspx - + EditRelationType.aspx ASPXCodeBehind - + EditRelationType.aspx - + NewRelationType.aspx ASPXCodeBehind - + NewRelationType.aspx - - + + RelationTypesWebService.asmx Component - - - + + + Preview.aspx ASPXCodeBehind - + Preview.aspx - + TemplateSkinning.aspx ASPXCodeBehind - + TemplateSkinning.aspx - + endPreview.aspx ASPXCodeBehind - + endPreview.aspx - + helpRedirect.aspx ASPXCodeBehind - + helpRedirect.aspx - + UmbracoCasingRules.aspx ASPXCodeBehind - + UmbracoCasingRules.aspx - + Code - + CssParser.aspx ASPXCodeBehind - + CssParser.aspx - + ImageUploader.aspx ASPXCodeBehind - + ImageUploader.aspx - + ModuleInjectionMacroRenderer.aspx ASPXCodeBehind - + ModuleInjectionMacroRenderer.aspx - + ModuleInjector.aspx ASPXCodeBehind - + ModuleInjector.aspx - + ModuleInstaller.aspx ASPXCodeBehind - + ModuleInstaller.aspx - + ModuleSelector.ascx ASPXCodeBehind - + ModuleSelector.ascx - + SkinCustomizer.ascx ASPXCodeBehind - + SkinCustomizer.ascx - - + + MemberSearch.ascx ASPXCodeBehind - + MemberSearch.ascx - - - - + + + + QuickSearch.ascx ASPXCodeBehind - + QuickSearch.ascx - + xsltVisualize.aspx ASPXCodeBehind - + xsltVisualize.aspx - + ExportCode.aspx ASPXCodeBehind - + ExportCode.aspx - + insertMasterpageContent.aspx ASPXCodeBehind - + insertMasterpageContent.aspx - + insertMasterpagePlaceholder.aspx ASPXCodeBehind - + insertMasterpagePlaceholder.aspx - + mediaPicker.aspx ASPXCodeBehind - + mediaPicker.aspx - + republish.aspx ASPXCodeBehind - + republish.aspx - + search.aspx ASPXCodeBehind - + search.aspx - + SendPublish.aspx ASPXCodeBehind - + SendPublish.aspx - + create.aspx ASPXCodeBehind - + create.aspx - + content.ascx ASPXCodeBehind - + content.ascx - + Code - + language.ascx ASPXCodeBehind - + language.ascx - + media.ascx ASPXCodeBehind - + media.ascx - + member.ascx ASPXCodeBehind - + member.ascx - + nodeType.ascx ASPXCodeBehind - + nodeType.ascx - + script.ascx ASPXCodeBehind - + script.ascx - + simple.ascx ASPXCodeBehind - + simple.ascx - + Code - + xslt.ascx ASPXCodeBehind - + xslt.ascx - + dashboard.aspx ASPXCodeBehind - + dashboard.aspx - + LatestEdits.ascx ASPXCodeBehind - + LatestEdits.ascx - + Default.aspx ASPXCodeBehind - + Default.aspx - + assemblyBrowser.aspx ASPXCodeBehind - + assemblyBrowser.aspx - + autoDoc.aspx ASPXCodeBehind - + autoDoc.aspx - + editDatatype.aspx ASPXCodeBehind - + editDatatype.aspx - + editMacro.aspx ASPXCodeBehind - + editMacro.aspx - + BrowseRepository.aspx ASPXCodeBehind - + BrowseRepository.aspx - + directoryBrowser.aspx ASPXCodeBehind - + directoryBrowser.aspx - + editPackage.aspx ASPXCodeBehind - + editPackage.aspx - + installedPackage.aspx ASPXCodeBehind - + installedPackage.aspx - + LoadNitros.ascx ASPXCodeBehind - + LoadNitros.ascx - + SubmitPackage.aspx ASPXCodeBehind - + SubmitPackage.aspx - + editPython.aspx ASPXCodeBehind - + editPython.aspx - + editXslt.aspx ASPXCodeBehind - + editXslt.aspx - + getXsltStatus.asmx Component - + viewCacheItem.aspx ASPXCodeBehind - + viewCacheItem.aspx - + xsltChooseExtension.aspx ASPXCodeBehind - + xsltChooseExtension.aspx - + xsltInsertValueOf.aspx ASPXCodeBehind - + xsltInsertValueOf.aspx - + about.aspx ASPXCodeBehind - + about.aspx - + AssignDomain.aspx ASPXCodeBehind - + AssignDomain.aspx - + create.aspx ASPXCodeBehind - + create.aspx - + cruds.aspx ASPXCodeBehind - + cruds.aspx - + editMacro.aspx ASPXCodeBehind - + editMacro.aspx - + emptyTrashcan.aspx ASPXCodeBehind - + emptyTrashcan.aspx - + exportDocumenttype.aspx ASPXCodeBehind - + imageViewer.aspx ASPXCodeBehind - + imageViewer.aspx - + importDocumenttype.aspx ASPXCodeBehind - + insertMacro.aspx ASPXCodeBehind - + insertMacro.aspx - + insertTable.aspx ASPXCodeBehind - + insertTable.aspx - + moveOrCopy.aspx ASPXCodeBehind - + moveOrCopy.aspx - + notifications.aspx ASPXCodeBehind - + notifications.aspx - + installer.aspx ASPXCodeBehind - + installer.aspx - + protectPage.aspx ASPXCodeBehind - + protectPage.aspx - + publish.aspx ASPXCodeBehind - + publish.aspx - + RegexWs.aspx ASPXCodeBehind - + RegexWs.aspx - + rollBack.aspx ASPXCodeBehind - + rollBack.aspx - + sendToTranslation.aspx ASPXCodeBehind - + sendToTranslation.aspx - + treePicker.aspx ASPXCodeBehind - + treePicker.aspx - + umbracoField.aspx ASPXCodeBehind - + umbracoField.aspx - + uploadImage.aspx ASPXCodeBehind - + uploadImage.aspx - + viewAuditTrail.aspx ASPXCodeBehind - + viewAuditTrail.aspx - + editContent.aspx ASPXCodeBehind - + editContent.aspx - + editMedia.aspx ASPXCodeBehind - + editMedia.aspx - + language.aspx ASPXCodeBehind - + language.aspx - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + login.aspx ASPXCodeBehind - + login.aspx - + logout.aspx ASPXCodeBehind - + logout.aspx - + macroResultWrapper.aspx ASPXCodeBehind - + macroResultWrapper.aspx - + default.Master ASPXCodeBehind - + default.Master - + umbracoDialog.Master ASPXCodeBehind - + umbracoDialog.Master - + umbracoPage.Master ASPXCodeBehind - + umbracoPage.Master - + EditMember.aspx ASPXCodeBehind - + EditMember.aspx - + EditMemberGroup.aspx ASPXCodeBehind - + EditMemberGroup.aspx - + EditMemberType.aspx ASPXCodeBehind - + EditMemberType.aspx - + search.aspx ASPXCodeBehind - + search.aspx - + ViewMembers.aspx ASPXCodeBehind - + ViewMembers.aspx - + Code - - + + ping.aspx ASPXCodeBehind - + ping.aspx - - - - + + + + InsertAnchor.aspx ASPXCodeBehind - + InsertAnchor.aspx - + insertChar.aspx ASPXCodeBehind - + insertChar.aspx - + insertImage.aspx ASPXCodeBehind - + insertImage.aspx - + insertLink.aspx ASPXCodeBehind - + insertLink.aspx - + insertMacro.aspx ASPXCodeBehind - + insertMacro.aspx - - - - + + + + tinymce3tinymceCompress.aspx ASPXCodeBehind - + tinymce3tinymceCompress.aspx - + publishStatus.aspx ASPXCodeBehind - + publishStatus.aspx - + QuickSearchHandler.ashx - + DictionaryItemList.aspx ASPXCodeBehind - + DictionaryItemList.aspx - + EditDictionaryItem.aspx ASPXCodeBehind - + EditDictionaryItem.aspx - + editLanguage.aspx ASPXCodeBehind - + editLanguage.aspx - + EditMediaType.aspx ASPXCodeBehind - + EditMediaType.aspx - + EditNodeTypeNew.aspx ASPXCodeBehind - + EditNodeTypeNew.aspx - + editTemplate.aspx ASPXCodeBehind - + editTemplate.aspx - + ShowUmbracoTags.aspx ASPXCodeBehind - + ShowUmbracoTags.aspx - + editScript.aspx ASPXCodeBehind - + editstylesheet.aspx ASPXCodeBehind - + editstylesheet.aspx - + EditStyleSheetProperty.aspx ASPXCodeBehind - + EditStyleSheetProperty.aspx - + sort.aspx ASPXCodeBehind - + sort.aspx - - - - + + + + Code - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + MacroContainerService.asmx Component - + MediaUploader.ashx - + TagsAutoCompleteHandler.ashx - + TreeClientService.asmx Component - - - - - - + + + + + + True True Resources.resx - + test.aspx ASPXCodeBehind - + test.aspx - + Code - + canvas.aspx ASPXCodeBehind - + canvas.aspx - + default.aspx ASPXCodeBehind - + default.aspx - + details.aspx ASPXCodeBehind - + details.aspx - + preview.aspx ASPXCodeBehind - + preview.aspx - + xml.aspx ASPXCodeBehind - + xml.aspx - + tree.aspx ASPXCodeBehind - + tree.aspx - + treeInit.aspx ASPXCodeBehind - + treeInit.aspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TreeDataService.ashx - - - - - - - + + + + + + + XmlTree.xsd - + umbraco.aspx ASPXCodeBehind - + umbraco.aspx - + Code - - + + EditUser.aspx ASPXCodeBehind - + EditUser.aspx - + EditUserType.aspx ASPXCodeBehind - + EditUserType.aspx - + NodePermissions.ascx ASPXCodeBehind - + NodePermissions.ascx - + PermissionEditor.aspx ASPXCodeBehind - + PermissionEditor.aspx - + PermissionsHandler.asmx Component - - - + + + webService.asmx Component - - + + CacheRefresher.asmx Component - + CheckForUpgrade.asmx Component - + CMSNode.asmx Component - + codeEditorSave.asmx Component - + Developer.asmx Component - + legacyAjaxCalls.asmx Component - + nodeSorter.asmx Component - + progressStatus.asmx Component - + publication.asmx Component - - + + Settings.asmx Component - + templates.asmx Component - + trashcan.asmx Component - + UltimatePickerAutoCompleteHandler.ashx - + ASPXCodeBehind - - - - - - - - - + + + + + + + + + uQuery.cs - + uQuery.cs - + uQuery.cs - + uQuery.cs - + uQuery.cs - + uQuery.cs - + uQuery.cs - + uQuery.cs - - - - - + + + + + True True Reference.map - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl - + UserControl - + UserControl - + UserControl - - - - - - - + + + + + + + Reference.map @@ -1873,164 +1873,164 @@ SettingsSingleFileGenerator Settings1.Designer.cs - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + UserControl - - - + + + UserControl - - + + UserControl - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Form - - + + Form - - + + Form - - + + Designer - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Form - - - - - - + + + + + + Form - - + + Form - - - - - - + + + + + + - + XmlTree.xsd - - - + + + MSDiscoCodeGenerator Reference.cs - + database.ascx.cs Designer - + defaultUser.ascx.cs Designer - + theend.ascx.cs Designer - + validatePermissions.ascx.cs Designer - + welcome.ascx.cs Designer - + language.aspx.cs Designer - + ResXFileCodeGenerator Resources.Designer.cs Designer - + - + package.xsd - + umbraco.xsd - + umbraco.xsd - + umbraco.xsd diff --git a/src/Umbraco.Web/install/default.aspx.cs b/src/Umbraco.Web/install/default.aspx.cs deleted file mode 100644 index fc40dedc01..0000000000 --- a/src/Umbraco.Web/install/default.aspx.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; -using System.Collections.Specialized; -using umbraco.IO; -using umbraco.cms.businesslogic.installer; -using System.Collections.Generic; - -namespace umbraco.presentation.install -{ - /// - /// Summary description for _default. - /// - public partial class _default : BasePages.BasePage - { - - private string _installStep = ""; - public string currentStepClass = ""; - - protected void Page_Load(object sender, System.EventArgs e) - { - // use buffer, so content isn't sent until it's ready (minimizing the blank screen experience) - //Response.Buffer = true; - rp_steps.DataSource = InstallerSteps().Values; - rp_steps.DataBind(); - } - - - private void loadContent(InstallerStep currentStep) - { - PlaceHolderStep.Controls.Clear(); - PlaceHolderStep.Controls.Add(new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl( currentStep.UserControl ) )); - step.Value = currentStep.Alias; - currentStepClass = currentStep.Alias; - } - - int stepCounter = 0; - protected void bindStep(object sender, RepeaterItemEventArgs e) { - - if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) { - InstallerStep i = (InstallerStep)e.Item.DataItem; - - if (!i.HideFromNavigation) { - Literal _class = (Literal)e.Item.FindControl("lt_class"); - Literal _name = (Literal)e.Item.FindControl("lt_name"); - - if (i.Alias == currentStepClass) - _class.Text = "active"; - - stepCounter++; - _name.Text = (stepCounter).ToString() + " - " + i.Name; - } else - e.Item.Visible = false; - } - } - - - public void GotoNextStep(string currentStep) - { - InstallerStep _s = InstallerSteps().GotoNextStep(currentStep); - Response.Redirect("?installStep=" + _s.Alias); - } - - public void GotoLastStep() - { - InstallerStep _s = InstallerSteps().Get("theend"); - Response.Redirect("?installStep=" + _s.Alias); - } - - - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - InitializeComponent(); - base.OnInit(e); - - _installStep = helper.Request("installStep"); - InstallerStep _s; - - //if this is not an upgrade we will log in with the default user. - if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim())) { - try { - ensureContext(); - } catch { - Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl)); - } - - //set the first step to upgrade. - // if (string.IsNullOrEmpty(_installStep)) - // _installStep = "upgrade"; - } - - if (string.IsNullOrEmpty(_installStep)) - _s = InstallerSteps()["welcome"]; - else - _s = InstallerSteps()[_installStep]; - - loadContent(_s); - } - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - - } - #endregion - - - - private static InstallerStepCollection InstallerSteps() - { - InstallerStepCollection ics = new InstallerStepCollection(); - ics.Add(new install.steps.Definitions.Welcome()); - ics.Add(new install.steps.Definitions.License()); - ics.Add(new install.steps.Definitions.FilePermissions()); - ics.Add(new install.steps.Definitions.Database()); - ics.Add(new install.steps.Definitions.DefaultUser()); - ics.Add( new install.steps.Definitions.Skinning() ); - ics.Add(new install.steps.Definitions.WebPi()); - ics.Add(new install.steps.Definitions.TheEnd()); - return ics; - } - - - } -} diff --git a/src/Umbraco.Web/BasePageExtensions.cs b/src/Umbraco.Web/umbraco.presentation/BasePageExtensions.cs similarity index 100% rename from src/Umbraco.Web/BasePageExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/BasePageExtensions.cs diff --git a/src/Umbraco.Web/EnsureSystemPathsApplicationStartupHandler.cs b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs similarity index 100% rename from src/Umbraco.Web/EnsureSystemPathsApplicationStartupHandler.cs rename to src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs diff --git a/src/Umbraco.Web/PublishQueue.cs b/src/Umbraco.Web/umbraco.presentation/PublishQueue.cs similarity index 100% rename from src/Umbraco.Web/PublishQueue.cs rename to src/Umbraco.Web/umbraco.presentation/PublishQueue.cs diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoContext.cs similarity index 100% rename from src/Umbraco.Web/UmbracoContext.cs rename to src/Umbraco.Web/umbraco.presentation/UmbracoContext.cs diff --git a/src/Umbraco.Web/UmbracoPage.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoPage.cs similarity index 100% rename from src/Umbraco.Web/UmbracoPage.cs rename to src/Umbraco.Web/umbraco.presentation/UmbracoPage.cs diff --git a/src/Umbraco.Web/UmbracoRequest.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoRequest.cs similarity index 100% rename from src/Umbraco.Web/UmbracoRequest.cs rename to src/Umbraco.Web/umbraco.presentation/UmbracoRequest.cs diff --git a/src/Umbraco.Web/UmbracoResponse.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoResponse.cs similarity index 100% rename from src/Umbraco.Web/UmbracoResponse.cs rename to src/Umbraco.Web/umbraco.presentation/UmbracoResponse.cs diff --git a/src/Umbraco.Web/UmbracoServerUtility.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs similarity index 100% rename from src/Umbraco.Web/UmbracoServerUtility.cs rename to src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs diff --git a/src/Umbraco.Web/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs similarity index 100% rename from src/Umbraco.Web/content.cs rename to src/Umbraco.Web/umbraco.presentation/content.cs diff --git a/src/Umbraco.Web/default.aspx b/src/Umbraco.Web/umbraco.presentation/default.aspx similarity index 100% rename from src/Umbraco.Web/default.aspx rename to src/Umbraco.Web/umbraco.presentation/default.aspx diff --git a/src/Umbraco.Web/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs similarity index 100% rename from src/Umbraco.Web/default.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/default.aspx.cs diff --git a/src/Umbraco.Web/default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/default.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/default.aspx.designer.cs diff --git a/src/Umbraco.Web/helper.cs b/src/Umbraco.Web/umbraco.presentation/helper.cs similarity index 100% rename from src/Umbraco.Web/helper.cs rename to src/Umbraco.Web/umbraco.presentation/helper.cs diff --git a/src/Umbraco.Web/install/Title.ascx b/src/Umbraco.Web/umbraco.presentation/install/Title.ascx similarity index 100% rename from src/Umbraco.Web/install/Title.ascx rename to src/Umbraco.Web/umbraco.presentation/install/Title.ascx diff --git a/src/Umbraco.Web/install/Title.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/Title.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/Title.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/Title.ascx.cs diff --git a/src/Umbraco.Web/install/Title.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/Title.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/Title.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/Title.ascx.designer.cs diff --git a/src/Umbraco.Web/install/default.aspx b/src/Umbraco.Web/umbraco.presentation/install/default.aspx similarity index 100% rename from src/Umbraco.Web/install/default.aspx rename to src/Umbraco.Web/umbraco.presentation/install/default.aspx diff --git a/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs new file mode 100644 index 0000000000..760c6a3400 --- /dev/null +++ b/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs @@ -0,0 +1,148 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Web; +using System.Web.SessionState; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.HtmlControls; +using System.Collections.Specialized; +using umbraco.IO; +using umbraco.cms.businesslogic.installer; +using System.Collections.Generic; + +namespace umbraco.presentation.install +{ + /// + /// Summary description for _default. + /// + public partial class _default : BasePages.BasePage + { + + private string _installStep = ""; + public string currentStepClass = ""; + + protected void Page_Load(object sender, System.EventArgs e) + { + // use buffer, so content isn't sent until it's ready (minimizing the blank screen experience) + //Response.Buffer = true; + rp_steps.DataSource = InstallerSteps().Values; + rp_steps.DataBind(); + } + + + private void loadContent(InstallerStep currentStep) + { + PlaceHolderStep.Controls.Clear(); + PlaceHolderStep.Controls.Add(new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl(currentStep.UserControl))); + step.Value = currentStep.Alias; + currentStepClass = currentStep.Alias; + } + + int stepCounter = 0; + protected void bindStep(object sender, RepeaterItemEventArgs e) + { + + if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) + { + InstallerStep i = (InstallerStep)e.Item.DataItem; + + if (!i.HideFromNavigation) + { + Literal _class = (Literal)e.Item.FindControl("lt_class"); + Literal _name = (Literal)e.Item.FindControl("lt_name"); + + if (i.Alias == currentStepClass) + _class.Text = "active"; + + stepCounter++; + _name.Text = (stepCounter).ToString() + " - " + i.Name; + } + else + e.Item.Visible = false; + } + } + + + public void GotoNextStep(string currentStep) + { + InstallerStep _s = InstallerSteps().GotoNextStep(currentStep); + Response.Redirect("?installStep=" + _s.Alias); + } + + public void GotoLastStep() + { + InstallerStep _s = InstallerSteps().Get("theend"); + Response.Redirect("?installStep=" + _s.Alias); + } + + + #region Web Form Designer generated code + override protected void OnInit(EventArgs e) + { + InitializeComponent(); + base.OnInit(e); + + _installStep = helper.Request("installStep"); + InstallerStep _s; + + //if this is not an upgrade we will log in with the default user. + if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim())) + { + try + { + ensureContext(); + } + catch (InvalidOperationException ex) + { + + } + catch (Exception) + { + Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl)); + } + + //set the first step to upgrade. + // if (string.IsNullOrEmpty(_installStep)) + // _installStep = "upgrade"; + } + + if (string.IsNullOrEmpty(_installStep)) + _s = InstallerSteps()["welcome"]; + else + _s = InstallerSteps()[_installStep]; + + loadContent(_s); + } + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + + } + #endregion + + + + private static InstallerStepCollection InstallerSteps() + { + InstallerStepCollection ics = new InstallerStepCollection(); + ics.Add(new install.steps.Definitions.Welcome()); + ics.Add(new install.steps.Definitions.License()); + ics.Add(new install.steps.Definitions.FilePermissions()); + ics.Add(new install.steps.Definitions.Database()); + ics.Add(new install.steps.Definitions.DefaultUser()); + ics.Add(new install.steps.Definitions.Skinning()); + ics.Add(new install.steps.Definitions.WebPi()); + ics.Add(new install.steps.Definitions.TheEnd()); + return ics; + } + + + } +} diff --git a/src/Umbraco.Web/install/default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/default.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/default.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/default.aspx.designer.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/Database.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Database.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/Database.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Database.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/DefaultUser.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/DefaultUser.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/DefaultUser.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/DefaultUser.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/FilePermissions.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/FilePermissions.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/FilePermissions.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/FilePermissions.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/InstallerControl.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/InstallerControl.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/InstallerControl.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/InstallerControl.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/License.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/License.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/License.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/License.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/Skinning.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Skinning.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/Skinning.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Skinning.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/TheEnd.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/TheEnd.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/TheEnd.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/TheEnd.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/WebPi.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/WebPi.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/WebPi.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/WebPi.cs diff --git a/src/Umbraco.Web/install/steps/Definitions/Welcome.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Welcome.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Definitions/Welcome.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Welcome.cs diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx.cs diff --git a/src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/Skinning/loadStarterKits.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/database.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/database.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx diff --git a/src/Umbraco.Web/install/steps/database.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/database.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs diff --git a/src/Umbraco.Web/install/steps/database.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/database.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/database.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.resx similarity index 100% rename from src/Umbraco.Web/install/steps/database.ascx.resx rename to src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.resx diff --git a/src/Umbraco.Web/install/steps/defaultUser.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/defaultUser.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx diff --git a/src/Umbraco.Web/install/steps/defaultUser.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/defaultUser.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs diff --git a/src/Umbraco.Web/install/steps/defaultUser.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/defaultUser.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/defaultUser.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.resx similarity index 100% rename from src/Umbraco.Web/install/steps/defaultUser.ascx.resx rename to src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.resx diff --git a/src/Umbraco.Web/install/steps/license.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/license.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx diff --git a/src/Umbraco.Web/install/steps/license.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/license.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.cs diff --git a/src/Umbraco.Web/install/steps/license.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/license.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/renaming.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/renaming.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx diff --git a/src/Umbraco.Web/install/steps/renaming.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/renaming.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.cs diff --git a/src/Umbraco.Web/install/steps/renaming.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/renaming.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/skinning.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/skinning.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx diff --git a/src/Umbraco.Web/install/steps/skinning.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/skinning.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.cs diff --git a/src/Umbraco.Web/install/steps/skinning.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/skinning.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/theend.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/theend.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx diff --git a/src/Umbraco.Web/install/steps/theend.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/theend.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs diff --git a/src/Umbraco.Web/install/steps/theend.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/theend.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/theend.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.resx similarity index 100% rename from src/Umbraco.Web/install/steps/theend.ascx.resx rename to src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.resx diff --git a/src/Umbraco.Web/install/steps/validatePermissions.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/validatePermissions.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx diff --git a/src/Umbraco.Web/install/steps/validatePermissions.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/validatePermissions.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs diff --git a/src/Umbraco.Web/install/steps/validatePermissions.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/validatePermissions.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/validatePermissions.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.resx similarity index 100% rename from src/Umbraco.Web/install/steps/validatePermissions.ascx.resx rename to src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.resx diff --git a/src/Umbraco.Web/install/steps/welcome.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx similarity index 100% rename from src/Umbraco.Web/install/steps/welcome.ascx rename to src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx diff --git a/src/Umbraco.Web/install/steps/welcome.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs similarity index 100% rename from src/Umbraco.Web/install/steps/welcome.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs diff --git a/src/Umbraco.Web/install/steps/welcome.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/steps/welcome.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.designer.cs diff --git a/src/Umbraco.Web/install/steps/welcome.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.resx similarity index 100% rename from src/Umbraco.Web/install/steps/welcome.ascx.resx rename to src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.resx diff --git a/src/Umbraco.Web/install/utills/FilePermissions.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs similarity index 100% rename from src/Umbraco.Web/install/utills/FilePermissions.cs rename to src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs diff --git a/src/Umbraco.Web/install/utills/Helper.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs similarity index 100% rename from src/Umbraco.Web/install/utills/Helper.cs rename to src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs diff --git a/src/Umbraco.Web/install/utills/p.aspx b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx similarity index 100% rename from src/Umbraco.Web/install/utills/p.aspx rename to src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx diff --git a/src/Umbraco.Web/install/utills/p.aspx.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs similarity index 100% rename from src/Umbraco.Web/install/utills/p.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs diff --git a/src/Umbraco.Web/install/utills/p.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/install/utills/p.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.designer.cs diff --git a/src/Umbraco.Web/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs similarity index 100% rename from src/Umbraco.Web/item.cs rename to src/Umbraco.Web/umbraco.presentation/item.cs diff --git a/src/Umbraco.Web/keepAliveService.cs b/src/Umbraco.Web/umbraco.presentation/keepAliveService.cs similarity index 100% rename from src/Umbraco.Web/keepAliveService.cs rename to src/Umbraco.Web/umbraco.presentation/keepAliveService.cs diff --git a/src/Umbraco.Web/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs similarity index 100% rename from src/Umbraco.Web/library.cs rename to src/Umbraco.Web/umbraco.presentation/library.cs diff --git a/src/Umbraco.Web/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs similarity index 100% rename from src/Umbraco.Web/macro.cs rename to src/Umbraco.Web/umbraco.presentation/macro.cs diff --git a/src/Umbraco.Web/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs similarity index 100% rename from src/Umbraco.Web/page.cs rename to src/Umbraco.Web/umbraco.presentation/page.cs diff --git a/src/Umbraco.Web/publishingService.cs b/src/Umbraco.Web/umbraco.presentation/publishingService.cs similarity index 100% rename from src/Umbraco.Web/publishingService.cs rename to src/Umbraco.Web/umbraco.presentation/publishingService.cs diff --git a/src/Umbraco.Web/python.cs b/src/Umbraco.Web/umbraco.presentation/python.cs similarity index 100% rename from src/Umbraco.Web/python.cs rename to src/Umbraco.Web/umbraco.presentation/python.cs diff --git a/src/Umbraco.Web/requestHandler.cs b/src/Umbraco.Web/umbraco.presentation/requestHandler.cs similarity index 100% rename from src/Umbraco.Web/requestHandler.cs rename to src/Umbraco.Web/umbraco.presentation/requestHandler.cs diff --git a/src/Umbraco.Web/requestModule.cs b/src/Umbraco.Web/umbraco.presentation/requestModule.cs similarity index 100% rename from src/Umbraco.Web/requestModule.cs rename to src/Umbraco.Web/umbraco.presentation/requestModule.cs diff --git a/src/Umbraco.Web/showField.cs b/src/Umbraco.Web/umbraco.presentation/showField.cs similarity index 100% rename from src/Umbraco.Web/showField.cs rename to src/Umbraco.Web/umbraco.presentation/showField.cs diff --git a/src/Umbraco.Web/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs similarity index 100% rename from src/Umbraco.Web/template.cs rename to src/Umbraco.Web/umbraco.presentation/template.cs diff --git a/src/Umbraco.Web/umbraco/ActionHandlers/umbEnsureUniqueName.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/ActionHandlers/umbEnsureUniqueName.cs similarity index 100% rename from src/Umbraco.Web/umbraco/ActionHandlers/umbEnsureUniqueName.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/ActionHandlers/umbEnsureUniqueName.cs diff --git a/src/Umbraco.Web/umbraco/Default.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/Default.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx diff --git a/src/Umbraco.Web/umbraco/Default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Default.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs diff --git a/src/Umbraco.Web/umbraco/Default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Default.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/CanvasClientDependencyProvider.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/CanvasClientDependencyProvider.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Controls/Communicator.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/Communicator.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Controls/Communicator.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/Communicator.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Controls/LiveEditingManager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Controls/LiveEditingManager.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingManager.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/DefaultLiveEditingContext.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/DefaultLiveEditingContext.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/DefaultLiveEditingContext.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/DefaultLiveEditingContext.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/ILiveEditingContext.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/ILiveEditingContext.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/ILiveEditingContext.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/ILiveEditingContext.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/LiveEditing.cd b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/LiveEditing.cd similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/LiveEditing.cd rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/LiveEditing.cd diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Menu/DefaultLiveEditingMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Menu/DefaultLiveEditingMenu.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Menu/DefaultLiveEditingMenu.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Menu/DefaultLiveEditingMenu.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Menu/ILiveEditingMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Menu/ILiveEditingMenu.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Menu/ILiveEditingMenu.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Menu/ILiveEditingMenu.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/AddModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/AddModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/AddModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/AddModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/BaseModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/BaseModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/BaseModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/BaseModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/CssModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CssModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/CssModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CssModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditor.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/PageElementEditor.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/PageElementEditor.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/ItemEditing/PageElementEditor.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/PageElementEditor.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/MacroModule/TemplateUpdate.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/TemplateUpdate.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/MacroModule/TemplateUpdate.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/TemplateUpdate.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/Separator.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/Separator.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/Separator.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/Separator.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/skin.png b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/skin.png similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/SkinModule/skin.png rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/skin.png diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Updates/DefaultUpdateList.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/DefaultUpdateList.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Updates/DefaultUpdateList.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/DefaultUpdateList.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Updates/IUpdate.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/IUpdate.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Updates/IUpdate.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/IUpdate.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Updates/IUpdateList.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/IUpdateList.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Updates/IUpdateList.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Updates/IUpdateList.cs diff --git a/src/Umbraco.Web/umbraco/LiveEditing/Utility.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Utility.cs similarity index 100% rename from src/Umbraco.Web/umbraco/LiveEditing/Utility.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Utility.cs diff --git a/src/Umbraco.Web/umbraco/Search/ExamineEvents.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/ExamineEvents.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Search/ExamineEvents.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/ExamineEvents.cs diff --git a/src/Umbraco.Web/umbraco/Search/QuickSearch.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/Search/QuickSearch.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx diff --git a/src/Umbraco.Web/umbraco/Search/QuickSearch.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Search/QuickSearch.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx.cs diff --git a/src/Umbraco.Web/umbraco/Search/QuickSearch.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Search/QuickSearch.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearch.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/Search/QuickSearchHandler.ashx b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx similarity index 100% rename from src/Umbraco.Web/umbraco/Search/QuickSearchHandler.ashx rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx diff --git a/src/Umbraco.Web/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Search/QuickSearchHandler.ashx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs diff --git a/src/Umbraco.Web/umbraco/Trees/BaseContentTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/BaseContentTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/BaseMediaTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/BaseMediaTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/BaseTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/ContentRecycleBin.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/ContentRecycleBin.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs diff --git a/src/Umbraco.Web/umbraco/Trees/FileSystemTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/FileSystemTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/ITreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ITreeService.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/ITreeService.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ITreeService.cs diff --git a/src/Umbraco.Web/umbraco/Trees/LegacyTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/LegacyTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/MediaRecycleBin.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/MediaRecycleBin.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs diff --git a/src/Umbraco.Web/umbraco/Trees/NodeActionsEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/NodeActionsEventArgs.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs diff --git a/src/Umbraco.Web/umbraco/Trees/NullTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/NullTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeDefinition.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeDefinition.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeDefinitionCollection.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeDialogModes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDialogModes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeDialogModes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDialogModes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeEventArgs.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeEventArgs.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeEventArgs.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeRequestParams.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeRequestParams.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeRequestParams.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeRequestParams.cs diff --git a/src/Umbraco.Web/umbraco/Trees/TreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/TreeService.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs diff --git a/src/Umbraco.Web/umbraco/Trees/Trees.cd b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/Trees.cd similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/Trees.cd rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/Trees.cd diff --git a/src/Umbraco.Web/umbraco/Trees/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/UserPermissions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs diff --git a/src/Umbraco.Web/umbraco/Trees/UserTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/UserTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/XmlTree.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs diff --git a/src/Umbraco.Web/umbraco/Trees/XmlTree.xsd b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.xsd similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/XmlTree.xsd rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.xsd diff --git a/src/Umbraco.Web/umbraco/Trees/XmlTree.xsx b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.xsx similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/XmlTree.xsx rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.xsx diff --git a/src/Umbraco.Web/umbraco/Trees/loadCache.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCache.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadCache.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCache.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadCacheItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCacheItem.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadCacheItem.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCacheItem.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadContent.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadContent.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadDLRScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadDLRScripts.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadDataTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadDataTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadDictionary.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadLanguages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadLanguages.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMacros.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMacros.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMedia.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMedia.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMediaTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMediaTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMemberGroups.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMemberTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMemberTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadMembers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadMembers.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadNodeTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadPackager.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadPackages.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadPython.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadPython.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadRelationTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadRelationTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadScripts.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadStylesheetProperty.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadStylesheetProperty.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadStylesheets.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadTemplates.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadTranslationTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadTranslationTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadUsers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadUsers.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadXslt.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs diff --git a/src/Umbraco.Web/umbraco/Trees/loadcontentItemType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadcontentItemType.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Trees/loadcontentItemType.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadcontentItemType.cs diff --git a/src/Umbraco.Web/umbraco/Web/UI/ContentPage.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs similarity index 100% rename from src/Umbraco.Web/umbraco/Web/UI/ContentPage.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs diff --git a/src/Umbraco.Web/umbraco/actions/delete.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/actions/delete.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx diff --git a/src/Umbraco.Web/umbraco/actions/delete.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/delete.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs diff --git a/src/Umbraco.Web/umbraco/actions/delete.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/delete.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/actions/editContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/actions/editContent.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx diff --git a/src/Umbraco.Web/umbraco/actions/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/editContent.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx.cs diff --git a/src/Umbraco.Web/umbraco/actions/editContent.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/editContent.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/editContent.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/actions/preview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/actions/preview.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx diff --git a/src/Umbraco.Web/umbraco/actions/preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/preview.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs diff --git a/src/Umbraco.Web/umbraco/actions/preview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/preview.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/actions/publish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/actions/publish.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx diff --git a/src/Umbraco.Web/umbraco/actions/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/publish.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs diff --git a/src/Umbraco.Web/umbraco/actions/publish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/actions/publish.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/cache/CacheRefresher.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/CacheRefresher.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cache/CacheRefresher.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cache/CacheRefresher.cs diff --git a/src/Umbraco.Web/umbraco/cache/dispatcher.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cache/dispatcher.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs diff --git a/src/Umbraco.Web/umbraco/cache/factory.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cache/factory.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs diff --git a/src/Umbraco.Web/umbraco/cache/libraryRefreshers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/libraryRefreshers.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cache/libraryRefreshers.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cache/libraryRefreshers.cs diff --git a/src/Umbraco.Web/umbraco/cache/pageRefresher.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/pageRefresher.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cache/pageRefresher.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cache/pageRefresher.cs diff --git a/src/Umbraco.Web/umbraco/cacheBrowser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/cacheBrowser.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx diff --git a/src/Umbraco.Web/umbraco/cacheBrowser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cacheBrowser.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx.cs diff --git a/src/Umbraco.Web/umbraco/cacheBrowser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/cacheBrowser.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/canvas.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/canvas.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx diff --git a/src/Umbraco.Web/umbraco/canvas.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/canvas.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx.cs diff --git a/src/Umbraco.Web/umbraco/canvas.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/canvas.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/canvas.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/channels/Blogger.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/Blogger.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/Blogger.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/Blogger.cs diff --git a/src/Umbraco.Web/umbraco/channels/DocumentDateComparer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/DocumentDateComparer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/DocumentDateComparer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/DocumentDateComparer.cs diff --git a/src/Umbraco.Web/umbraco/channels/MetaWeblog.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/MetaWeblog.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/MetaWeblog.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/MetaWeblog.cs diff --git a/src/Umbraco.Web/umbraco/channels/UmbracoMetaWeblogAPI.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/UmbracoMetaWeblogAPI.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs diff --git a/src/Umbraco.Web/umbraco/channels/api.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/api.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs diff --git a/src/Umbraco.Web/umbraco/channels/config.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/config.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs diff --git a/src/Umbraco.Web/umbraco/channels/remixWeblogApi.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/remixWeblogApi.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/remixWeblogApi.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/remixWeblogApi.cs diff --git a/src/Umbraco.Web/umbraco/channels/rsd.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/channels/rsd.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx diff --git a/src/Umbraco.Web/umbraco/channels/rsd.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/rsd.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx.cs diff --git a/src/Umbraco.Web/umbraco/channels/rsd.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/rsd.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/rsd.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx diff --git a/src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx.cs diff --git a/src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/wlwmanifest.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/wlwmanifest.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/channels/wordApi.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/wordApi.cs similarity index 100% rename from src/Umbraco.Web/umbraco/channels/wordApi.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/channels/wordApi.cs diff --git a/src/Umbraco.Web/umbraco/controls/ContentControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentControl.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs diff --git a/src/Umbraco.Web/umbraco/controls/ContentPicker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentPicker.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs diff --git a/src/Umbraco.Web/umbraco/controls/ContentTypeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentTypeControl.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs diff --git a/src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx diff --git a/src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ContentTypeControlNew.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx diff --git a/src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs diff --git a/src/Umbraco.Web/umbraco/controls/GenericValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericValidation.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/GenericValidation.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericValidation.cs diff --git a/src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx diff --git a/src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/ImageViewer.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/Images/ImageViewerUpdater.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/ImageViewerUpdater.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx diff --git a/src/Umbraco.Web/umbraco/controls/Images/ImageViewerUpdater.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/ImageViewerUpdater.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs diff --git a/src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx diff --git a/src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/LabelButton.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/LabelButton.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/LabelButton.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/LabelButton.cs diff --git a/src/Umbraco.Web/umbraco/controls/ProgressBar.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ProgressBar.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx diff --git a/src/Umbraco.Web/umbraco/controls/ProgressBar.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ProgressBar.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/ProgressBar.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/ProgressBar.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/SaveClickEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/SaveClickEventArgs.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/CustomTreeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/CustomTreeControl.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/CustomTreeService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/CustomTreeService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.asmx diff --git a/src/Umbraco.Web/umbraco/controls/Tree/CustomTreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/CustomTreeService.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/JTreeContextMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/JTreeContextMenu.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/JTreeContextMenuItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/JTreeContextMenuItem.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/NodeInfo.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/NodeInfo.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/NodeInfo.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/NodeInfo.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx diff --git a/src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/Tree/TreeControl.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/controls/dualSelectBox.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/dualSelectBox.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs diff --git a/src/Umbraco.Web/umbraco/controls/macroParameterControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/macroParameterControl.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs diff --git a/src/Umbraco.Web/umbraco/controls/passwordChanger.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/controls/passwordChanger.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx diff --git a/src/Umbraco.Web/umbraco/controls/passwordChanger.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/passwordChanger.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs diff --git a/src/Umbraco.Web/umbraco/controls/passwordChanger.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/controls/passwordChanger.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/create.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx diff --git a/src/Umbraco.Web/umbraco/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs diff --git a/src/Umbraco.Web/umbraco/create.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/CreatedPackageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/CreatedPackageTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/DLRScripting.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/DLRScripting.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx diff --git a/src/Umbraco.Web/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/DLRScripting.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/DLRScripting.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/DLRScripting.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/DLRScriptingTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/DLRScriptingTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/DataTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/DataTypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/MediaTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/MediaTypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/MemberGroupTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/MemberGroupTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/MemberTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/MemberTypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/NewMemberUIEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/NewMemberUIEventArgs.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs diff --git a/src/Umbraco.Web/umbraco/create/PythonTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/PythonTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/ScriptTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/StylesheetTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/StylesheetTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/XsltTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/XsltTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/content.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/content.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx diff --git a/src/Umbraco.Web/umbraco/create/content.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/content.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/content.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/content.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/contentItemTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/contentItemTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/contentItemTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/contentItemTypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/contentTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/contentTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/dialogHandler_temp.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/dialogHandler_temp.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs diff --git a/src/Umbraco.Web/umbraco/create/dictionaryTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/dictionaryTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/language.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/language.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx diff --git a/src/Umbraco.Web/umbraco/create/language.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/language.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/language.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/language.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/languageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/languageTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/macroTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/media.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/media.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx diff --git a/src/Umbraco.Web/umbraco/create/media.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/media.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/media.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/media.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/mediaTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/mediaTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/member.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/member.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx diff --git a/src/Umbraco.Web/umbraco/create/member.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/member.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/member.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/member.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/memberTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/memberTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/nodeType.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/nodeType.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx diff --git a/src/Umbraco.Web/umbraco/create/nodeType.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/nodeType.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/nodeType.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/nodeType.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/nodetypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/nodetypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/script.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/script.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx diff --git a/src/Umbraco.Web/umbraco/create/script.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/script.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/script.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/script.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/simple.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/simple.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx diff --git a/src/Umbraco.Web/umbraco/create/simple.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/simple.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/simple.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/simple.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/create/stylesheetPropertyTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/stylesheetPropertyTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/templateTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/templateTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/userTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/userTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs diff --git a/src/Umbraco.Web/umbraco/create/xslt.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/create/xslt.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx diff --git a/src/Umbraco.Web/umbraco/create/xslt.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/xslt.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs diff --git a/src/Umbraco.Web/umbraco/create/xslt.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/create/xslt.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx diff --git a/src/Umbraco.Web/umbraco/dashboard.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/ChangePassword.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardIntro.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardIntro.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardIntro.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardVideos.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardVideos.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/DeveloperDashboardVideos.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx diff --git a/src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/FeedProxy.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/LatestEdits.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/MediaDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MediaDashboardIntro.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/MediaDashboardIntro.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MediaDashboardIntro.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/MediaDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MediaDashboardVideos.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/MediaDashboardVideos.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MediaDashboardVideos.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/MembersDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MembersDashboardIntro.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/MembersDashboardIntro.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MembersDashboardIntro.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/MembersDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MembersDashboardVideos.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/MembersDashboardVideos.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/MembersDashboardVideos.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/SettingsDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/SettingsDashboardIntro.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/SettingsDashboardIntro.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/SettingsDashboardIntro.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/SettingsDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/SettingsDashboardVideos.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/SettingsDashboardVideos.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/SettingsDashboardVideos.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardIntro.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardIntro.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardIntro.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardKits.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardKits.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardKits.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardKits.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardVideos.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx diff --git a/src/Umbraco.Web/umbraco/dashboard/StartupDashboardVideos.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dashboard/StartupDashboardVideos.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Cache/viewCacheItem.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx diff --git a/src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Macros/editMacro.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/BrowseRepository.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/LoadNitros.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/LoadNitros.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/StarterKits.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/SubmitPackage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/directoryBrowser.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/directoryBrowser.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/editPackage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installedPackage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installer.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installer.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Packages/installer.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Packages/installer.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Python/editPython.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Python/editPython.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Python/editPython.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Python/editPython.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Python/editPython.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Python/editPython.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/ReadOnlyRelation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/ReadOnlyRelation.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/RelationTypesWebService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/RelationTypesWebService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs diff --git a/src/Umbraco.Web/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/editXslt.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/getXsltStatus.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/getXsltStatus.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/getXsltStatus.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/getXsltStatus.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/developer/autoDoc.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/developer/autoDoc.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx diff --git a/src/Umbraco.Web/umbraco/developer/autoDoc.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/autoDoc.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx.cs diff --git a/src/Umbraco.Web/umbraco/developer/autoDoc.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/developer/autoDoc.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/developer/autoDoc.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/AssignDomain.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/ExportCode.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/ExportCode.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/Preview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/Preview.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/Preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/Preview.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/Preview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/Preview.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/RegexWs.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/SendPublish.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/TemplateSkinning.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/about.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/about.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/about.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/about.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/about.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/about.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/create.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/create.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/create.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/create.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/create.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/cruds.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/cruds.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/cruds.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/cruds.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/cruds.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/cruds.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/editMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/editMacro.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/editMacro.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/editMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/editMacro.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/empty.htm b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/empty.htm similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/empty.htm rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/empty.htm diff --git a/src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/emptyTrashcan.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/exportDocumenttype.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/exportDocumenttype.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/exportDocumenttype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/exportDocumenttype.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/imageViewer.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/importDocumenttype.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/importDocumenttype.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/importDocumenttype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/importDocumenttype.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMacro.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertTable.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertTable.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/insertTable.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertTable.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/insertTable.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/insertTable.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertTable.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/mediaPicker.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/moveOrCopy.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/notifications.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/notifications.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/notifications.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/notifications.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/notifications.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/protectPage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/protectPage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/protectPage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/protectPage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/protectPage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/publish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/publish.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/publish.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/publish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/publish.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/publish.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/republish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/republish.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/republish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/republish.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/republish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/republish.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/rollBack.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/rollBack.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/rollBack.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/rollBack.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/rollBack.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/search.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/search.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/search.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/search.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/search.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/search.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sendToTranslation.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/sort.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sort.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/sort.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sort.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/sort.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/sort.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/treePicker.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/treePicker.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/treePicker.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/treePicker.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/treePicker.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/treePicker.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/treePicker.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/umbracoField.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/uploadImage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx diff --git a/src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs diff --git a/src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/dialogs/viewAuditTrail.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/editContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/editContent.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx diff --git a/src/Umbraco.Web/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/editContent.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs diff --git a/src/Umbraco.Web/umbraco/editContent.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/editContent.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/editMedia.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/editMedia.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx diff --git a/src/Umbraco.Web/umbraco/editMedia.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/editMedia.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs diff --git a/src/Umbraco.Web/umbraco/editMedia.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/editMedia.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/endPreview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/endPreview.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx diff --git a/src/Umbraco.Web/umbraco/endPreview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/endPreview.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs diff --git a/src/Umbraco.Web/umbraco/endPreview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/endPreview.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/helpRedirect.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/helpRedirect.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx diff --git a/src/Umbraco.Web/umbraco/helpRedirect.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/helpRedirect.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx.cs diff --git a/src/Umbraco.Web/umbraco/helpRedirect.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/helpRedirect.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/helpRedirect.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx diff --git a/src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx.cs diff --git a/src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/js/UmbracoCasingRules.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/UmbracoCasingRules.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/js/language.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/js/language.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx diff --git a/src/Umbraco.Web/umbraco/js/language.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/js/language.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.cs diff --git a/src/Umbraco.Web/umbraco/js/language.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/js/language.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/js/language.aspx.resx b/src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.resx similarity index 100% rename from src/Umbraco.Web/umbraco/js/language.aspx.resx rename to src/Umbraco.Web/umbraco.presentation/umbraco/js/language.aspx.resx diff --git a/src/Umbraco.Web/umbraco/login.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/login.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx diff --git a/src/Umbraco.Web/umbraco/login.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/login.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs diff --git a/src/Umbraco.Web/umbraco/login.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/login.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/logout.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/logout.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx diff --git a/src/Umbraco.Web/umbraco/logout.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/logout.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs diff --git a/src/Umbraco.Web/umbraco/logout.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/logout.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/macroResultWrapper.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/macroResultWrapper.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx diff --git a/src/Umbraco.Web/umbraco/macroResultWrapper.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/macroResultWrapper.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx.cs diff --git a/src/Umbraco.Web/umbraco/macroResultWrapper.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/macroResultWrapper.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/macroResultWrapper.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/default.Master b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/default.Master rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master diff --git a/src/Umbraco.Web/umbraco/masterpages/default.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/default.Master.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/default.Master.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/default.Master.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.designer.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoDialog.Master.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.designer.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs diff --git a/src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/masterpages/umbracoPage.Master.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMember.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMember.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx diff --git a/src/Umbraco.Web/umbraco/members/EditMember.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMember.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMember.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMember.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx diff --git a/src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberGroup.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMemberType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberType.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx diff --git a/src/Umbraco.Web/umbraco/members/EditMemberType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberType.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs diff --git a/src/Umbraco.Web/umbraco/members/EditMemberType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/EditMemberType.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/MemberSearch.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/members/MemberSearch.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx diff --git a/src/Umbraco.Web/umbraco/members/MemberSearch.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/MemberSearch.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx.cs diff --git a/src/Umbraco.Web/umbraco/members/MemberSearch.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/MemberSearch.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/ViewMembers.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/members/ViewMembers.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx diff --git a/src/Umbraco.Web/umbraco/members/ViewMembers.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/ViewMembers.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx.cs diff --git a/src/Umbraco.Web/umbraco/members/ViewMembers.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/ViewMembers.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/members/search.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/members/search.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx diff --git a/src/Umbraco.Web/umbraco/members/search.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/search.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx.cs diff --git a/src/Umbraco.Web/umbraco/members/search.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/members/search.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/members/search.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/nodeFactory/Page.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Page.cs similarity index 100% rename from src/Umbraco.Web/umbraco/nodeFactory/Page.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Page.cs diff --git a/src/Umbraco.Web/umbraco/nodeFactory/Page_Legacy.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Page_Legacy.cs similarity index 100% rename from src/Umbraco.Web/umbraco/nodeFactory/Page_Legacy.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Page_Legacy.cs diff --git a/src/Umbraco.Web/umbraco/nodeFactory/UmbracoSiteMapProvider.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/UmbracoSiteMapProvider.cs similarity index 100% rename from src/Umbraco.Web/umbraco/nodeFactory/UmbracoSiteMapProvider.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/UmbracoSiteMapProvider.cs diff --git a/src/Umbraco.Web/umbraco/ping.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/ping.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx diff --git a/src/Umbraco.Web/umbraco/ping.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/ping.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs diff --git a/src/Umbraco.Web/umbraco/ping.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/ping.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/GoogleSpellChecker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GoogleSpellChecker.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/GoogleSpellChecker.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GoogleSpellChecker.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/GzipCompressor.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipCompressor.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/GzipCompressor.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipCompressor.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/GzipModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/GzipModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/IModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/IModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/IModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/IModule.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/InsertAnchor.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/InsertAnchor.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/JSON.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSON.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/JSON.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSON.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/JSONReader.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSONReader.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/JSONReader.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSONReader.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/JSONWriter.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSONWriter.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/JSONWriter.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/JSONWriter.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/SpellChecker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellChecker.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/SpellChecker.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellChecker.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/SpellCheckerInput.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellCheckerInput.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/SpellCheckerInput.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellCheckerInput.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/SpellCheckerResult.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellCheckerResult.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/SpellCheckerResult.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/SpellCheckerResult.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertChar.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertChar.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.cs diff --git a/src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/tinymce3tinymceCompress.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/preview/Preview.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/preview/Preview.cs similarity index 100% rename from src/Umbraco.Web/umbraco/preview/Preview.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/preview/Preview.cs diff --git a/src/Umbraco.Web/umbraco/publishStatus.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/publishStatus.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx diff --git a/src/Umbraco.Web/umbraco/publishStatus.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/publishStatus.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.cs diff --git a/src/Umbraco.Web/umbraco/publishStatus.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/publishStatus.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/schemas/package.xsd b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/package.xsd rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd diff --git a/src/Umbraco.Web/umbraco/schemas/package.xsx b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/package.xsx rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx diff --git a/src/Umbraco.Web/umbraco/schemas/umbraco.xsc b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/umbraco.xsc rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc diff --git a/src/Umbraco.Web/umbraco/schemas/umbraco.xsd b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/umbraco.xsd rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd diff --git a/src/Umbraco.Web/umbraco/schemas/umbraco.xss b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/umbraco.xss rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss diff --git a/src/Umbraco.Web/umbraco/schemas/umbraco.xsx b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx similarity index 100% rename from src/Umbraco.Web/umbraco/schemas/umbraco.xsx rename to src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx diff --git a/src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx diff --git a/src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/DictionaryItemList.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx diff --git a/src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditDictionaryItem.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditMediaType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditMediaType.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx diff --git a/src/Umbraco.Web/umbraco/settings/EditMediaType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditMediaType.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditMediaType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditMediaType.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx diff --git a/src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/EditNodeTypeNew.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/editLanguage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editLanguage.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx diff --git a/src/Umbraco.Web/umbraco/settings/editLanguage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editLanguage.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/editLanguage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editLanguage.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editTemplate.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx diff --git a/src/Umbraco.Web/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editTemplate.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/editTemplate.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/editTemplate.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx diff --git a/src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/modals/ShowUmbracoTags.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/scripts/editScript.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/scripts/editScript.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx diff --git a/src/Umbraco.Web/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/scripts/editScript.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs diff --git a/src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/ContentType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/ContentType.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/DisableEventValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/DisableEventValidation.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/InlineXslt.xsltTemplate b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/InlineXslt.xsltTemplate similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/InlineXslt.xsltTemplate rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/InlineXslt.xsltTemplate diff --git a/src/Umbraco.Web/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/Item.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/Macro.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/Resources.Designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/Resources.Designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs diff --git a/src/Umbraco.Web/umbraco/templateControls/Resources.resx b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.resx similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/Resources.resx rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.resx diff --git a/src/Umbraco.Web/umbraco/templateControls/Script.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Script.cs similarity index 100% rename from src/Umbraco.Web/umbraco/templateControls/Script.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Script.cs diff --git a/src/Umbraco.Web/umbraco/test.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/test.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx diff --git a/src/Umbraco.Web/umbraco/test.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/test.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx.cs diff --git a/src/Umbraco.Web/umbraco/test.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/test.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/test.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/timerModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/timerModule.cs similarity index 100% rename from src/Umbraco.Web/umbraco/timerModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/timerModule.cs diff --git a/src/Umbraco.Web/umbraco/translation/default.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/translation/default.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx diff --git a/src/Umbraco.Web/umbraco/translation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/default.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs diff --git a/src/Umbraco.Web/umbraco/translation/default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/default.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/translation/details.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/translation/details.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx diff --git a/src/Umbraco.Web/umbraco/translation/details.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/details.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs diff --git a/src/Umbraco.Web/umbraco/translation/details.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/details.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/translation/preview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/translation/preview.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx diff --git a/src/Umbraco.Web/umbraco/translation/preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/preview.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.cs diff --git a/src/Umbraco.Web/umbraco/translation/preview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/preview.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/translation/translationTasks.dtd b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/translationTasks.dtd similarity index 100% rename from src/Umbraco.Web/umbraco/translation/translationTasks.dtd rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/translationTasks.dtd diff --git a/src/Umbraco.Web/umbraco/translation/xml.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/translation/xml.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx diff --git a/src/Umbraco.Web/umbraco/translation/xml.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/xml.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs diff --git a/src/Umbraco.Web/umbraco/translation/xml.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/translation/xml.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/tree.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/tree.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx diff --git a/src/Umbraco.Web/umbraco/tree.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/tree.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx.cs diff --git a/src/Umbraco.Web/umbraco/tree.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/tree.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/tree.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/treeInit.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/treeInit.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx diff --git a/src/Umbraco.Web/umbraco/treeInit.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/treeInit.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs diff --git a/src/Umbraco.Web/umbraco/treeInit.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/treeInit.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/ContentExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/ContentExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/ContentTypeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentTypeExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/ContentTypeExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentTypeExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/DocumentExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/DocumentExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/MediaExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/MediaExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/MemberExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MemberExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/MemberExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MemberExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/NodeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/NodeExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/PreValueExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/PreValueExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/RelationTypeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/RelationTypeExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/UmbracoObjectTypeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/UmbracoObjectTypeExtensions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/UmbracoObjectTypeExtensions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/UmbracoObjectTypeExtensions.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-DataTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-DataTypes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-Dictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Dictionary.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-Dictionary.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Dictionary.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-Document.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Document.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-Document.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Document.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-Media.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Media.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-Media.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Media.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-Members.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Members.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-Members.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Members.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-Nodes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-Nodes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-PreValues.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-PreValues.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery-UmbracoObjectType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery-UmbracoObjectType.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs diff --git a/src/Umbraco.Web/umbraco/uQuery/uQuery.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs similarity index 100% rename from src/Umbraco.Web/umbraco/uQuery/uQuery.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs diff --git a/src/Umbraco.Web/umbraco/umbWindow.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbWindow.cs similarity index 100% rename from src/Umbraco.Web/umbraco/umbWindow.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/umbWindow.cs diff --git a/src/Umbraco.Web/umbraco/umbraco.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/umbraco.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx diff --git a/src/Umbraco.Web/umbraco/umbraco.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/umbraco.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs diff --git a/src/Umbraco.Web/umbraco/umbraco.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/umbraco.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/urlRewriter/UrlRewriterFormWriter.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/urlRewriter/UrlRewriterFormWriter.cs similarity index 100% rename from src/Umbraco.Web/umbraco/urlRewriter/UrlRewriterFormWriter.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/urlRewriter/UrlRewriterFormWriter.cs diff --git a/src/Umbraco.Web/umbraco/users/EditUser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUser.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx diff --git a/src/Umbraco.Web/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUser.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs diff --git a/src/Umbraco.Web/umbraco/users/EditUser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUser.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/users/EditUserType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUserType.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx diff --git a/src/Umbraco.Web/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUserType.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs diff --git a/src/Umbraco.Web/umbraco/users/EditUserType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/EditUserType.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/users/NodePermissions.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx similarity index 100% rename from src/Umbraco.Web/umbraco/users/NodePermissions.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx diff --git a/src/Umbraco.Web/umbraco/users/NodePermissions.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/NodePermissions.ascx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs diff --git a/src/Umbraco.Web/umbraco/users/NodePermissions.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/NodePermissions.ascx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs diff --git a/src/Umbraco.Web/umbraco/users/PermissionEditor.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx similarity index 100% rename from src/Umbraco.Web/umbraco/users/PermissionEditor.aspx rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx diff --git a/src/Umbraco.Web/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/PermissionEditor.aspx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs diff --git a/src/Umbraco.Web/umbraco/users/PermissionEditor.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/PermissionEditor.aspx.designer.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs diff --git a/src/Umbraco.Web/umbraco/users/PermissionsHandler.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/users/PermissionsHandler.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx diff --git a/src/Umbraco.Web/umbraco/users/PermissionsHandler.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/PermissionsHandler.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs diff --git a/src/Umbraco.Web/umbraco/users/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/UserPermissions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs diff --git a/src/Umbraco.Web/umbraco/users/UserTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs similarity index 100% rename from src/Umbraco.Web/umbraco/users/UserTypeTasks.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs diff --git a/src/Umbraco.Web/umbraco/webService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx diff --git a/src/Umbraco.Web/umbraco/webService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webService.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/CMSNode.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CMSNode.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/CMSNode.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CMSNode.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/CacheRefresher.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CacheRefresher.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/CacheRefresher.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CacheRefresher.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/CheckForUpgrade.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CheckForUpgrade.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/CheckForUpgrade.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/CheckForUpgrade.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/Developer.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Developer.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/Developer.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Developer.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/Developer.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Developer.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/Developer.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Developer.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/MacroContainerService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/MacroContainerService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/MacroContainerService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/MacroContainerService.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/MediaUploader.ashx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/MediaUploader.ashx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx diff --git a/src/Umbraco.Web/umbraco/webservices/MediaUploader.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/MediaUploader.ashx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/RegexComWebservice.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/RegexComWebservice.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/RegexComWebservice.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/RegexComWebservice.cs diff --git a/src/Umbraco.Web/umbraco/webservices/Settings.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/Settings.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/Settings.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/Settings.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/TagsAutoCompleteHandler.ashx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TagsAutoCompleteHandler.ashx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx diff --git a/src/Umbraco.Web/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/TreeClientService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeClientService.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TreeClientService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeClientService.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/TreeClientService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeClientService.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TreeClientService.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeClientService.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/TreeDataService.ashx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeDataService.ashx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TreeDataService.ashx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeDataService.ashx diff --git a/src/Umbraco.Web/umbraco/webservices/TreeDataService.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeDataService.ashx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/TreeDataService.ashx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TreeDataService.ashx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx diff --git a/src/Umbraco.Web/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/ajaxHelpers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ajaxHelpers.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/ajaxHelpers.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ajaxHelpers.cs diff --git a/src/Umbraco.Web/umbraco/webservices/codeEditorSave.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/codeEditorSave.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/codeEditorSave.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/codeEditorSave.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/legacyAjaxCalls.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/legacyAjaxCalls.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/legacyAjaxCalls.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/nodeSorter.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/nodeSorter.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/nodeSorter.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/progressStatus.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/progressStatus.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/progressStatus.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/progressStatus.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/publication.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/publication.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/publication.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/publication.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs diff --git a/src/Umbraco.Web.UI/umbraco/webservices/tagService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx similarity index 100% rename from src/Umbraco.Web.UI/umbraco/webservices/tagService.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/tagService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/tagService.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/templates.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/templates.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/templates.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/templates.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs diff --git a/src/Umbraco.Web/umbraco/webservices/trashcan.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/trashcan.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/trashcan.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/trashcan.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx.cs diff --git a/src/Umbraco.Web.UI/umbraco/webservices/ultimatePickerAutoSuggest.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ultimatePickerAutoSuggest.asmx similarity index 100% rename from src/Umbraco.Web.UI/umbraco/webservices/ultimatePickerAutoSuggest.asmx rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ultimatePickerAutoSuggest.asmx diff --git a/src/Umbraco.Web/umbraco/webservices/ultimatePickerAutoSuggest.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ultimatePickerAutoSuggest.asmx.cs similarity index 100% rename from src/Umbraco.Web/umbraco/webservices/ultimatePickerAutoSuggest.asmx.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/webservices/ultimatePickerAutoSuggest.asmx.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltCommon.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltCommon.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltCommon.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltCommon.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltDatesAndTimes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltDatesAndTimes.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltDatesAndTimes.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltDatesAndTimes.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltMath.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltMath.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltMath.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltMath.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltNodeList.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltNodeList.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltNodeList.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltNodeList.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltRegularExpressions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltRegularExpressions.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltRegularExpressions.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltRegularExpressions.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltSets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltSets.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltSets.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltSets.cs diff --git a/src/Umbraco.Web/umbraco/xslt/eXslt/ExsltStrings.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltStrings.cs similarity index 100% rename from src/Umbraco.Web/umbraco/xslt/eXslt/ExsltStrings.cs rename to src/Umbraco.Web/umbraco.presentation/umbraco/xslt/eXslt/ExsltStrings.cs diff --git a/src/Umbraco.Web/umbracoPageHolder.cs b/src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs similarity index 100% rename from src/Umbraco.Web/umbracoPageHolder.cs rename to src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs diff --git a/src/Umbraco.Web/umbracobase/attributes/RestExtension.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/attributes/RestExtension.cs similarity index 100% rename from src/Umbraco.Web/umbracobase/attributes/RestExtension.cs rename to src/Umbraco.Web/umbraco.presentation/umbracobase/attributes/RestExtension.cs diff --git a/src/Umbraco.Web/umbracobase/attributes/RestExtensionMethod.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/attributes/RestExtensionMethod.cs similarity index 100% rename from src/Umbraco.Web/umbracobase/attributes/RestExtensionMethod.cs rename to src/Umbraco.Web/umbraco.presentation/umbracobase/attributes/RestExtensionMethod.cs diff --git a/src/Umbraco.Web/umbracobase/baseHttpModule.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs similarity index 100% rename from src/Umbraco.Web/umbracobase/baseHttpModule.cs rename to src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs diff --git a/src/Umbraco.Web/umbracobase/baseLibrary.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs similarity index 100% rename from src/Umbraco.Web/umbracobase/baseLibrary.cs rename to src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs diff --git a/src/Umbraco.Web/umbracobase/restExtension.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs similarity index 100% rename from src/Umbraco.Web/umbracobase/restExtension.cs rename to src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs diff --git a/src/Umbraco.Web/viewstateMoverModule.cs b/src/Umbraco.Web/umbraco.presentation/viewstateMoverModule.cs similarity index 100% rename from src/Umbraco.Web/viewstateMoverModule.cs rename to src/Umbraco.Web/umbraco.presentation/viewstateMoverModule.cs diff --git a/src/Umbraco.Web/umbraco/webservices/tagService.asmx b/src/Umbraco.Web/umbraco/webservices/tagService.asmx deleted file mode 100644 index c83c8c7a5c..0000000000 --- a/src/Umbraco.Web/umbraco/webservices/tagService.asmx +++ /dev/null @@ -1 +0,0 @@ -<%@ WebService Language="C#" CodeBehind="tagService.asmx.cs" Class="umbracoTags.webservice.tagService" %> diff --git a/src/Umbraco.Web/umbraco/webservices/ultimatePickerAutoSuggest.asmx b/src/Umbraco.Web/umbraco/webservices/ultimatePickerAutoSuggest.asmx deleted file mode 100644 index 0d8a23409d..0000000000 --- a/src/Umbraco.Web/umbraco/webservices/ultimatePickerAutoSuggest.asmx +++ /dev/null @@ -1 +0,0 @@ -<%@ WebService Language="C#" CodeBehind="ultimatePickerAutoSuggest.asmx.cs" Class="umbraco.presentation.umbraco.webservices.ultimatePickerAutoSuggest" %> diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index 3ce0102767..5120e38326 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -156,9 +156,8 @@ - xcopy "$(TargetPath)" "$(ProjectDir)..\Umbraco.Web.UI\bin\" /Y /F - - + + - xcopy "$(TargetPath)" "$(ProjectDir)..\Umbraco.Web.UI\bin\" /Y /F -xcopy "$(ProjectDir)*.asmx" "$(ProjectDir)..\Umbraco.Web.UI\umbraco\webservices\api\" /Y /F + + \ No newline at end of file