diff --git a/code/batchactions/CMSBatchActions.php b/code/BatchActions/CMSBatchActions.php
similarity index 100%
rename from code/batchactions/CMSBatchActions.php
rename to code/BatchActions/CMSBatchActions.php
diff --git a/code/controllers/AssetAdmin.php b/code/Controllers/AssetAdmin.php
similarity index 100%
rename from code/controllers/AssetAdmin.php
rename to code/Controllers/AssetAdmin.php
diff --git a/code/controllers/CMSMain.php b/code/Controllers/CMSMain.php
similarity index 100%
rename from code/controllers/CMSMain.php
rename to code/Controllers/CMSMain.php
diff --git a/code/controllers/CMSPageAddController.php b/code/Controllers/CMSPageAddController.php
similarity index 100%
rename from code/controllers/CMSPageAddController.php
rename to code/Controllers/CMSPageAddController.php
diff --git a/code/controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php
similarity index 100%
rename from code/controllers/CMSPageEditController.php
rename to code/Controllers/CMSPageEditController.php
diff --git a/code/controllers/CMSPageHistoryController.php b/code/Controllers/CMSPageHistoryController.php
similarity index 100%
rename from code/controllers/CMSPageHistoryController.php
rename to code/Controllers/CMSPageHistoryController.php
diff --git a/code/controllers/CMSPageSettingsController.php b/code/Controllers/CMSPageSettingsController.php
similarity index 100%
rename from code/controllers/CMSPageSettingsController.php
rename to code/Controllers/CMSPageSettingsController.php
diff --git a/code/controllers/CMSPagesController.php b/code/Controllers/CMSPagesController.php
similarity index 100%
rename from code/controllers/CMSPagesController.php
rename to code/Controllers/CMSPagesController.php
diff --git a/code/controllers/CMSSettingsController.php b/code/Controllers/CMSSettingsController.php
similarity index 100%
rename from code/controllers/CMSSettingsController.php
rename to code/Controllers/CMSSettingsController.php
diff --git a/code/controllers/CMSSiteTreeFilter.php b/code/Controllers/CMSSiteTreeFilter.php
similarity index 100%
rename from code/controllers/CMSSiteTreeFilter.php
rename to code/Controllers/CMSSiteTreeFilter.php
diff --git a/code/controllers/ContentController.php b/code/Controllers/ContentController.php
similarity index 100%
rename from code/controllers/ContentController.php
rename to code/Controllers/ContentController.php
diff --git a/code/controllers/ErrorPageControllerExtension.php b/code/Controllers/ErrorPageControllerExtension.php
similarity index 100%
rename from code/controllers/ErrorPageControllerExtension.php
rename to code/Controllers/ErrorPageControllerExtension.php
diff --git a/code/controllers/ErrorPageFileExtension.php b/code/Controllers/ErrorPageFileExtension.php
similarity index 100%
rename from code/controllers/ErrorPageFileExtension.php
rename to code/Controllers/ErrorPageFileExtension.php
diff --git a/code/controllers/LeftAndMainPageIconsExtension.php b/code/Controllers/LeftAndMainPageIconsExtension.php
similarity index 100%
rename from code/controllers/LeftAndMainPageIconsExtension.php
rename to code/Controllers/LeftAndMainPageIconsExtension.php
diff --git a/code/controllers/ModelAsController.php b/code/Controllers/ModelAsController.php
similarity index 100%
rename from code/controllers/ModelAsController.php
rename to code/Controllers/ModelAsController.php
diff --git a/code/controllers/OldPageRedirector.php b/code/Controllers/OldPageRedirector.php
similarity index 100%
rename from code/controllers/OldPageRedirector.php
rename to code/Controllers/OldPageRedirector.php
diff --git a/code/controllers/RootURLController.php b/code/Controllers/RootURLController.php
similarity index 100%
rename from code/controllers/RootURLController.php
rename to code/Controllers/RootURLController.php
diff --git a/code/controllers/SilverStripeNavigator.php b/code/Controllers/SilverStripeNavigator.php
similarity index 100%
rename from code/controllers/SilverStripeNavigator.php
rename to code/Controllers/SilverStripeNavigator.php
diff --git a/code/forms/SiteTreeURLSegmentField.php b/code/Forms/SiteTreeURLSegmentField.php
similarity index 100%
rename from code/forms/SiteTreeURLSegmentField.php
rename to code/Forms/SiteTreeURLSegmentField.php
diff --git a/code/logging/ErrorPageErrorFormatter.php b/code/Logging/ErrorPageErrorFormatter.php
similarity index 100%
rename from code/logging/ErrorPageErrorFormatter.php
rename to code/Logging/ErrorPageErrorFormatter.php
diff --git a/code/model/CurrentPageIdentifier.php b/code/Model/CurrentPageIdentifier.php
similarity index 100%
rename from code/model/CurrentPageIdentifier.php
rename to code/Model/CurrentPageIdentifier.php
diff --git a/code/model/ErrorPage.php b/code/Model/ErrorPage.php
similarity index 100%
rename from code/model/ErrorPage.php
rename to code/Model/ErrorPage.php
diff --git a/code/model/RedirectorPage.php b/code/Model/RedirectorPage.php
similarity index 100%
rename from code/model/RedirectorPage.php
rename to code/Model/RedirectorPage.php
diff --git a/code/model/SiteTree.php b/code/Model/SiteTree.php
similarity index 100%
rename from code/model/SiteTree.php
rename to code/Model/SiteTree.php
diff --git a/code/model/SiteTreeExtension.php b/code/Model/SiteTreeExtension.php
similarity index 100%
rename from code/model/SiteTreeExtension.php
rename to code/Model/SiteTreeExtension.php
diff --git a/code/model/SiteTreeFileExtension.php b/code/Model/SiteTreeFileExtension.php
similarity index 100%
rename from code/model/SiteTreeFileExtension.php
rename to code/Model/SiteTreeFileExtension.php
diff --git a/code/model/SiteTreeFolderExtension.php b/code/Model/SiteTreeFolderExtension.php
similarity index 100%
rename from code/model/SiteTreeFolderExtension.php
rename to code/Model/SiteTreeFolderExtension.php
diff --git a/code/model/SiteTreeLinkTracking.php b/code/Model/SiteTreeLinkTracking.php
similarity index 100%
rename from code/model/SiteTreeLinkTracking.php
rename to code/Model/SiteTreeLinkTracking.php
diff --git a/code/model/VirtualPage.php b/code/Model/VirtualPage.php
similarity index 100%
rename from code/model/VirtualPage.php
rename to code/Model/VirtualPage.php
diff --git a/code/reports/BrokenFilesReport.php b/code/Reports/BrokenFilesReport.php
similarity index 100%
rename from code/reports/BrokenFilesReport.php
rename to code/Reports/BrokenFilesReport.php
diff --git a/code/reports/BrokenLinksReport.php b/code/Reports/BrokenLinksReport.php
similarity index 100%
rename from code/reports/BrokenLinksReport.php
rename to code/Reports/BrokenLinksReport.php
diff --git a/code/reports/BrokenRedirectorPagesReport.php b/code/Reports/BrokenRedirectorPagesReport.php
similarity index 100%
rename from code/reports/BrokenRedirectorPagesReport.php
rename to code/Reports/BrokenRedirectorPagesReport.php
diff --git a/code/reports/BrokenVirtualPagesReport.php b/code/Reports/BrokenVirtualPagesReport.php
similarity index 100%
rename from code/reports/BrokenVirtualPagesReport.php
rename to code/Reports/BrokenVirtualPagesReport.php
diff --git a/code/reports/EmptyPagesReport.php b/code/Reports/EmptyPagesReport.php
similarity index 100%
rename from code/reports/EmptyPagesReport.php
rename to code/Reports/EmptyPagesReport.php
diff --git a/code/reports/RecentlyEditedReport.php b/code/Reports/RecentlyEditedReport.php
similarity index 100%
rename from code/reports/RecentlyEditedReport.php
rename to code/Reports/RecentlyEditedReport.php
diff --git a/code/search/ContentControllerSearchExtension.php b/code/Search/ContentControllerSearchExtension.php
similarity index 100%
rename from code/search/ContentControllerSearchExtension.php
rename to code/Search/ContentControllerSearchExtension.php
diff --git a/code/search/SearchForm.php b/code/Search/SearchForm.php
similarity index 100%
rename from code/search/SearchForm.php
rename to code/Search/SearchForm.php
diff --git a/tasks/MigrateSiteTreeLinkingTask.php b/code/Tasks/MigrateSiteTreeLinkingTask.php
similarity index 100%
rename from tasks/MigrateSiteTreeLinkingTask.php
rename to code/Tasks/MigrateSiteTreeLinkingTask.php
diff --git a/tasks/RemoveOrphanedPagesTask.php b/code/Tasks/RemoveOrphanedPagesTask.php
similarity index 100%
rename from tasks/RemoveOrphanedPagesTask.php
rename to code/Tasks/RemoveOrphanedPagesTask.php
diff --git a/tasks/SiteTreeMaintenanceTask.php b/code/Tasks/SiteTreeMaintenanceTask.php
similarity index 100%
rename from tasks/SiteTreeMaintenanceTask.php
rename to code/Tasks/SiteTreeMaintenanceTask.php
diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/SilverStripe/CMS/Controllers/AssetAdmin_Content.ss
similarity index 100%
rename from templates/Includes/AssetAdmin_Content.ss
rename to templates/SilverStripe/CMS/Controllers/AssetAdmin_Content.ss
diff --git a/templates/Includes/AssetAdmin_EditForm.ss b/templates/SilverStripe/CMS/Controllers/AssetAdmin_EditForm.ss
similarity index 100%
rename from templates/Includes/AssetAdmin_EditForm.ss
rename to templates/SilverStripe/CMS/Controllers/AssetAdmin_EditForm.ss
diff --git a/templates/Includes/AssetAdmin_Tools.ss b/templates/SilverStripe/CMS/Controllers/AssetAdmin_Tools.ss
similarity index 100%
rename from templates/Includes/AssetAdmin_Tools.ss
rename to templates/SilverStripe/CMS/Controllers/AssetAdmin_Tools.ss
diff --git a/templates/Includes/AssetAdmin_UploadContent.ss b/templates/SilverStripe/CMS/Controllers/AssetAdmin_UploadContent.ss
similarity index 100%
rename from templates/Includes/AssetAdmin_UploadContent.ss
rename to templates/SilverStripe/CMS/Controllers/AssetAdmin_UploadContent.ss
diff --git a/templates/Includes/CMSMain_Content.ss b/templates/SilverStripe/CMS/Controllers/CMSMain_Content.ss
similarity index 100%
rename from templates/Includes/CMSMain_Content.ss
rename to templates/SilverStripe/CMS/Controllers/CMSMain_Content.ss
diff --git a/templates/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/CMSMain_EditForm.ss
similarity index 100%
rename from templates/Includes/CMSMain_EditForm.ss
rename to templates/SilverStripe/CMS/Controllers/CMSMain_EditForm.ss
diff --git a/templates/Includes/CMSMain_ListView.ss b/templates/SilverStripe/CMS/Controllers/CMSMain_ListView.ss
similarity index 88%
rename from templates/Includes/CMSMain_ListView.ss
rename to templates/SilverStripe/CMS/Controllers/CMSMain_ListView.ss
index 94ca14f8..e9c6f3a7 100644
--- a/templates/Includes/CMSMain_ListView.ss
+++ b/templates/SilverStripe/CMS/Controllers/CMSMain_ListView.ss
@@ -1,4 +1,4 @@
-<% include CMSPagesController_ContentToolActions %>
+<% include SilverStripe\CMS\Controllers\CMSPagesController_ContentToolActions %>
 
 <div class="ss-dialog cms-page-add-form-dialog cms-dialog-content" id="cms-page-add-form" title="<% _t('CMSMain.AddNew', 'Add new page') %>">
 	$AddForm
