diff --git a/src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx b/src/Umbraco.Web.UI/Umbraco/ClientRedirect.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx
rename to src/Umbraco.Web.UI/Umbraco/ClientRedirect.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/Create.aspx.cs b/src/Umbraco.Web.UI/Umbraco/Create.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Create.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/Create.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
rename to src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Web.config b/src/Umbraco.Web.UI/Umbraco/Install/Views/Web.config
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
rename to src/Umbraco.Web.UI/Umbraco/Install/Views/Web.config
diff --git a/src/Umbraco.Web.UI/umbraco/Logout.aspx b/src/Umbraco.Web.UI/Umbraco/Logout.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Logout.aspx
rename to src/Umbraco.Web.UI/Umbraco/Logout.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.cs b/src/Umbraco.Web.UI/Umbraco/TreeInit.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/TreeInit.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/TreeInit.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/TreeInit.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/TreeInit.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
rename to src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml b/src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
rename to src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/Umbraco/config/create/UI.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/create/UI.xml
rename to src/Umbraco.Web.UI/Umbraco/config/create/UI.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/da.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/de.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/en.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/es.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/he.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/it.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
rename to src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
diff --git a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs b/src/Umbraco.Web.UI/Umbraco/controls/PasswordChanger.ascx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
rename to src/Umbraco.Web.UI/Umbraco/controls/PasswordChanger.ascx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs b/src/Umbraco.Web.UI/Umbraco/controls/PasswordChanger.ascx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/controls/PasswordChanger.ascx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/CustomTreeService.asmx b/src/Umbraco.Web.UI/Umbraco/controls/Tree/CustomTreeService.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/controls/Tree/CustomTreeService.asmx
rename to src/Umbraco.Web.UI/Umbraco/controls/Tree/CustomTreeService.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/Umbraco/controls/Tree/TreeControl.ascx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
rename to src/Umbraco.Web.UI/Umbraco/controls/Tree/TreeControl.ascx
diff --git a/src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx b/src/Umbraco.Web.UI/Umbraco/controls/passwordChanger.ascx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
rename to src/Umbraco.Web.UI/Umbraco/controls/passwordChanger.ascx
diff --git a/src/Umbraco.Web.UI/umbraco/create.aspx b/src/Umbraco.Web.UI/Umbraco/create.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/create.aspx
rename to src/Umbraco.Web.UI/Umbraco/create.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/create/simple.ascx b/src/Umbraco.Web.UI/Umbraco/create/simple.ascx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/create/simple.ascx
rename to src/Umbraco.Web.UI/Umbraco/create/simple.ascx
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx b/src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx
rename to src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
rename to src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx b/src/Umbraco.Web.UI/Umbraco/developer/Packages/directoryBrowser.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
rename to src/Umbraco.Web.UI/Umbraco/developer/Packages/directoryBrowser.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/Umbraco/developer/Packages/editPackage.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
rename to src/Umbraco.Web.UI/Umbraco/developer/Packages/editPackage.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/Bidirectional.png b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/Bidirectional.png
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/Bidirectional.png
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/Bidirectional.png
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/ParentToChild.png b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/ParentToChild.png
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/ParentToChild.png
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/ParentToChild.png
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/Refresh.gif b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/Refresh.gif
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/Images/Refresh.gif
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/Images/Refresh.gif
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/NewRelationType.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/NewRelationType.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/RelationTypesWebService.asmx b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/RelationTypesWebService.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/RelationTypesWebService.asmx
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/RelationTypesWebService.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js b/src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js
rename to src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/AssignDomain2.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/AssignDomain2.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs b/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/Preview.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/Preview.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/SendPublish.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/SendPublish.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/Sort.aspx.cs b/src/Umbraco.Web.UI/Umbraco/dialogs/Sort.aspx.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/Sort.aspx.cs
rename to src/Umbraco.Web.UI/Umbraco/dialogs/Sort.aspx.cs
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/Sort.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/dialogs/Sort.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/Sort.aspx.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/dialogs/Sort.aspx.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/about.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/about.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/about.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/about.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/create.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/create.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/cruds.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/cruds.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/empty.htm b/src/Umbraco.Web.UI/Umbraco/dialogs/empty.htm
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/empty.htm
rename to src/Umbraco.Web.UI/Umbraco/dialogs/empty.htm
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/exportDocumenttype.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/exportDocumenttype.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/importDocumenttype.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/importDocumenttype.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/insertMacro.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/insertMacro.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/insertMasterpageContent.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/insertMasterpageContent.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/insertMasterpagePlaceholder.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/insertMasterpagePlaceholder.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/mediaPicker.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/mediaPicker.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/notifications.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/notifications.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/republish.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/republish.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/sendToTranslation.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/sendToTranslation.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/sort.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/sort.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/treePicker.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/treePicker.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/umbracoField.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/umbracoField.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/uploadImage.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/uploadImage.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/uploadImage.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/uploadImage.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/viewAuditTrail.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
rename to src/Umbraco.Web.UI/Umbraco/dialogs/viewAuditTrail.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/endPreview.aspx b/src/Umbraco.Web.UI/Umbraco/endPreview.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/endPreview.aspx
rename to src/Umbraco.Web.UI/Umbraco/endPreview.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/js/UmbracoSpeechBubbleBackEnd.js b/src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/js/UmbracoSpeechBubbleBackEnd.js
rename to src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js
diff --git a/src/Umbraco.Web.UI/umbraco/js/dualSelectBox.js b/src/Umbraco.Web.UI/Umbraco/js/dualSelectBox.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/js/dualSelectBox.js
rename to src/Umbraco.Web.UI/Umbraco/js/dualSelectBox.js
diff --git a/src/Umbraco.Web.UI/umbraco/js/guiFunctions.js b/src/Umbraco.Web.UI/Umbraco/js/guiFunctions.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/js/guiFunctions.js
rename to src/Umbraco.Web.UI/Umbraco/js/guiFunctions.js
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js b/src/Umbraco.Web.UI/Umbraco/js/umbracoCheckKeys.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js
rename to src/Umbraco.Web.UI/Umbraco/js/umbracoCheckKeys.js
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/Default.Master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/Default.Master.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/Default.Master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/Default.Master.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
rename to src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/default.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/default.Master
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/default.Master
rename to src/Umbraco.Web.UI/Umbraco/masterpages/default.Master
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
rename to src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
rename to src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master
diff --git a/src/Umbraco.Web.UI/umbraco/ping.aspx b/src/Umbraco.Web.UI/Umbraco/ping.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/ping.aspx
rename to src/Umbraco.Web.UI/Umbraco/ping.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx b/src/Umbraco.Web.UI/Umbraco/settings/DictionaryItemList.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx
rename to src/Umbraco.Web.UI/Umbraco/settings/DictionaryItemList.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx b/src/Umbraco.Web.UI/Umbraco/settings/EditDictionaryItem.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx
rename to src/Umbraco.Web.UI/Umbraco/settings/EditDictionaryItem.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/translation/default.aspx b/src/Umbraco.Web.UI/Umbraco/translation/default.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/translation/default.aspx
rename to src/Umbraco.Web.UI/Umbraco/translation/default.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/translation/details.aspx b/src/Umbraco.Web.UI/Umbraco/translation/details.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/translation/details.aspx
rename to src/Umbraco.Web.UI/Umbraco/translation/details.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/translation/preview.aspx b/src/Umbraco.Web.UI/Umbraco/translation/preview.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/translation/preview.aspx
rename to src/Umbraco.Web.UI/Umbraco/translation/preview.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/translation/translationTasks.dtd b/src/Umbraco.Web.UI/Umbraco/translation/translationTasks.dtd
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/translation/translationTasks.dtd
rename to src/Umbraco.Web.UI/Umbraco/translation/translationTasks.dtd
diff --git a/src/Umbraco.Web.UI/umbraco/translation/xml.aspx b/src/Umbraco.Web.UI/Umbraco/translation/xml.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/translation/xml.aspx
rename to src/Umbraco.Web.UI/Umbraco/translation/xml.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/treeInit.aspx b/src/Umbraco.Web.UI/Umbraco/treeInit.aspx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/treeInit.aspx
rename to src/Umbraco.Web.UI/Umbraco/treeInit.aspx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/CheckForUpgrade.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/CheckForUpgrade.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/CheckForUpgrade.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/CheckForUpgrade.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/Developer.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/Developer.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/Developer.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/Developer.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/ajax.js b/src/Umbraco.Web.UI/Umbraco/webservices/ajax.js
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/ajax.js
rename to src/Umbraco.Web.UI/Umbraco/webservices/ajax.js
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/codeEditorSave.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/codeEditorSave.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/codeEditorSave.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/codeEditorSave.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/legacyAjaxCalls.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/legacyAjaxCalls.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/legacyAjaxCalls.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/legacyAjaxCalls.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/nodeSorter.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/nodeSorter.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/nodeSorter.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/nodeSorter.asmx
diff --git a/src/Umbraco.Web.UI/umbraco/webservices/templates.asmx b/src/Umbraco.Web.UI/Umbraco/webservices/templates.asmx
similarity index 100%
rename from src/Umbraco.Web.UI/umbraco/webservices/templates.asmx
rename to src/Umbraco.Web.UI/Umbraco/webservices/templates.asmx