@@ -14,7 +14,7 @@
 
 		<div class="cms-list" data-url-list="$Link(getListViewHTML)">
 			$ListViewForm
-	</div>
+		</div>
 	</div>
 	<% else %>
 
diff --git a/templates/Includes/CMSMain_Tools.ss b/templates/SilverStripe/CMS/Controllers/CMSMain_Tools.ss
similarity index 100%
rename from templates/Includes/CMSMain_Tools.ss
rename to templates/SilverStripe/CMS/Controllers/CMSMain_Tools.ss
diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/SilverStripe/CMS/Controllers/CMSMain_TreeView.ss
similarity index 95%
rename from templates/Includes/CMSMain_TreeView.ss
rename to templates/SilverStripe/CMS/Controllers/CMSMain_TreeView.ss
index 17a3bb4c..c9eca6dd 100644
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/SilverStripe/CMS/Controllers/CMSMain_TreeView.ss
@@ -1,4 +1,4 @@
-<% include CMSPagesController_ContentToolActions View='Tree' %>
+<% include SilverStripe\CMS\Controllers\CMSPagesController_ContentToolActions View='Tree' %>
 
 <div class="ss-dialog cms-page-add-form-dialog cms-dialog-content" id="cms-page-add-form" title="<% _t('CMSMain.AddNew', 'Add new page') %>">
 	$AddForm
diff --git a/templates/Includes/CMSPageAddController_Content.ss b/templates/SilverStripe/CMS/Controllers/CMSPageAddController_Content.ss
similarity index 100%
rename from templates/Includes/CMSPageAddController_Content.ss
rename to templates/SilverStripe/CMS/Controllers/CMSPageAddController_Content.ss
diff --git a/templates/Includes/CMSPageHistoryController_Tools.ss b/templates/SilverStripe/CMS/Controllers/CMSPageHistoryController_Tools.ss
similarity index 100%
rename from templates/Includes/CMSPageHistoryController_Tools.ss
rename to templates/SilverStripe/CMS/Controllers/CMSPageHistoryController_Tools.ss
diff --git a/templates/CMSPageHistoryController_versions.ss b/templates/SilverStripe/CMS/Controllers/CMSPageHistoryController_versions.ss
similarity index 100%
rename from templates/CMSPageHistoryController_versions.ss
rename to templates/SilverStripe/CMS/Controllers/CMSPageHistoryController_versions.ss
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/SilverStripe/CMS/Controllers/CMSPagesController_Content.ss
similarity index 100%
rename from templates/Includes/CMSPagesController_Content.ss
rename to templates/SilverStripe/CMS/Controllers/CMSPagesController_Content.ss
diff --git a/templates/Includes/CMSPagesController_Tools.ss b/templates/SilverStripe/CMS/Controllers/CMSPagesController_Tools.ss
similarity index 100%
rename from templates/Includes/CMSPagesController_Tools.ss
rename to templates/SilverStripe/CMS/Controllers/CMSPagesController_Tools.ss
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss
similarity index 100%
rename from templates/Includes/CMSPagesController_ContentToolActions.ss
rename to templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss
diff --git a/templates/forms/SiteTreeURLSegmentField.ss b/templates/forms/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss
similarity index 57%
rename from templates/forms/SiteTreeURLSegmentField.ss
rename to templates/forms/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss
index a88afe11..26eba8b1 100644
--- a/templates/forms/SiteTreeURLSegmentField.ss
+++ b/templates/forms/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss
@@ -3,17 +3,17 @@
 		$URL
 	</a>
 	<% if not $IsReadonly %>
-		<button type="button" class="btn btn-secondary-outline btn-sm edit">
+		<button role="button" type="button" class="btn ui-button-text-only ss-ui-button edit">
 			<% _t('URLSegmentField.Edit', 'Edit') %>
 		</button>
 	<% end_if %>
 </div>
 <div class="edit-holder">
 	<input $AttributesHTML />
-	<button type="button" class="btn btn-primary update">
+	<button role="button" data-icon="accept" type="button" class="btn ui-button-text-icon-primary ss-ui-button update">
 		<% _t('URLSegmentField.OK', 'OK') %>
 	</button>
-	<button type="button" class="btn btn-secondary cancel">
+	<button role="button" data-icon="cancel" type="button" class="btn ui-button-text-icon-secondary ss-ui-button cancel">
 		<% _t('URLSegmentField.Cancel', 'Cancel') %>
 	</button>
 	<% if $HelpText %><p class="form__field-description">$HelpText</p><% end_if %>