diff --git a/images/add-bg-hover.png b/client/dist/images/add-bg-hover.png
similarity index 100%
rename from images/add-bg-hover.png
rename to client/dist/images/add-bg-hover.png
diff --git a/images/add-bg.png b/client/dist/images/add-bg.png
similarity index 100%
rename from images/add-bg.png
rename to client/dist/images/add-bg.png
diff --git a/images/add.gif b/client/dist/images/add.gif
similarity index 100%
rename from images/add.gif
rename to client/dist/images/add.gif
diff --git a/images/arrow_refresh.gif b/client/dist/images/arrow_refresh.gif
similarity index 100%
rename from images/arrow_refresh.gif
rename to client/dist/images/arrow_refresh.gif
diff --git a/images/blue-folder-horizontal.png b/client/dist/images/blue-folder-horizontal.png
similarity index 100%
rename from images/blue-folder-horizontal.png
rename to client/dist/images/blue-folder-horizontal.png
diff --git a/images/bullet_arrow_down.png b/client/dist/images/bullet_arrow_down.png
similarity index 100%
rename from images/bullet_arrow_down.png
rename to client/dist/images/bullet_arrow_down.png
diff --git a/images/bullet_arrow_up.png b/client/dist/images/bullet_arrow_up.png
similarity index 100%
rename from images/bullet_arrow_up.png
rename to client/dist/images/bullet_arrow_up.png
diff --git a/images/check.png b/client/dist/images/check.png
similarity index 100%
rename from images/check.png
rename to client/dist/images/check.png
diff --git a/images/closeicon.gif b/client/dist/images/closeicon.gif
similarity index 100%
rename from images/closeicon.gif
rename to client/dist/images/closeicon.gif
diff --git a/images/content-header-tabs-sprite.png b/client/dist/images/content-header-tabs-sprite.png
similarity index 100%
rename from images/content-header-tabs-sprite.png
rename to client/dist/images/content-header-tabs-sprite.png
diff --git a/images/delete-small.gif b/client/dist/images/delete-small.gif
similarity index 100%
rename from images/delete-small.gif
rename to client/dist/images/delete-small.gif
diff --git a/images/delete.gif b/client/dist/images/delete.gif
similarity index 100%
rename from images/delete.gif
rename to client/dist/images/delete.gif
diff --git a/images/delete_disabled.gif b/client/dist/images/delete_disabled.gif
similarity index 100%
rename from images/delete_disabled.gif
rename to client/dist/images/delete_disabled.gif
diff --git a/images/dialogs/alert.gif b/client/dist/images/dialogs/alert.gif
similarity index 100%
rename from images/dialogs/alert.gif
rename to client/dist/images/dialogs/alert.gif
diff --git a/images/dialogs/alert.png b/client/dist/images/dialogs/alert.png
similarity index 100%
rename from images/dialogs/alert.png
rename to client/dist/images/dialogs/alert.png
diff --git a/images/down.gif b/client/dist/images/down.gif
similarity index 100%
rename from images/down.gif
rename to client/dist/images/down.gif
diff --git a/images/edit.gif b/client/dist/images/edit.gif
similarity index 100%
rename from images/edit.gif
rename to client/dist/images/edit.gif
diff --git a/images/edit_disabled.gif b/client/dist/images/edit_disabled.gif
similarity index 100%
rename from images/edit_disabled.gif
rename to client/dist/images/edit_disabled.gif
diff --git a/images/flash_large.jpg b/client/dist/images/flash_large.jpg
similarity index 100%
rename from images/flash_large.jpg
rename to client/dist/images/flash_large.jpg
diff --git a/images/flash_small.jpg b/client/dist/images/flash_small.jpg
similarity index 100%
rename from images/flash_small.jpg
rename to client/dist/images/flash_small.jpg
diff --git a/images/handled-bg.png b/client/dist/images/handled-bg.png
similarity index 100%
rename from images/handled-bg.png
rename to client/dist/images/handled-bg.png
diff --git a/images/loading.gif b/client/dist/images/loading.gif
similarity index 100%
rename from images/loading.gif
rename to client/dist/images/loading.gif
diff --git a/images/locked.gif b/client/dist/images/locked.gif
similarity index 100%
rename from images/locked.gif
rename to client/dist/images/locked.gif
diff --git a/images/network-save-bw.gif b/client/dist/images/network-save-bw.gif
similarity index 100%
rename from images/network-save-bw.gif
rename to client/dist/images/network-save-bw.gif
diff --git a/images/network-save.gif b/client/dist/images/network-save.gif
similarity index 100%
rename from images/network-save.gif
rename to client/dist/images/network-save.gif
diff --git a/images/pagination/record-export.png b/client/dist/images/pagination/record-export.png
similarity index 100%
rename from images/pagination/record-export.png
rename to client/dist/images/pagination/record-export.png
diff --git a/images/pagination/record-first-g.png b/client/dist/images/pagination/record-first-g.png
similarity index 100%
rename from images/pagination/record-first-g.png
rename to client/dist/images/pagination/record-first-g.png
diff --git a/images/pagination/record-first.png b/client/dist/images/pagination/record-first.png
similarity index 100%
rename from images/pagination/record-first.png
rename to client/dist/images/pagination/record-first.png
diff --git a/images/pagination/record-last-g.png b/client/dist/images/pagination/record-last-g.png
similarity index 100%
rename from images/pagination/record-last-g.png
rename to client/dist/images/pagination/record-last-g.png
diff --git a/images/pagination/record-last.png b/client/dist/images/pagination/record-last.png
similarity index 100%
rename from images/pagination/record-last.png
rename to client/dist/images/pagination/record-last.png
diff --git a/images/pagination/record-next-g.png b/client/dist/images/pagination/record-next-g.png
similarity index 100%
rename from images/pagination/record-next-g.png
rename to client/dist/images/pagination/record-next-g.png
diff --git a/images/pagination/record-next.png b/client/dist/images/pagination/record-next.png
similarity index 100%
rename from images/pagination/record-next.png
rename to client/dist/images/pagination/record-next.png
diff --git a/images/pagination/record-prev-g.png b/client/dist/images/pagination/record-prev-g.png
similarity index 100%
rename from images/pagination/record-prev-g.png
rename to client/dist/images/pagination/record-prev-g.png
diff --git a/images/pagination/record-prev.png b/client/dist/images/pagination/record-prev.png
similarity index 100%
rename from images/pagination/record-prev.png
rename to client/dist/images/pagination/record-prev.png
diff --git a/images/pagination/record-print.png b/client/dist/images/pagination/record-print.png
similarity index 100%
rename from images/pagination/record-print.png
rename to client/dist/images/pagination/record-print.png
diff --git a/images/right.gif b/client/dist/images/right.gif
similarity index 100%
rename from images/right.gif
rename to client/dist/images/right.gif
diff --git a/images/show.png b/client/dist/images/show.png
similarity index 100%
rename from images/show.png
rename to client/dist/images/show.png
diff --git a/images/show_disabled.png b/client/dist/images/show_disabled.png
similarity index 100%
rename from images/show_disabled.png
rename to client/dist/images/show_disabled.png
diff --git a/images/swf-upload-button-small.jpg b/client/dist/images/swf-upload-button-small.jpg
similarity index 100%
rename from images/swf-upload-button-small.jpg
rename to client/dist/images/swf-upload-button-small.jpg
diff --git a/images/tables/checkbox.png b/client/dist/images/tables/checkbox.png
similarity index 100%
rename from images/tables/checkbox.png
rename to client/dist/images/tables/checkbox.png
diff --git a/images/tables/thead.png b/client/dist/images/tables/thead.png
similarity index 100%
rename from images/tables/thead.png
rename to client/dist/images/tables/thead.png
diff --git a/images/tickbox-canttick.gif b/client/dist/images/tickbox-canttick.gif
similarity index 100%
rename from images/tickbox-canttick.gif
rename to client/dist/images/tickbox-canttick.gif
diff --git a/images/tickbox-fail.gif b/client/dist/images/tickbox-fail.gif
similarity index 100%
rename from images/tickbox-fail.gif
rename to client/dist/images/tickbox-fail.gif
diff --git a/images/tickbox-greyedout.gif b/client/dist/images/tickbox-greyedout.gif
similarity index 100%
rename from images/tickbox-greyedout.gif
rename to client/dist/images/tickbox-greyedout.gif
diff --git a/images/tickbox-greyticked.gif b/client/dist/images/tickbox-greyticked.gif
similarity index 100%
rename from images/tickbox-greyticked.gif
rename to client/dist/images/tickbox-greyticked.gif
diff --git a/images/tickbox-ticked.gif b/client/dist/images/tickbox-ticked.gif
similarity index 100%
rename from images/tickbox-ticked.gif
rename to client/dist/images/tickbox-ticked.gif
diff --git a/images/tickbox-unticked.gif b/client/dist/images/tickbox-unticked.gif
similarity index 100%
rename from images/tickbox-unticked.gif
rename to client/dist/images/tickbox-unticked.gif
diff --git a/images/treeicons/blue-document.png b/client/dist/images/treeicons/blue-document.png
similarity index 100%
rename from images/treeicons/blue-document.png
rename to client/dist/images/treeicons/blue-document.png
diff --git a/images/treeicons/blue-folder-horizontal.png b/client/dist/images/treeicons/blue-folder-horizontal.png
similarity index 100%
rename from images/treeicons/blue-folder-horizontal.png
rename to client/dist/images/treeicons/blue-folder-horizontal.png
diff --git a/images/treeicons/book-closedfolder.gif b/client/dist/images/treeicons/book-closedfolder.gif
similarity index 100%
rename from images/treeicons/book-closedfolder.gif
rename to client/dist/images/treeicons/book-closedfolder.gif
diff --git a/images/treeicons/book-file.gif b/client/dist/images/treeicons/book-file.gif
similarity index 100%
rename from images/treeicons/book-file.gif
rename to client/dist/images/treeicons/book-file.gif
diff --git a/images/treeicons/book-openfolder.gif b/client/dist/images/treeicons/book-openfolder.gif
similarity index 100%
rename from images/treeicons/book-openfolder.gif
rename to client/dist/images/treeicons/book-openfolder.gif
diff --git a/images/treeicons/brokenlink-closedfolder.gif b/client/dist/images/treeicons/brokenlink-closedfolder.gif
similarity index 100%
rename from images/treeicons/brokenlink-closedfolder.gif
rename to client/dist/images/treeicons/brokenlink-closedfolder.gif
diff --git a/images/treeicons/brokenlink-file.gif b/client/dist/images/treeicons/brokenlink-file.gif
similarity index 100%
rename from images/treeicons/brokenlink-file.gif
rename to client/dist/images/treeicons/brokenlink-file.gif
diff --git a/images/treeicons/brokenlink-openfolder.gif b/client/dist/images/treeicons/brokenlink-openfolder.gif
similarity index 100%
rename from images/treeicons/brokenlink-openfolder.gif
rename to client/dist/images/treeicons/brokenlink-openfolder.gif
diff --git a/images/treeicons/draft-file.png b/client/dist/images/treeicons/draft-file.png
similarity index 100%
rename from images/treeicons/draft-file.png
rename to client/dist/images/treeicons/draft-file.png
diff --git a/images/treeicons/draft-folder.png b/client/dist/images/treeicons/draft-folder.png
similarity index 100%
rename from images/treeicons/draft-folder.png
rename to client/dist/images/treeicons/draft-folder.png
diff --git a/images/treeicons/element-closedfolder.gif b/client/dist/images/treeicons/element-closedfolder.gif
similarity index 100%
rename from images/treeicons/element-closedfolder.gif
rename to client/dist/images/treeicons/element-closedfolder.gif
diff --git a/images/treeicons/element-file.gif b/client/dist/images/treeicons/element-file.gif
similarity index 100%
rename from images/treeicons/element-file.gif
rename to client/dist/images/treeicons/element-file.gif
diff --git a/images/treeicons/element-openfolder.gif b/client/dist/images/treeicons/element-openfolder.gif
similarity index 100%
rename from images/treeicons/element-openfolder.gif
rename to client/dist/images/treeicons/element-openfolder.gif
diff --git a/images/treeicons/folder-closedfolder.gif b/client/dist/images/treeicons/folder-closedfolder.gif
similarity index 100%
rename from images/treeicons/folder-closedfolder.gif
rename to client/dist/images/treeicons/folder-closedfolder.gif
diff --git a/images/treeicons/folder-file.gif b/client/dist/images/treeicons/folder-file.gif
similarity index 100%
rename from images/treeicons/folder-file.gif
rename to client/dist/images/treeicons/folder-file.gif
diff --git a/images/treeicons/folder-openfolder.gif b/client/dist/images/treeicons/folder-openfolder.gif
similarity index 100%
rename from images/treeicons/folder-openfolder.gif
rename to client/dist/images/treeicons/folder-openfolder.gif
diff --git a/images/treeicons/home-file.png b/client/dist/images/treeicons/home-file.png
similarity index 100%
rename from images/treeicons/home-file.png
rename to client/dist/images/treeicons/home-file.png
diff --git a/images/treeicons/multi-user.gif b/client/dist/images/treeicons/multi-user.gif
similarity index 100%
rename from images/treeicons/multi-user.gif
rename to client/dist/images/treeicons/multi-user.gif
diff --git a/images/treeicons/multi-user.png b/client/dist/images/treeicons/multi-user.png
similarity index 100%
rename from images/treeicons/multi-user.png
rename to client/dist/images/treeicons/multi-user.png
diff --git a/images/treeicons/page-gold-closedfolder.gif b/client/dist/images/treeicons/page-gold-closedfolder.gif
similarity index 100%
rename from images/treeicons/page-gold-closedfolder.gif
rename to client/dist/images/treeicons/page-gold-closedfolder.gif
diff --git a/images/treeicons/page-gold-file.gif b/client/dist/images/treeicons/page-gold-file.gif
similarity index 100%
rename from images/treeicons/page-gold-file.gif
rename to client/dist/images/treeicons/page-gold-file.gif
diff --git a/images/treeicons/page-gold-openfolder.gif b/client/dist/images/treeicons/page-gold-openfolder.gif
similarity index 100%
rename from images/treeicons/page-gold-openfolder.gif
rename to client/dist/images/treeicons/page-gold-openfolder.gif
diff --git a/images/treeicons/page-shortcut-file.gif b/client/dist/images/treeicons/page-shortcut-file.gif
similarity index 100%
rename from images/treeicons/page-shortcut-file.gif
rename to client/dist/images/treeicons/page-shortcut-file.gif
diff --git a/images/treeicons/page-shortcut-gold-file.gif b/client/dist/images/treeicons/page-shortcut-gold-file.gif
similarity index 100%
rename from images/treeicons/page-shortcut-gold-file.gif
rename to client/dist/images/treeicons/page-shortcut-gold-file.gif
diff --git a/images/treeicons/preferences-closedfolder.gif b/client/dist/images/treeicons/preferences-closedfolder.gif
similarity index 100%
rename from images/treeicons/preferences-closedfolder.gif
rename to client/dist/images/treeicons/preferences-closedfolder.gif
diff --git a/images/treeicons/preferences-file.gif b/client/dist/images/treeicons/preferences-file.gif
similarity index 100%
rename from images/treeicons/preferences-file.gif
rename to client/dist/images/treeicons/preferences-file.gif
diff --git a/images/treeicons/preferences-openfolder.gif b/client/dist/images/treeicons/preferences-openfolder.gif
similarity index 100%
rename from images/treeicons/preferences-openfolder.gif
rename to client/dist/images/treeicons/preferences-openfolder.gif
diff --git a/images/treeicons/reports-file.png b/client/dist/images/treeicons/reports-file.png
similarity index 100%
rename from images/treeicons/reports-file.png
rename to client/dist/images/treeicons/reports-file.png
diff --git a/images/treeicons/reports-foldericon.png b/client/dist/images/treeicons/reports-foldericon.png
similarity index 100%
rename from images/treeicons/reports-foldericon.png
rename to client/dist/images/treeicons/reports-foldericon.png
diff --git a/images/treeicons/reports-openfoldericon.png b/client/dist/images/treeicons/reports-openfoldericon.png
similarity index 100%
rename from images/treeicons/reports-openfoldericon.png
rename to client/dist/images/treeicons/reports-openfoldericon.png
diff --git a/images/treeicons/root.png b/client/dist/images/treeicons/root.png
similarity index 100%
rename from images/treeicons/root.png
rename to client/dist/images/treeicons/root.png
diff --git a/images/treeicons/sent-file.gif b/client/dist/images/treeicons/sent-file.gif
similarity index 100%
rename from images/treeicons/sent-file.gif
rename to client/dist/images/treeicons/sent-file.gif
diff --git a/images/treeicons/sent-folder.png b/client/dist/images/treeicons/sent-folder.png
similarity index 100%
rename from images/treeicons/sent-folder.png
rename to client/dist/images/treeicons/sent-folder.png
diff --git a/images/treeicons/task-file.gif b/client/dist/images/treeicons/task-file.gif
similarity index 100%
rename from images/treeicons/task-file.gif
rename to client/dist/images/treeicons/task-file.gif
diff --git a/images/treeicons/user-file.gif b/client/dist/images/treeicons/user-file.gif
similarity index 100%
rename from images/treeicons/user-file.gif
rename to client/dist/images/treeicons/user-file.gif
diff --git a/images/unlocked.gif b/client/dist/images/unlocked.gif
similarity index 100%
rename from images/unlocked.gif
rename to client/dist/images/unlocked.gif
diff --git a/images/unlockedled.gif b/client/dist/images/unlockedled.gif
similarity index 100%
rename from images/unlockedled.gif
rename to client/dist/images/unlockedled.gif
diff --git a/images/widget-title-bg.gif b/client/dist/images/widget-title-bg.gif
similarity index 100%
rename from images/widget-title-bg.gif
rename to client/dist/images/widget-title-bg.gif
diff --git a/javascript/dist/AssetAdmin.js b/client/dist/js/AssetAdmin.js
similarity index 100%
rename from javascript/dist/AssetAdmin.js
rename to client/dist/js/AssetAdmin.js
diff --git a/javascript/dist/CMSMain.AddForm.js b/client/dist/js/CMSMain.AddForm.js
similarity index 100%
rename from javascript/dist/CMSMain.AddForm.js
rename to client/dist/js/CMSMain.AddForm.js
diff --git a/javascript/dist/CMSMain.EditForm.js b/client/dist/js/CMSMain.EditForm.js
similarity index 100%
rename from javascript/dist/CMSMain.EditForm.js
rename to client/dist/js/CMSMain.EditForm.js
diff --git a/javascript/dist/CMSMain.Tree.js b/client/dist/js/CMSMain.Tree.js
similarity index 100%
rename from javascript/dist/CMSMain.Tree.js
rename to client/dist/js/CMSMain.Tree.js
diff --git a/javascript/dist/CMSMain.js b/client/dist/js/CMSMain.js
similarity index 100%
rename from javascript/dist/CMSMain.js
rename to client/dist/js/CMSMain.js
diff --git a/javascript/dist/CMSPageHistoryController.js b/client/dist/js/CMSPageHistoryController.js
similarity index 100%
rename from javascript/dist/CMSPageHistoryController.js
rename to client/dist/js/CMSPageHistoryController.js
diff --git a/javascript/dist/RedirectorPage.js b/client/dist/js/RedirectorPage.js
similarity index 100%
rename from javascript/dist/RedirectorPage.js
rename to client/dist/js/RedirectorPage.js
diff --git a/javascript/dist/SilverStripeNavigator.js b/client/dist/js/SilverStripeNavigator.js
similarity index 100%
rename from javascript/dist/SilverStripeNavigator.js
rename to client/dist/js/SilverStripeNavigator.js
diff --git a/javascript/dist/SiteTreeURLSegmentField.js b/client/dist/js/SiteTreeURLSegmentField.js
similarity index 100%
rename from javascript/dist/SiteTreeURLSegmentField.js
rename to client/dist/js/SiteTreeURLSegmentField.js
diff --git a/client/dist/js/bundle-legacy.js b/client/dist/js/bundle-legacy.js
new file mode 100644
index 00000000..79dd8359
--- /dev/null
+++ b/client/dist/js/bundle-legacy.js
@@ -0,0 +1,2 @@
+!function t(e,n,i){function a(r,s){if(!n[r]){if(!e[r]){var d="function"==typeof require&&require;if(!s&&d)return d(r,!0);if(o)return o(r,!0);var l=new Error("Cannot find module '"+r+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[r]={exports:{}};e[r][0].call(c.exports,function(t){var n=e[r][1][t];return a(n?n:t)},c,c.exports,t,e,n,i)}return n[r].exports}for(var o="function"==typeof require&&require,r=0;r<i.length;r++)a(i[r]);return a}({1:[function(t,e,n){"use strict";t("../legacy/CMSMain.AddForm.js"),t("../legacy/CMSMain.EditForm.js"),t("../legacy/CMSMain.js"),t("../legacy/CMSMain.Tree.js"),t("../legacy/CMSPageHistoryController.js"),t("../legacy/RedirectorPage.js"),t("../legacy/SilverStripeNavigator.js"),t("../legacy/SiteTreeURLSegmentField.js")},{"../legacy/CMSMain.AddForm.js":2,"../legacy/CMSMain.EditForm.js":3,"../legacy/CMSMain.Tree.js":4,"../legacy/CMSMain.js":5,"../legacy/CMSPageHistoryController.js":6,"../legacy/RedirectorPage.js":7,"../legacy/SilverStripeNavigator.js":8,"../legacy/SiteTreeURLSegmentField.js":9}],2:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".cms-add-form .parent-mode :input").entwine({onclick:function(t){if("top"==this.val()){var e=this.closest("form").find("#Form_AddForm_ParentID_Holder .TreeDropdownField");e.setValue(""),e.setTitle("")}}}),t(".cms-add-form").entwine({ParentID:0,ParentCache:{},onadd:function(){var t=this;this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField").bind("change",function(){t.updateTypeList()}),this.find(".SelectionGroup.parent-mode").bind("change",function(){t.updateTypeList()}),this.updateTypeList()},loadCachedChildren:function(t){var e=this.getParentCache();return"undefined"!=typeof e[t]?e[t]:null},saveCachedChildren:function(t,e){var n=this.getParentCache();n[t]=e,this.setParentCache(n)},updateTypeList:function(){var e=this.data("hints"),n=this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField"),i=this.find("input[name=ParentModeField]:checked").val(),a=n.data("metadata"),o=a&&"child"===i?n.getValue()||this.getParentID():null,r=a?a.ClassName:null,s=r&&"child"===i?r:"Root",d="undefined"!=typeof e[s]?e[s]:null,l=this,c=d&&"undefined"!=typeof d.defaultChild?d.defaultChild:null,u=[];if(o){if(this.hasClass("loading"))return;return this.addClass("loading"),this.setParentID(o),n.getValue()||n.setValue(o),u=this.loadCachedChildren(o),null!==u?(this.updateSelectionFilter(u,c),void this.removeClass("loading")):(t.ajax({url:l.data("childfilter"),data:{ParentID:o},success:function(t){l.saveCachedChildren(o,t),l.updateSelectionFilter(t,c)},complete:function(){l.removeClass("loading")}}),!1)}u=d&&"undefined"!=typeof d.disallowedChildren?d.disallowedChildren:[],this.updateSelectionFilter(u,c)},updateSelectionFilter:function(e,n){var i=null;if(this.find("#Form_AddForm_PageType li").each(function(){var n=t(this).find("input").val(),a=-1===t.inArray(n,e);t(this).setEnabled(a),a||t(this).setSelected(!1),i=null===i?a:i&&a}),n)var a=this.find("#Form_AddForm_PageType li input[value="+n+"]").parents("li:first");else var a=this.find("#Form_AddForm_PageType li:not(.disabled):first");a.setSelected(!0),a.siblings().setSelected(!1);var o=this.find("#Form_AddForm_PageType li:not(.disabled)").length?"enable":"disable";this.find("button[name=action_doAdd]").button(o),this.find(".message-restricted")[i?"hide":"show"]()}}),t(".cms-add-form #Form_AddForm_PageType li").entwine({onclick:function(t){this.setSelected(!0)},setSelected:function(t){var e=this.find("input");t&&!e.is(":disabled")?(this.siblings().setSelected(!1),this.toggleClass("selected",!0),e.prop("checked",!0)):(this.toggleClass("selected",!1),e.prop("checked",!1))},setEnabled:function(e){t(this).toggleClass("disabled",!e),e?t(this).find("input").removeAttr("disabled"):t(this).find("input").attr("disabled","disabled").removeAttr("checked")}}),t(".cms-page-add-button").entwine({onclick:function(e){var n=t(".cms-tree"),i=t(".cms-list"),a=0;if(n.is(":visible")){var o=n.jstree("get_selected");a=o?t(o[0]).data("id"):null}else{var r=i.find('input[name="Page[GridState]"]').val();r&&(a=parseInt(JSON.parse(r).ParentID,10))}var s,d={selector:this.data("targetPanel"),pjax:this.data("pjax")};a?(extraParams=this.data("extraParams")?this.data("extraParams"):"",s=t.path.addSearchParams(i18n.sprintf(this.data("urlAddpage"),a),extraParams)):s=this.attr("href"),t(".cms-container").loadPanel(s,null,d),e.preventDefault(),this.blur()}})})},{jQuery:"jQuery"}],3:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss",function(t){t(".cms-edit-form :input[name=ClassName]").entwine({onchange:function(){alert(s["default"]._t("CMSMAIN.ALERTCLASSNAME"))}}),t(".cms-edit-form input[name=Title]").entwine({onmatch:function(){var e=this;e.data("OrigVal",e.val());var n=e.closest("form"),i=t("input:text[name=URLSegment]",n),a=t("input[name=LiveLink]",n);i.length>0&&(e._addActions(),this.bind("change",function(n){var o=e.data("OrigVal"),r=e.val();e.data("OrigVal",r),0===i.val().indexOf(i.data("defaultUrl"))&&""==a.val()?e.updateURLSegment(r):t(".update",e.parent()).show(),e.updateRelatedFields(r,o),e.updateBreadcrumbLabel(r)})),this._super()},onunmatch:function(){this._super()},updateRelatedFields:function(e,n){this.parents("form").find("input[name=MetaTitle], input[name=MenuTitle]").each(function(){var i=t(this);i.val()==n&&(i.val(e),i.updatedRelatedFields&&i.updatedRelatedFields())})},updateURLSegment:function(e){var n=t("input:text[name=URLSegment]",this.closest("form")),i=n.closest(".field.urlsegment"),a=t(".update",this.parent());i.update(e),a.is(":visible")&&a.hide()},updateBreadcrumbLabel:function(e){var n=(t(".cms-edit-form input[name=ID]").val(),t("span.cms-panel-link.crumb"));e&&""!=e&&n.text(e)},_addActions:function(){var e,n=this;e=t("<button />",{"class":"update ss-ui-button-small",text:s["default"]._t("URLSEGMENT.UpdateURL"),type:"button",click:function(t){t.preventDefault(),n.updateURLSegment(n.val())}}),e.insertAfter(n),e.hide()}}),t(".cms-edit-form .parentTypeSelector").entwine({onmatch:function(){var t=this;this.find(":input[name=ParentType]").bind("click",function(e){t._toggleSelection(e)}),this.find(".TreeDropdownField").bind("change",function(e){t._changeParentId(e)}),this._changeParentId(),this._toggleSelection(),this._super()},onunmatch:function(){this._super()},_toggleSelection:function(e){var n=this.find(":input[name=ParentType]:checked").val(),i=this.find("#Form_EditForm_ParentID_Holder");"root"==n?this.find(":input[name=ParentID]").val(0):this.find(":input[name=ParentID]").val(this.find("#Form_EditForm_ParentType_subpage").data("parentIdValue")),"root"!=n?i.slideDown(400,function(){t(this).css("overflow","visible")}):i.slideUp()},_changeParentId:function(t){var e=this.find(":input[name=ParentID]").val();this.find("#Form_EditForm_ParentType_subpage").data("parentIdValue",e)}}),t(".cms-edit-form #CanViewType, .cms-edit-form #CanEditType, .cms-edit-form #CanCreateTopLevelType").entwine({onmatch:function(){var e;"CanViewType"==this.attr("id")?e=t("#Form_EditForm_ViewerGroups_Holder"):"CanEditType"==this.attr("id")?e=t("#Form_EditForm_EditorGroups_Holder"):"CanCreateTopLevelType"==this.attr("id")&&(e=t("#Form_EditForm_CreateTopLevelGroups_Holder")),this.find(".optionset :input").bind("change",function(n){var i=t(this).closest(".middleColumn").parent("div");"OnlyTheseUsers"==n.target.value?(i.addClass("remove-splitter"),e.show()):(i.removeClass("remove-splitter"),e.hide())});var n=this.find("input[name="+this.attr("id")+"]:checked").val();e["OnlyTheseUsers"==n?"show":"hide"](),this._super()},onunmatch:function(){this._super()}}),t(".cms-edit-form .Actions #Form_EditForm_action_print").entwine({onclick:function(e){var n=t(this[0].form).attr("action").replace(/\?.*$/,"")+"/printable/"+t(":input[name=ID]",this[0].form).val();return"http://"!=n.substr(0,7)&&(n=t("base").attr("href")+n),window.open(n,"printable"),!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_rollback").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=n?s["default"].sprintf(s["default"]._t("CMSMain.RollbackToVersion"),n):s["default"]._t("CMSMain.ConfirmRestoreFromLive"),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_archive").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.Archive"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_restore").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="",a=this.data("toRoot");return i=s["default"].sprintf(s["default"]._t(a?"CMSMain.RestoreToRoot":"CMSMain.Restore"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_delete").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.DeleteFromDraft"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_unpublish").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.Unpublish"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form.changed").entwine({onmatch:function(t){this.find("button[name=action_save]").button("option","showingAlternate",!0),this.find("button[name=action_publish]").button("option","showingAlternate",!0),this._super(t)},onunmatch:function(t){var e=this.find("button[name=action_save]");e.data("button")&&e.button("option","showingAlternate",!1);var n=this.find("button[name=action_publish]");n.data("button")&&n.button("option","showingAlternate",!1),this._super(t)}}),t(".cms-edit-form .Actions button[name=action_publish]").entwine({onbuttonafterrefreshalternate:function(){this.button("option","showingAlternate")?this.addClass("ss-ui-action-constructive"):this.removeClass("ss-ui-action-constructive")}}),t(".cms-edit-form .Actions button[name=action_save]").entwine({onbuttonafterrefreshalternate:function(){this.button("option","showingAlternate")?this.addClass("ss-ui-action-constructive"):this.removeClass("ss-ui-action-constructive")}}),t('.cms-edit-form.CMSPageSettingsController input[name="ParentType"]:checked').entwine({onmatch:function(){this.redraw(),this._super()},onunmatch:function(){this._super()},redraw:function(){var e=t(".cms-edit-form.CMSPageSettingsController #Form_EditForm_ParentID_Holder");"Form_EditForm_ParentType_root"==t(this).attr("id")?e.slideUp():e.slideDown()},onclick:function(){this.redraw()}}),"Form_EditForm_ParentType_root"==t('.cms-edit-form.CMSPageSettingsController input[name="ParentType"]:checked').attr("id")&&t(".cms-edit-form.CMSPageSettingsController #Form_EditForm_ParentID_Holder").hide()})},{i18n:"i18n",jQuery:"jQuery"}],4:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss.tree",function(t){t(".cms-tree").entwine({fromDocument:{"oncontext_show.vakata":function(t){this.adjustContextClass()}},adjustContextClass:function(){var e=t("#vakata-contextmenu").find("ul ul");e.each(function(n){var i="1",a=t(e[n]).find("li").length;a>20?i="3":a>10&&(i="2"),t(e[n]).addClass("col-"+i).removeClass("right"),t(e[n]).find("li").on("mouseenter",function(e){t(this).parent("ul").removeClass("right")})})},getTreeConfig:function(){var e=this,n=this._super();this.getHints();return n.plugins.push("contextmenu"),n.contextmenu={items:function(n){var i={edit:{label:s["default"]._t("Tree.EditPage","Edit page",100,"Used in the context menu when right-clicking on a page node in the CMS tree"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(s["default"].sprintf(e.data("urlEditpage"),n.data("id")))}}};n.hasClass("nochildren")||(i.showaslist={label:s["default"]._t("Tree.ShowAsList"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(e.data("urlListview")+"&ParentID="+n.data("id"),null,{tabState:{"pages-controller-cms-content":{tabSelector:".content-listview"}}})}});var a=(n.data("pagetype"),n.data("id")),o=n.find(">a .item").data("allowedchildren"),r={},d=!1;return t.each(o,function(n,i){d=!0,r["allowedchildren-"+n]={label:'<span class="jstree-pageicon"></span>'+i,_class:"class-"+n,action:function(i){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlAddpage"),a,n),e.data("extraParams")))}}}),d&&(i.addsubpage={label:s["default"]._t("Tree.AddSubPage","Add page under this page",100,"Used in the context menu when right-clicking on a page node in the CMS tree"),submenu:r}),i.duplicate={label:s["default"]._t("Tree.Duplicate"),submenu:[{label:s["default"]._t("Tree.ThisPageOnly"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlDuplicate"),n.data("id")),e.data("extraParams")))}},{label:s["default"]._t("Tree.ThisPageAndSubpages"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlDuplicatewithchildren"),n.data("id")),e.data("extraParams")))}}]},i}},n}}),t(".cms-tree a.jstree-clicked").entwine({onmatch:function(){var t,e=this,n=e.parents(".cms-panel-content");(e.offset().top<0||e.offset().top>n.height()-e.height())&&(t=n.scrollTop()+e.offset().top+n.height()/2,n.animate({scrollTop:t},"slow"))}}),t(".cms-tree-filtered .clear-filter").entwine({onclick:function(){window.location=location.protocol+"//"+location.host+location.pathname}}),t(".cms-tree-filtered").entwine({onmatch:function(){var e=this,n=function(){var n=t(".cms-content-tools .cms-panel-content").height()-e.parent().siblings(".cms-content-toolbar").outerHeight(!0);e.css("height",n+"px")};n(),t(window).on("resize",window.ss.debounce(n,300))}})})},{i18n:"i18n",jQuery:"jQuery"}],5:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".cms-content-header-info").entwine({"from .cms-panel":{ontoggle:function(t){var e=this.closest(".cms-content").find(t.target);0!==e.length&&this.parent()[e.hasClass("collapsed")?"addClass":"removeClass"]("collapsed")}}}),t(".cms-content-toolbar").entwine({onmatch:function(){var e=this;this._super(),t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var n=t(this),i=n.data("toolid");n.hasClass("active");void 0!==i&&(n.data("active",!1).removeClass("active"),t("#"+i).hide(),e.bindActionButtonEvents(n))})},onunmatch:function(){var e=this;this._super(),t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var n=t(this);e.unbindActionButtonEvents(n)})},bindActionButtonEvents:function(t){var e=this;t.on("click.cmsContentToolbar",function(n){e.showHideTool(t)})},unbindActionButtonEvents:function(t){t.off(".cmsContentToolbar")},showHideTool:function(e){var n=e.data("active"),i=e.data("toolid"),a=t("#"+i);t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var e=t(this),n=t("#"+e.data("toolid"));e.data("toolid")!==i&&(n.hide(),e.data("active",!1))}),e[n?"removeClass":"addClass"]("active"),a[n?"hide":"show"](),e.data("active",!n)}})})},{jQuery:"jQuery"}],6:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss",function(t){t("#Form_VersionsForm").entwine({onmatch:function(){this._super()},onunmatch:function(){this._super()},onsubmit:function(e,n){e.preventDefault();var i;if(i=this.find(":input[name=ID]").val(),!i)return!1;var a,o,r,d,l,c;if(c=this.find(":input[name=CompareMode]").is(":checked"),r=this.find("table input[type=checkbox]").filter(":checked"),c){if(2!=r.length)return!1;d=r.eq(0).val(),l=r.eq(1).val(),a=this.find(":submit[name=action_doCompare]"),o=s["default"].sprintf(this.data("linkTmplCompare"),i,l,d)}else d=r.eq(0).val(),a=this.find(":submit[name=action_doShowVersion]"),o=s["default"].sprintf(this.data("linkTmplShow"),i,d);t(".cms-container").loadPanel(o,"",{pjax:"CurrentForm"})}}),t("#Form_VersionsForm input[name=ShowUnpublished]").entwine({onmatch:function(){this.toggle(),this._super()},onunmatch:function(){this._super()},onchange:function(){this.toggle()},toggle:function(){var e=t(this),n=e.parents("form");e.attr("checked")?n.find("tr[data-published=false]").show():n.find("tr[data-published=false]").hide()._unselect()}}),t("#Form_VersionsForm tbody tr").entwine({onclick:function(t){var e,n;return e=this.parents("form").find(":input[name=CompareMode]").attr("checked"),n=this.siblings(".active"),e&&this.hasClass("active")?void this._unselect():e?n.length>1?alert(s["default"]._t("ONLYSELECTTWO","You can only compare two versions at this time.")):(this._select(),void(1==n.length&&this.parents("form").submit())):(this._select(),n._unselect(),this.parents("form").submit(),void 0)},_unselect:function(){this.removeClass("active"),this.find(":input[type=checkbox]").attr("checked",!1)},_select:function(){this.addClass("active"),this.find(":input[type=checkbox]").attr("checked",!0)}})})},{i18n:"i18n",jQuery:"jQuery"}],7:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t("#Form_EditForm_RedirectionType input").entwine({onmatch:function(){var e=t(this);e.attr("checked")&&this.toggle(),this._super()},onunmatch:function(){this._super()},onclick:function(){this.toggle()},toggle:function(){"Internal"==t(this).attr("value")?(t("#Form_EditForm_ExternalURL_Holder").hide(),t("#Form_EditForm_LinkToID_Holder").show()):(t("#Form_EditForm_ExternalURL_Holder").show(),t("#Form_EditForm_LinkToID_Holder").hide())}})})},{jQuery:"jQuery"}],8:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function a(t){var e=document.getElementsByTagName("base")[0].href.replace("http://","").replace(/\//g,"_").replace(/\./g,"_");return e+t}var o=t("jQuery"),r=i(o);(0,r["default"])(document).ready(function(){(0,r["default"])("#switchView a.newWindow").on("click",function(t){var e=window.open(this.href,a(this.target));return e.focus(),!1}),(0,r["default"])("#SilverStripeNavigatorLink").on("click",function(t){return(0,r["default"])("#SilverStripeNavigatorLinkPopup").toggle(),!1}),(0,r["default"])("#SilverStripeNavigatorLinkPopup a.close").on("click",function(t){return(0,r["default"])("#SilverStripeNavigatorLinkPopup").hide(),!1}),(0,r["default"])("#SilverStripeNavigatorLinkPopup input").on("focus",function(t){this.select()})})},{jQuery:"jQuery"}],9:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".field.urlsegment:not(.readonly)").entwine({MaxPreviewLength:55,Ellipsis:"...",onmatch:function(){this.find(":text").length&&this.toggleEdit(!1),this.redraw(),this._super()},redraw:function(){var t=this.find(":text"),e=decodeURI(t.data("prefix")+t.val()),n=e;e.length>this.getMaxPreviewLength()&&(n=this.getEllipsis()+e.substr(e.length-this.getMaxPreviewLength(),e.length)),this.find(".preview").attr("href",encodeURI(e+t.data("suffix"))).text(n)},toggleEdit:function(t){var e=this.find(":text");this.find(".preview-holder")[t?"hide":"show"](),this.find(".edit-holder")[t?"show":"hide"](),t&&(e.data("origval",e.val()),e.focus())},update:function(){var t=this,e=this.find(":text"),n=e.data("origval"),i=arguments[0],a=i&&""!==i?i:e.val();n!=a?(this.addClass("loading"),this.suggest(a,function(n){e.val(decodeURIComponent(n.value)),t.toggleEdit(!1),t.removeClass("loading"),t.redraw()})):(this.toggleEdit(!1),this.redraw())},cancel:function(){var t=this.find(":text");t.val(t.data("origval")),this.toggleEdit(!1)},suggest:function(e,n){var i=this,a=i.find(":text"),o=t.path.parseUrl(i.closest("form").attr("action")),r=o.hrefNoSearch+"/field/"+a.attr("name")+"/suggest/?value="+encodeURIComponent(e);o.search&&(r+="&"+o.search.replace(/^\?/,"")),t.ajax({url:r,success:function(t){n.apply(this,arguments)},error:function(t,e){t.statusText=t.responseText},complete:function(){i.removeClass("loading")}})}}),t(".field.urlsegment .edit").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").toggleEdit(!0)}}),t(".field.urlsegment .update").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").update()}}),t(".field.urlsegment .cancel").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").cancel()}})})},{jQuery:"jQuery"}]},{},[1]);
+//# sourceMappingURL=bundle-legacy.js.map
diff --git a/css/SilverStripeNavigator.css b/client/dist/styles/SilverStripeNavigator.css
similarity index 100%
rename from css/SilverStripeNavigator.css
rename to client/dist/styles/SilverStripeNavigator.css
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
new file mode 100644
index 00000000..525ddf47
--- /dev/null
+++ b/client/dist/styles/bundle.css
@@ -0,0 +1,3 @@
+#cms-page-history-versions tr.loading{color:#999}#cms-page-history-versions tr.loading td:hover{cursor:none}#cms-page-history-versions td:hover{cursor:pointer}.CMSPageHistoryController ins{background-color:#DFD;padding:2px;text-decoration:none}.CMSPageHistoryController del{background-color:#FDD;padding:2px;color:#f44}#cms-content-treeview .cms-tree-expand-trigger,#cms-content-listview .cms-tree-expand-trigger{display:none}.cms-content-tools #cms-content-treeview .cms-content-toolbar{border-bottom:none;box-shadow:none;margin-bottom:0}.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger{display:block;float:left;margin:0 0 2px 0}.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text{padding-right:8px}.cms-content-tools #cms-content-treeview .cms-tree .badge{display:none}.cms-content-tools #cms-content-treeview .cms-tree a:hover>.text>.badge,.cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked>.text>.badge{display:inline-block}.field.urlsegment.loading{background:url(../images/loading.gif) no-repeat 162px 8px}.field.urlsegment .preview{padding-top:8px;display:inline-block}.field.urlsegment input.text{width:250px}.field.urlsegment input.text,.field.urlsegment .cancel,.field.urlsegment .update,.field.urlsegment .edit{margin-right:8px}.field.urlsegment .help{margin-left:0}.field.urlsegment .edit-holder{display:none}#Form_EditForm #Title .update{margin-left:7px}.cms .AssetAdmin .cms-content-fields{overflow-x:hidden}.cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin{width:100%;overflow-y:auto}.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content{overflow:hidden}.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form{height:100%}.cms .AssetAdmin .cms-content-toolbar{float:left}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .ss-ui-button{z-index:1}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .ss-ui-button::before{font-size:23px}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .grid-levelup{margin:0}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button{background-image:linear-gradient(#f3f3f3, #d9d9d9);border-color:#c0c0c2}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add{height:17px}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text{color:#393939;text-shadow:white 0 1px 1px}.cms .AssetAdmin #Root_TreeView .cms-tree ul .class-Folder a span.text span.jstree-foldericon{background:url(../images/blue-folder-horizontal.png) no-repeat;width:16px;height:16px;float:left;display:block;margin-right:4px}.cms .AssetAdmin .ss-gridfield{margin-top:0}.cms .AssetAdmin table.ss-gridfield-table td.bottom-all{padding:0.7em}.cms .AssetAdmin table.ss-gridfield-table tr[data-class=Folder] td.col-StripThumbnail{background:transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center}.cms .AssetAdmin table.ss-gridfield-table tr[data-class=File] td.col-StripThumbnail{background:transparent url(../images/treeicons/blue-document.png) no-repeat center}
+
+/*# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bundle.css","sources":["bundle.scss","_CMSMain.scss","_AssetAdmin.scss","_ReportAdmin.scss"],"sourcesContent":["/**\n * This file is the central collection of included modules, links to custom SCSS files,\n * and any global SCSS variable definitions.\n *\n * DO NOT ADD stylesheet rules to this file directly!\n *\n * Note: By prefixing files with an underscore, they won't create individual CSS files.\n */\n\n/** -----------------------------\n * CMS Components\n * ------------------------------ */\n@import \"CMSMain\";\n@import \"AssetAdmin\";\n@import \"ReportAdmin\";\n","/**\n * Style  custom to the CMSMain admin interface. CMSMain extends the built in\n * SilverStripe admin section styles. As much as possible we want to use those\n * built in styles. If anything in this file can be implemented in a generic\n * way then it should be include in the admin scss files.\n *\n * @package cms\n */\n\n/** ------------------------------------------------------------------\n * Page History Section.\n * ----------------------------------------------------------------- */\n#cms-page-history-versions {\n\ttr {\n\t\t&.loading {\n\t\t\tcolor: #999;\n\t\t\t\n\t\t\ttd {\n\t\t\t\t\n\t\t\t\t&:hover {\n\t\t\t\t\tcursor: none;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\ttd {\n\t\t&:hover {\n\t\t\tcursor: pointer;\n\t\t}\n\t}\n}\n\n.CMSPageHistoryController {\n\tins {\n\t\tbackground-color: #DFD;\n\t\tpadding: 2px;\n\t\ttext-decoration: none;\n\t}\n\n\tdel {\n\t\tbackground-color: #FDD;\n\t\tpadding: 2px;\n\t\tcolor: darken(#FDD, 30%);\n\t}\n}\n\n/** --------------------------------------------\n * Tree View (collapsed for sidebar)\n * -------------------------------------------- */\n#cms-content-treeview, #cms-content-listview {\n\t.cms-tree-expand-trigger {\n\t\tdisplay: none; // Don't show trigger in expanded mode\n\t}\n}\n\n/**\n * DEPRECATED:\n * .cms-content-tools will be removed in 4.0\n * Use .cms-content-filters instead.\n *\n * Hide certain elements when shown in \"sidebar mode\"\n */\n.cms-content-tools {\n\t#cms-content-treeview {\n\t\t.cms-content-toolbar {\n\t\t\tborder-bottom: none;\n\t\t\tbox-shadow: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\t.cms-tree-expand-trigger {\n\t\t\tdisplay: block;\n\t\t\tfloat: left;\n\t\t\tmargin: 0 0 2px 0;\n\t\t\tspan.ui-button-text {\n\t\t\t\t\tpadding-right: 8px;\n\t\t\t}\n\t\t}\n\n\t\t.cms-tree {\n\t\t\t// Hide badges and drag icons to save space\n\t\t\t.badge {\n\t\t\t\tdisplay: none;\n\t\t\t}\n\n\t\t\t// Show badge on hovered node\n\t\t\ta:hover > .text > .badge, .jstree-clicked > .text > .badge {\n\t\t\t\tdisplay: inline-block;\n\t\t\t}\n\t\t}\n\t}\n}\n\n/** ------------------------------------------------------------------\n * URLSegment field\n * ----------------------------------------------------------------- */\n.field.urlsegment {\n\n\t&.loading {\n\t\tbackground: url(../images/loading.gif) no-repeat 162px 8px;\n\t}\n\n\t.preview {\n\t\tpadding-top: 8px;\n\t\tdisplay: inline-block;\n\t}\n\n\tinput.text {\n\t\twidth: 250px; // ensure there's enough room for buttons\n\t}\n\n\tinput.text, .cancel, .update, .edit {\n\t\tmargin-right: 8px;\n\t}\n\n\t.help {\n\t\tmargin-left: 0;\n\t}\n\n\t.edit-holder {\n\t\tdisplay: none;\n\t}\n}\n\n#Form_EditForm #Title .update {\n\tmargin-left: 7px;\n}\n",".cms .AssetAdmin {\n\t.cms-content-fields {\n\t\toverflow-x: hidden; //hides 'allowed extensions' sidebar\n\t\t\n\t\t.cms-edit-form.AssetAdmin {\n\t\t\twidth: 100%;\n\t\t\toverflow-y:auto; //adds scrolling only to the datagrid\n\t\t}\n\n\t\t/**\n\t\t * DEPRECATED:\n\t\t * .cms-content-tools will be removed in 4.0\n\t\t * Use .cms-content-filters instead.\n\t\t */\n\t\t.cms-content-tools .cms-panel-content {\n\t\t\toverflow:hidden; //removes scollbar from search field in filter\n\t\t\t.cms-search-form {\n\t\t\t\theight:100%; //increases height of search form to accomodate dropdown\n\t\t\t}\n\t\t}\n\t}\n\n\t.cms-content-toolbar {\n\t\tfloat: left;\n\t\t\n\t\t.cms-actions-row {\n\t\t\t.ss-ui-button {\n\t\t\t\tz-index: 1;\n\t\t\t\t\n\t\t\t\t&::before {\n\t\t\t\t\tfont-size: 23px;\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\t.grid-levelup {\n\t\t\t\tmargin: 0;\n\t\t\t}\n\t\t}\n\t\t\n\t\t.cms-page-add-button {\n\t\t\tbackground-image: linear-gradient(lighten(#e6e6e6, 5%), darken(#e6e6e6, 5%));\n\t\t\tborder-color:#c0c0c2;\n\t\t\tspan.btn-icon-add {\n\t\t\t\theight:17px;\n\t\t\t}\n\t\t\tspan.ui-button-text {\n\t\t\t\tcolor:#393939;\n\t\t\t\ttext-shadow: white 0 1px 1px;\n\t\t\t}\n\t\t}\n\t}\t\n\n\t#Root_TreeView {\n\t\t.cms-tree ul .class-Folder a span.text span.jstree-foldericon {\n\t\t\tbackground: url(../images/blue-folder-horizontal.png) no-repeat;\n\t\t\twidth:16px;\n\t\t\theight:16px;\n\t\t\tfloat:left;\n\t\t\tdisplay:block;\n\t\t\tmargin-right:4px;\n\t\t}\n\t}\n\t\n\t.ss-gridfield {\n\t\tmargin-top: 0;\n\t}\n\n\ttable.ss-gridfield-table {\n\t\ttd {\n\t\t\t&.bottom-all {\n\t\t\t\tpadding:0.7em;\n\t\t\t}\n\t\t}\n\t\ttr[data-class=Folder] {\n\t\t\ttd.col-StripThumbnail {\n\t\t\t\tbackground: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center;\n\t\t\t}\n\t\t}\n\t\ttr[data-class=File] {\n\t\t\ttd.col-StripThumbnail {\n\t\t\t\tbackground: transparent url(../images/treeicons/blue-document.png) no-repeat center;\n\t\t\t}\n\t\t}\n\t}\n}\n\t\n",""],"mappings":"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","names":[],"sourceRoot":"/source/"} */
diff --git a/javascript/lang/ar.js b/client/lang/ar.js
similarity index 100%
rename from javascript/lang/ar.js
rename to client/lang/ar.js
diff --git a/javascript/lang/cs.js b/client/lang/cs.js
similarity index 100%
rename from javascript/lang/cs.js
rename to client/lang/cs.js
diff --git a/javascript/lang/de.js b/client/lang/de.js
similarity index 100%
rename from javascript/lang/de.js
rename to client/lang/de.js
diff --git a/javascript/lang/el.js b/client/lang/el.js
similarity index 100%
rename from javascript/lang/el.js
rename to client/lang/el.js
diff --git a/javascript/lang/en.js b/client/lang/en.js
similarity index 100%
rename from javascript/lang/en.js
rename to client/lang/en.js
diff --git a/javascript/lang/eo.js b/client/lang/eo.js
similarity index 100%
rename from javascript/lang/eo.js
rename to client/lang/eo.js
diff --git a/javascript/lang/es.js b/client/lang/es.js
similarity index 100%
rename from javascript/lang/es.js
rename to client/lang/es.js
diff --git a/javascript/lang/fa_IR.js b/client/lang/fa_IR.js
similarity index 100%
rename from javascript/lang/fa_IR.js
rename to client/lang/fa_IR.js
diff --git a/javascript/lang/fi.js b/client/lang/fi.js
similarity index 100%
rename from javascript/lang/fi.js
rename to client/lang/fi.js
diff --git a/javascript/lang/fr.js b/client/lang/fr.js
similarity index 100%
rename from javascript/lang/fr.js
rename to client/lang/fr.js
diff --git a/javascript/lang/hu.js b/client/lang/hu.js
similarity index 100%
rename from javascript/lang/hu.js
rename to client/lang/hu.js
diff --git a/javascript/lang/id.js b/client/lang/id.js
similarity index 100%
rename from javascript/lang/id.js
rename to client/lang/id.js
diff --git a/javascript/lang/is.js b/client/lang/is.js
similarity index 100%
rename from javascript/lang/is.js
rename to client/lang/is.js
diff --git a/javascript/lang/it.js b/client/lang/it.js
similarity index 100%
rename from javascript/lang/it.js
rename to client/lang/it.js
diff --git a/javascript/lang/ja.js b/client/lang/ja.js
similarity index 100%
rename from javascript/lang/ja.js
rename to client/lang/ja.js
diff --git a/javascript/lang/ko.js b/client/lang/ko.js
similarity index 100%
rename from javascript/lang/ko.js
rename to client/lang/ko.js
diff --git a/javascript/lang/lt.js b/client/lang/lt.js
similarity index 100%
rename from javascript/lang/lt.js
rename to client/lang/lt.js
diff --git a/javascript/lang/mi.js b/client/lang/mi.js
similarity index 100%
rename from javascript/lang/mi.js
rename to client/lang/mi.js
diff --git a/javascript/lang/nb.js b/client/lang/nb.js
similarity index 100%
rename from javascript/lang/nb.js
rename to client/lang/nb.js
diff --git a/javascript/lang/nl.js b/client/lang/nl.js
similarity index 100%
rename from javascript/lang/nl.js
rename to client/lang/nl.js
diff --git a/javascript/lang/pl.js b/client/lang/pl.js
similarity index 100%
rename from javascript/lang/pl.js
rename to client/lang/pl.js
diff --git a/javascript/lang/ro.js b/client/lang/ro.js
similarity index 100%
rename from javascript/lang/ro.js
rename to client/lang/ro.js
diff --git a/javascript/lang/ru.js b/client/lang/ru.js
similarity index 100%
rename from javascript/lang/ru.js
rename to client/lang/ru.js
diff --git a/javascript/lang/sk.js b/client/lang/sk.js
similarity index 100%
rename from javascript/lang/sk.js
rename to client/lang/sk.js
diff --git a/javascript/lang/sl.js b/client/lang/sl.js
similarity index 100%
rename from javascript/lang/sl.js
rename to client/lang/sl.js
diff --git a/javascript/lang/sr.js b/client/lang/sr.js
similarity index 100%
rename from javascript/lang/sr.js
rename to client/lang/sr.js
diff --git a/javascript/lang/sr_RS@latin.js b/client/lang/sr_RS@latin.js
similarity index 100%
rename from javascript/lang/sr_RS@latin.js
rename to client/lang/sr_RS@latin.js
diff --git a/javascript/lang/src/ar.js b/client/lang/src/ar.js
similarity index 100%
rename from javascript/lang/src/ar.js
rename to client/lang/src/ar.js
diff --git a/javascript/lang/src/cs.js b/client/lang/src/cs.js
similarity index 100%
rename from javascript/lang/src/cs.js
rename to client/lang/src/cs.js
diff --git a/javascript/lang/src/de.js b/client/lang/src/de.js
similarity index 100%
rename from javascript/lang/src/de.js
rename to client/lang/src/de.js
diff --git a/javascript/lang/src/el.js b/client/lang/src/el.js
similarity index 100%
rename from javascript/lang/src/el.js
rename to client/lang/src/el.js
diff --git a/javascript/lang/src/en.js b/client/lang/src/en.js
similarity index 100%
rename from javascript/lang/src/en.js
rename to client/lang/src/en.js
diff --git a/javascript/lang/src/eo.js b/client/lang/src/eo.js
similarity index 100%
rename from javascript/lang/src/eo.js
rename to client/lang/src/eo.js
diff --git a/javascript/lang/src/es.js b/client/lang/src/es.js
similarity index 100%
rename from javascript/lang/src/es.js
rename to client/lang/src/es.js
diff --git a/javascript/lang/src/fa_IR.js b/client/lang/src/fa_IR.js
similarity index 100%
rename from javascript/lang/src/fa_IR.js
rename to client/lang/src/fa_IR.js
diff --git a/javascript/lang/src/fi.js b/client/lang/src/fi.js
similarity index 100%
rename from javascript/lang/src/fi.js
rename to client/lang/src/fi.js
diff --git a/javascript/lang/src/fr.js b/client/lang/src/fr.js
similarity index 100%
rename from javascript/lang/src/fr.js
rename to client/lang/src/fr.js
diff --git a/javascript/lang/src/hu.js b/client/lang/src/hu.js
similarity index 100%
rename from javascript/lang/src/hu.js
rename to client/lang/src/hu.js
diff --git a/javascript/lang/src/id.js b/client/lang/src/id.js
similarity index 100%
rename from javascript/lang/src/id.js
rename to client/lang/src/id.js
diff --git a/javascript/lang/src/is.js b/client/lang/src/is.js
similarity index 100%
rename from javascript/lang/src/is.js
rename to client/lang/src/is.js
diff --git a/javascript/lang/src/it.js b/client/lang/src/it.js
similarity index 100%
rename from javascript/lang/src/it.js
rename to client/lang/src/it.js
diff --git a/javascript/lang/src/ja.js b/client/lang/src/ja.js
similarity index 100%
rename from javascript/lang/src/ja.js
rename to client/lang/src/ja.js
diff --git a/javascript/lang/src/ko.js b/client/lang/src/ko.js
similarity index 100%
rename from javascript/lang/src/ko.js
rename to client/lang/src/ko.js
diff --git a/javascript/lang/src/lt.js b/client/lang/src/lt.js
similarity index 100%
rename from javascript/lang/src/lt.js
rename to client/lang/src/lt.js
diff --git a/javascript/lang/src/mi.js b/client/lang/src/mi.js
similarity index 100%
rename from javascript/lang/src/mi.js
rename to client/lang/src/mi.js
diff --git a/javascript/lang/src/nb.js b/client/lang/src/nb.js
similarity index 100%
rename from javascript/lang/src/nb.js
rename to client/lang/src/nb.js
diff --git a/javascript/lang/src/nl.js b/client/lang/src/nl.js
similarity index 100%
rename from javascript/lang/src/nl.js
rename to client/lang/src/nl.js
diff --git a/javascript/lang/src/pl.js b/client/lang/src/pl.js
similarity index 100%
rename from javascript/lang/src/pl.js
rename to client/lang/src/pl.js
diff --git a/javascript/lang/src/ro.js b/client/lang/src/ro.js
similarity index 100%
rename from javascript/lang/src/ro.js
rename to client/lang/src/ro.js
diff --git a/javascript/lang/src/ru.js b/client/lang/src/ru.js
similarity index 100%
rename from javascript/lang/src/ru.js
rename to client/lang/src/ru.js
diff --git a/javascript/lang/src/sk.js b/client/lang/src/sk.js
similarity index 100%
rename from javascript/lang/src/sk.js
rename to client/lang/src/sk.js
diff --git a/javascript/lang/src/sl.js b/client/lang/src/sl.js
similarity index 100%
rename from javascript/lang/src/sl.js
rename to client/lang/src/sl.js
diff --git a/javascript/lang/src/sr.js b/client/lang/src/sr.js
similarity index 100%
rename from javascript/lang/src/sr.js
rename to client/lang/src/sr.js
diff --git a/javascript/lang/src/sr_RS@latin.js b/client/lang/src/sr_RS@latin.js
similarity index 100%
rename from javascript/lang/src/sr_RS@latin.js
rename to client/lang/src/sr_RS@latin.js
diff --git a/javascript/lang/src/sv.js b/client/lang/src/sv.js
similarity index 100%
rename from javascript/lang/src/sv.js
rename to client/lang/src/sv.js
diff --git a/javascript/lang/src/zh.js b/client/lang/src/zh.js
similarity index 100%
rename from javascript/lang/src/zh.js
rename to client/lang/src/zh.js
diff --git a/javascript/lang/sv.js b/client/lang/sv.js
similarity index 100%
rename from javascript/lang/sv.js
rename to client/lang/sv.js
diff --git a/javascript/lang/zh.js b/client/lang/zh.js
similarity index 100%
rename from javascript/lang/zh.js
rename to client/lang/zh.js
diff --git a/client/src/bundles/legacy.js b/client/src/bundles/legacy.js
new file mode 100644
index 00000000..92e4e60c
--- /dev/null
+++ b/client/src/bundles/legacy.js
@@ -0,0 +1,8 @@
+require('../legacy/CMSMain.AddForm.js');
+require('../legacy/CMSMain.EditForm.js');
+require('../legacy/CMSMain.js');
+require('../legacy/CMSMain.Tree.js');
+require('../legacy/CMSPageHistoryController.js');
+require('../legacy/RedirectorPage.js');
+require('../legacy/SilverStripeNavigator.js');
+require('../legacy/SiteTreeURLSegmentField.js');
diff --git a/javascript/src/AssetAdmin.js b/client/src/legacy/AssetAdmin.js
similarity index 100%
rename from javascript/src/AssetAdmin.js
rename to client/src/legacy/AssetAdmin.js
diff --git a/javascript/src/CMSMain.AddForm.js b/client/src/legacy/CMSMain.AddForm.js
similarity index 100%
rename from javascript/src/CMSMain.AddForm.js
rename to client/src/legacy/CMSMain.AddForm.js
diff --git a/javascript/src/CMSMain.EditForm.js b/client/src/legacy/CMSMain.EditForm.js
similarity index 100%
rename from javascript/src/CMSMain.EditForm.js
rename to client/src/legacy/CMSMain.EditForm.js
diff --git a/javascript/src/CMSMain.Tree.js b/client/src/legacy/CMSMain.Tree.js
similarity index 100%
rename from javascript/src/CMSMain.Tree.js
rename to client/src/legacy/CMSMain.Tree.js
diff --git a/javascript/src/CMSMain.js b/client/src/legacy/CMSMain.js
similarity index 100%
rename from javascript/src/CMSMain.js
rename to client/src/legacy/CMSMain.js
diff --git a/javascript/src/CMSPageHistoryController.js b/client/src/legacy/CMSPageHistoryController.js
similarity index 100%
rename from javascript/src/CMSPageHistoryController.js
rename to client/src/legacy/CMSPageHistoryController.js
diff --git a/javascript/src/RedirectorPage.js b/client/src/legacy/RedirectorPage.js
similarity index 100%
rename from javascript/src/RedirectorPage.js
rename to client/src/legacy/RedirectorPage.js
diff --git a/javascript/src/SilverStripeNavigator.js b/client/src/legacy/SilverStripeNavigator.js
similarity index 100%
rename from javascript/src/SilverStripeNavigator.js
rename to client/src/legacy/SilverStripeNavigator.js
diff --git a/javascript/src/SiteTreeURLSegmentField.js b/client/src/legacy/SiteTreeURLSegmentField.js
similarity index 100%
rename from javascript/src/SiteTreeURLSegmentField.js
rename to client/src/legacy/SiteTreeURLSegmentField.js
diff --git a/scss/SilverStripeNavigator.scss b/client/src/styles/SilverStripeNavigator.scss
similarity index 100%
rename from scss/SilverStripeNavigator.scss
rename to client/src/styles/SilverStripeNavigator.scss
diff --git a/scss/_AssetAdmin.scss b/client/src/styles/_AssetAdmin.scss
similarity index 100%
rename from scss/_AssetAdmin.scss
rename to client/src/styles/_AssetAdmin.scss
diff --git a/scss/_CMSMain.scss b/client/src/styles/_CMSMain.scss
similarity index 100%
rename from scss/_CMSMain.scss
rename to client/src/styles/_CMSMain.scss
diff --git a/scss/_ReportAdmin.scss b/client/src/styles/_ReportAdmin.scss
similarity index 100%
rename from scss/_ReportAdmin.scss
rename to client/src/styles/_ReportAdmin.scss
diff --git a/scss/screen.scss b/client/src/styles/bundle.scss
similarity index 82%
rename from scss/screen.scss
rename to client/src/styles/bundle.scss
index a814e5a0..6a8ff082 100644
--- a/scss/screen.scss
+++ b/client/src/styles/bundle.scss
@@ -10,6 +10,6 @@
 /** -----------------------------
  * CMS Components
  * ------------------------------ */
-@import "CMSMain.scss";
-@import "AssetAdmin.scss";
-@import "ReportAdmin.scss";
+@import "CMSMain";
+@import "AssetAdmin";
+@import "ReportAdmin";
diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 9d4f393a..68b6d92d 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -65,9 +65,9 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
 
 		Versioned::set_stage(Versioned::DRAFT);
 
-		Requirements::javascript(CMS_DIR . "/javascript/dist/AssetAdmin.js");
-		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang', false, true);
-		Requirements::css(CMS_DIR . "/css/screen.css");
+		Requirements::javascript(CMS_DIR . "/client/dist/js/AssetAdmin.js");
+		Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true);
+		Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css');
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
 
@@ -136,8 +136,8 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
 	}
 
 	public function getEditForm($id = null, $fields = null) {
-		Requirements::javascript(FRAMEWORK_DIR . '/javascript/dist/AssetUploadField.js');
-		Requirements::css(FRAMEWORK_DIR . '/css/AssetUploadField.css');
+		Requirements::javascript(FRAMEWORK_DIR . '/client/dist/js/AssetUploadField.js');
+		Requirements::css(FRAMEWORK_DIR . '/client/dist/styles/AssetUploadField.css');
 
 		$form = parent::getEditForm($id, $fields);
 		$folder = ($id && is_numeric($id)) ? DataObject::get_by_id('Folder', $id, false) : $this->currentPage();
@@ -644,4 +644,3 @@ class AssetAdmin_DeleteBatchAction extends CMSBatchAction {
 		return Convert::raw2json($status);
 	}
 }
-
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 07cd32b6..411c745a 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -66,19 +66,19 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
 		parent::init();
 
-		Requirements::css(CMS_DIR . '/css/screen.css');
+		Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css');
 		Requirements::customCSS($this->generatePageIconsCss());
-		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang', false, true);
-		Requirements::javascript(CMS_DIR . '/javascript/dist/bundle-legacy.js', [
+		Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true);
+		Requirements::javascript(CMS_DIR . '/client/dist/js/bundle-legacy.js', [
 			'provides' => [
-				CMS_DIR . '/javascript/dist/CMSMain.AddForm.js',
-				CMS_DIR . '/javascript/dist/CMSMain.EditForm.js',
-				CMS_DIR . '/javascript/dist/CMSMain.js',
-				CMS_DIR . '/javascript/dist/CMSMain.Tree.js',
-				CMS_DIR . '/javascript/dist/CMSPageHistoryController.js',
-				CMS_DIR . '/javascript/dist/RedirectorPage.js',
-				CMS_DIR . '/javascript/dist/SilverStripeNavigator.js',
-				CMS_DIR . '/javascript/dist/SiteTreeURLSegmentField.js'
+				CMS_DIR . '/client/dist/js/CMSMain.AddForm.js',
+				CMS_DIR . '/client/dist/js/CMSMain.EditForm.js',
+				CMS_DIR . '/client/dist/js/CMSMain.js',
+				CMS_DIR . '/client/dist/js/CMSMain.Tree.js',
+				CMS_DIR . '/client/dist/js/CMSPageHistoryController.js',
+				CMS_DIR . '/client/dist/js/RedirectorPage.js',
+				CMS_DIR . '/client/dist/js/SilverStripeNavigator.js',
+				CMS_DIR . '/client/dist/js/SiteTreeURLSegmentField.js'
 			]
 		]);
 
diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php
index e9750b4a..526c4c56 100755
--- a/code/controllers/ContentController.php
+++ b/code/controllers/ContentController.php
@@ -270,9 +270,9 @@ class ContentController extends Controller {
 
 		if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) {
 			if($this->dataRecord) {
-				Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css');
+				Requirements::css(CMS_DIR . '/client/dist/styles/SilverStripeNavigator.css');
 				Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
-				Requirements::javascript(CMS_DIR . '/javascript/dist/SilverStripeNavigator.js');
+				Requirements::javascript(CMS_DIR . '/client/dist/js/SilverStripeNavigator.js');
 
 				$return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord);
 				$items = $return['items'];
@@ -312,7 +312,7 @@ HTML;
 		// On live sites we should still see the archived message
 		} else {
 			if($date = Versioned::current_archived_date()) {
-				Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css');
+				Requirements::css(CMS_DIR . '/client/dist/styles/SilverStripeNavigator.css');
 				$dateObj = Datetime::create($date, null);
 				// $dateObj->setVal($date);
 				return "<div id=\"SilverStripeNavigatorMessage\">". _t('ContentController.ARCHIVEDSITEFROM') ."<br>" . $dateObj->Nice() . "</div>";
diff --git a/code/forms/SiteTreeURLSegmentField.php b/code/forms/SiteTreeURLSegmentField.php
index afcea347..e344c19c 100644
--- a/code/forms/SiteTreeURLSegmentField.php
+++ b/code/forms/SiteTreeURLSegmentField.php
@@ -37,9 +37,9 @@ class SiteTreeURLSegmentField extends TextField {
 	}
 
 	public function Field($properties = array()) {
-		Requirements::javascript(CMS_DIR . '/javascript/dist/SiteTreeURLSegmentField.js');
-		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang', false, true);
-		Requirements::css(CMS_DIR . "/css/screen.css");
+		Requirements::javascript(CMS_DIR . '/client/dist/js/SiteTreeURLSegmentField.js');
+		Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true);
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css');
 		return parent::Field($properties);
 	}
 
diff --git a/code/model/RedirectorPage.php b/code/model/RedirectorPage.php
index 1a71e290..6498c098 100644
--- a/code/model/RedirectorPage.php
+++ b/code/model/RedirectorPage.php
@@ -117,7 +117,7 @@ class RedirectorPage extends Page {
 	}
 
 	public function getCMSFields() {
-		Requirements::javascript(CMS_DIR . '/javascript/dist/RedirectorPage.js');
+		Requirements::javascript(CMS_DIR . '/client/dist/js/RedirectorPage.js');
 
 		$fields = parent::getCMSFields();
 		$fields->removeByName('Content', true);
diff --git a/css/CMSMain.css b/css/CMSMain.css
deleted file mode 100644
index 86523c25..00000000
--- a/css/CMSMain.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Style  custom to the CMSMain admin interface. CMSMain extends the built in SilverStripe admin section styles. As much as possible we want to use those  built in styles. If anything in this file can be implemented in a generic  way then it should be include in the admin scss files.  @package cms */
-/** ------------------------------------------------------------------ Page History Section. ----------------------------------------------------------------- */
-#cms-page-history-versions tr.loading { color: #999; }
-#cms-page-history-versions tr.loading td:hover { cursor: none; }
-#cms-page-history-versions td:hover { cursor: pointer; }
-
-.CMSPageHistoryController ins { background-color: #DFD; padding: 2px; text-decoration: none; }
-.CMSPageHistoryController del { background-color: #FDD; padding: 2px; color: #ff4444; }
diff --git a/css/_old/AssetAdmin.css b/css/_old/AssetAdmin.css
deleted file mode 100644
index 540c1813..00000000
--- a/css/_old/AssetAdmin.css
+++ /dev/null
@@ -1,41 +0,0 @@
-#right form .inlineformaction {
-	margin-left: 0;
-}
-#right form #deletemarked .middleColumn {
-	background: none;
-}
-.dragfile,
-.dragfile img {
-	float: left;
-	cursor: move;
-}
-.NumFilesIndicator {
-	text-align: left;
- 	padding: 1px 1px 1px 10px;
- 	font-size: 16px;
-	font-weight: bold;
- 	border: 1px solid #cc9;
-	color: #660;
-	background-color: #F9F9E3;
-	margin: 2px;
-}
-.DraggedHandle {
-	width: 30em !important;
-}
-form#Form_AddForm fieldset {
-	float: left;
-	margin-right: 1em;
-}
-form#Form_AddForm .field span.readonly {
-	background: none;
-	border: none;
-	margin: 0;
-	padding: 0;
-	width: auto;
-}
-
-#TreeActions-sync {
-	/* Same as .checkboxAboveTree */
-	border-top: 1px solid #CCCCCC;
-	padding: .5em;
-}
diff --git a/css/_old/CMSMain.css b/css/_old/CMSMain.css
deleted file mode 100644
index 33b7827d..00000000
--- a/css/_old/CMSMain.css
+++ /dev/null
@@ -1,3 +0,0 @@
-div#SideReportsHolder {
-	clear: left;
-}
diff --git a/css/_old/CommentAdmin.css b/css/_old/CommentAdmin.css
deleted file mode 100644
index 31e69d66..00000000
--- a/css/_old/CommentAdmin.css
+++ /dev/null
@@ -1,44 +0,0 @@
-#Form_EditForm{
-	overflow: scroll;
-}
-
-	#Form_EditForm table{
-		width: 100%;
-	}
-
-		#Form_EditForm table td{
-			word-wrap:break-word !important;
-		}
-		
-		#Form_EditForm table td.Comment{
-			width: 32%;
-		}
-		
-		#Form_EditForm table td.URL{
-			width: 18%;
-		}
-		
-		#Form_EditForm table td.Page{
-			width: 20%;
-		}
-
-/* The following is not used anywhere, we should delete it. Because this file has not been
-included in the template due to a bug since 29/09/08 (r63175), and we can't find a HTML element with the id 'CommentList'
-
-#CommentList {
-	padding: 0;
-	margin: 0;
-}
-#CommentList li {
-	list-style-type: none;
-	background-color: #EEE;
-	border: 1px #CCC solid;
-	padding: 3px;
-	margin: 7px;
-}
-#CommentList li .extra {
-	margin-top: 3px;
-	font-size: 80%;
-	font-style: italic;
-}
-*/
diff --git a/css/_old/SilverStripeNavigator.css b/css/_old/SilverStripeNavigator.css
deleted file mode 100644
index f30c1ce9..00000000
--- a/css/_old/SilverStripeNavigator.css
+++ /dev/null
@@ -1,111 +0,0 @@
-
-#SilverStripeNavigator {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	border-top: 2px solid #d4d0c8;
-	background-color:#81858d;
-	height: 22px;
-	background: #4d4e5a url(../../cms/images/textures/footerBg.gif) repeat-x left top;
-}
-
-#SilverStripeNavigator * {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 10px !important;
-}
-
-#SilverStripeNavigator .holder {
-	text-align: center;
-	padding-top : 4px;
-	padding-left : 3px;
-	padding-right : 6px;
-	color: white;
-	border-top: 1px solid #555555;
-}
-#SilverStripeNavigator #logInStatus {
-	float: right;
-}
-#SilverStripeNavigator #switchView {
-	float: left;
-
-}
-
-#SilverStripeNavigator a  {
-	color: #fff;
-	background-color: transparent;
-	text-decoration: underline;
-}
-#SilverStripeNavigator a:hover  {
-	background-color: transparent;
-}
-
-#SilverStripeNavigator .bottomTabs a  {
-	margin-right: 8px;
-	text-decoration: underline;
-}
-
-#SilverStripeNavigator .bottomTabs div.blank {
-	display: block;
-	float : left;
-	height : 13px;
-	position:relative;
-	top : -2px;
-	cursor: pointer;
-	border : none;
-	background-color: transparent;
-	padding: 2px 4px 2px 2px;
-	font-weight: bold;
-}
-
-
-#SilverStripeNavigator .bottomTabs a.current {
-	font-weight:bold;
-	text-decoration: none;
-}
-
-#SilverStripeNavigatorMessage {
-	font-family: 'Lucida Grande', Verdana, Arial, 'sans-serif';
-	position: absolute;
-	right: 20px;
-	top: 40px;
-	padding: 10px;
-	border-color: #c99;
-	color: #fff;
-	background-color: #c00;
-	border: 1px solid #000;
-}
-
-#SilverStripeNavigator #logInStatus {
-	background:transparent url(../../cms/images/logout.gif) no-repeat scroll right top !important;
-	padding-bottom:4px;
-	padding-right:20px;
-}
-
-#SilverStripeNavigatorLinkPopup {
-	display: none;
-	position: absolute;
-	top: -60px;
-	height: 50px;
-	width: 350px;
-	left: 200px;
-	background-color: white;
-	border: 1px solid black;
-	z-index: 100;
-	color: black;
-	padding: 5px;
-}
-
-#SilverStripeNavigatorLinkPopup input {
-	width: 250px;
-}
-
-#SilverStripeNavigatorLinkPopup a.close {
-	color: blue;
-	text-align: right;
-	width: 80%;
-	border: none !important;
-	cursor: pointer;
-}
-
-
diff --git a/css/screen.css b/css/screen.css
deleted file mode 100644
index a77dbbb2..00000000
--- a/css/screen.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#cms-page-history-versions tr.loading{color:#999}#cms-page-history-versions tr.loading td:hover{cursor:none}#cms-page-history-versions td:hover{cursor:pointer}.CMSPageHistoryController ins{background-color:#DFD;padding:2px;text-decoration:none}.CMSPageHistoryController del{background-color:#FDD;padding:2px;color:#f44}#cms-content-treeview .cms-tree-expand-trigger,#cms-content-listview .cms-tree-expand-trigger{display:none}.cms-content-tools #cms-content-treeview .cms-content-toolbar{border-bottom:none;box-shadow:none;margin-bottom:0}.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger{display:block;float:left;margin:0 0 2px 0}.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text{padding-right:8px}.cms-content-tools #cms-content-treeview .cms-tree .badge{display:none}.cms-content-tools #cms-content-treeview .cms-tree a:hover>.text>.badge,.cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked>.text>.badge{display:inline-block}.field.urlsegment.loading{background:url(../images/loading.gif) no-repeat 162px 8px}.field.urlsegment .preview{padding-top:8px;display:inline-block}.field.urlsegment input.text{width:250px}.field.urlsegment input.text,.field.urlsegment .cancel,.field.urlsegment .update,.field.urlsegment .edit{margin-right:8px}.field.urlsegment .help{margin-left:0}.field.urlsegment .edit-holder{display:none}#Form_EditForm #Title .update{margin-left:7px}.cms .AssetAdmin .cms-content-fields{overflow-x:hidden}.cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin{width:100%;overflow-y:auto}.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content{overflow:hidden}.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form{height:100%}.cms .AssetAdmin .cms-content-toolbar{float:left}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .ss-ui-button{z-index:1}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .ss-ui-button::before{font-size:23px}.cms .AssetAdmin .cms-content-toolbar .cms-actions-row .grid-levelup{margin:0}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button{background-image:linear-gradient(#f3f3f3, #d9d9d9);border-color:#c0c0c2}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add{height:17px}.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text{color:#393939;text-shadow:white 0 1px 1px}.cms .AssetAdmin #Root_TreeView .cms-tree ul .class-Folder a span.text span.jstree-foldericon{background:url(../images/blue-folder-horizontal.png) no-repeat;width:16px;height:16px;float:left;display:block;margin-right:4px}.cms .AssetAdmin .ss-gridfield{margin-top:0}.cms .AssetAdmin table.ss-gridfield-table td.bottom-all{padding:0.7em}.cms .AssetAdmin table.ss-gridfield-table tr[data-class=Folder] td.col-StripThumbnail{background:transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center}.cms .AssetAdmin table.ss-gridfield-table tr[data-class=File] td.col-StripThumbnail{background:transparent url(../images/treeicons/blue-document.png) no-repeat center}
-
-/*# sourceMappingURL=data:application/json;base64,{"version":3,"file":"screen.css","sources":["screen.scss","_CMSMain.scss","_AssetAdmin.scss","_ReportAdmin.scss"],"sourcesContent":["/**\n * This file is the central collection of included modules, links to custom SCSS files,\n * and any global SCSS variable definitions.\n *\n * DO NOT ADD stylesheet rules to this file directly!\n *\n * Note: By prefixing files with an underscore, they won't create individual CSS files.\n */\n\n/** -----------------------------\n * CMS Components\n * ------------------------------ */\n@import \"CMSMain.scss\";\n@import \"AssetAdmin.scss\";\n@import \"ReportAdmin.scss\";\n","/**\n * Style  custom to the CMSMain admin interface. CMSMain extends the built in\n * SilverStripe admin section styles. As much as possible we want to use those\n * built in styles. If anything in this file can be implemented in a generic\n * way then it should be include in the admin scss files.\n *\n * @package cms\n */\n\n/** ------------------------------------------------------------------\n * Page History Section.\n * ----------------------------------------------------------------- */\n#cms-page-history-versions {\n\ttr {\n\t\t&.loading {\n\t\t\tcolor: #999;\n\t\t\t\n\t\t\ttd {\n\t\t\t\t\n\t\t\t\t&:hover {\n\t\t\t\t\tcursor: none;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\ttd {\n\t\t&:hover {\n\t\t\tcursor: pointer;\n\t\t}\n\t}\n}\n\n.CMSPageHistoryController {\n\tins {\n\t\tbackground-color: #DFD;\n\t\tpadding: 2px;\n\t\ttext-decoration: none;\n\t}\n\n\tdel {\n\t\tbackground-color: #FDD;\n\t\tpadding: 2px;\n\t\tcolor: darken(#FDD, 30%);\n\t}\n}\n\n/** --------------------------------------------\n * Tree View (collapsed for sidebar)\n * -------------------------------------------- */\n#cms-content-treeview, #cms-content-listview {\n\t.cms-tree-expand-trigger {\n\t\tdisplay: none; // Don't show trigger in expanded mode\n\t}\n}\n\n/**\n * DEPRECATED:\n * .cms-content-tools will be removed in 4.0\n * Use .cms-content-filters instead.\n *\n * Hide certain elements when shown in \"sidebar mode\"\n */\n.cms-content-tools {\n\t#cms-content-treeview {\n\t\t.cms-content-toolbar {\n\t\t\tborder-bottom: none;\n\t\t\tbox-shadow: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\t.cms-tree-expand-trigger {\n\t\t\tdisplay: block;\n\t\t\tfloat: left;\n\t\t\tmargin: 0 0 2px 0;\n\t\t\tspan.ui-button-text {\n\t\t\t\t\tpadding-right: 8px;\n\t\t\t}\n\t\t}\n\n\t\t.cms-tree {\n\t\t\t// Hide badges and drag icons to save space\n\t\t\t.badge {\n\t\t\t\tdisplay: none;\n\t\t\t}\n\n\t\t\t// Show badge on hovered node\n\t\t\ta:hover > .text > .badge, .jstree-clicked > .text > .badge {\n\t\t\t\tdisplay: inline-block;\n\t\t\t}\n\t\t}\n\t}\n}\n\n/** ------------------------------------------------------------------\n * URLSegment field\n * ----------------------------------------------------------------- */\n.field.urlsegment {\n\n\t&.loading {\n\t\tbackground: url(../images/loading.gif) no-repeat 162px 8px;\n\t}\n\n\t.preview {\n\t\tpadding-top: 8px;\n\t\tdisplay: inline-block;\n\t}\n\n\tinput.text {\n\t\twidth: 250px; // ensure there's enough room for buttons\n\t}\n\n\tinput.text, .cancel, .update, .edit {\n\t\tmargin-right: 8px;\n\t}\n\n\t.help {\n\t\tmargin-left: 0;\n\t}\n\n\t.edit-holder {\n\t\tdisplay: none;\n\t}\n}\n\n#Form_EditForm #Title .update {\n\tmargin-left: 7px;\n}\n",".cms .AssetAdmin {\n\t.cms-content-fields {\n\t\toverflow-x: hidden; //hides 'allowed extensions' sidebar\n\t\t\n\t\t.cms-edit-form.AssetAdmin {\n\t\t\twidth: 100%;\n\t\t\toverflow-y:auto; //adds scrolling only to the datagrid\n\t\t}\n\n\t\t/**\n\t\t * DEPRECATED:\n\t\t * .cms-content-tools will be removed in 4.0\n\t\t * Use .cms-content-filters instead.\n\t\t */\n\t\t.cms-content-tools .cms-panel-content {\n\t\t\toverflow:hidden; //removes scollbar from search field in filter\n\t\t\t.cms-search-form {\n\t\t\t\theight:100%; //increases height of search form to accomodate dropdown\n\t\t\t}\n\t\t}\n\t}\n\n\t.cms-content-toolbar {\n\t\tfloat: left;\n\t\t\n\t\t.cms-actions-row {\n\t\t\t.ss-ui-button {\n\t\t\t\tz-index: 1;\n\t\t\t\t\n\t\t\t\t&::before {\n\t\t\t\t\tfont-size: 23px;\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\t.grid-levelup {\n\t\t\t\tmargin: 0;\n\t\t\t}\n\t\t}\n\t\t\n\t\t.cms-page-add-button {\n\t\t\tbackground-image: linear-gradient(lighten(#e6e6e6, 5%), darken(#e6e6e6, 5%));\n\t\t\tborder-color:#c0c0c2;\n\t\t\tspan.btn-icon-add {\n\t\t\t\theight:17px;\n\t\t\t}\n\t\t\tspan.ui-button-text {\n\t\t\t\tcolor:#393939;\n\t\t\t\ttext-shadow: white 0 1px 1px;\n\t\t\t}\n\t\t}\n\t}\t\n\n\t#Root_TreeView {\n\t\t.cms-tree ul .class-Folder a span.text span.jstree-foldericon {\n\t\t\tbackground: url(../images/blue-folder-horizontal.png) no-repeat;\n\t\t\twidth:16px;\n\t\t\theight:16px;\n\t\t\tfloat:left;\n\t\t\tdisplay:block;\n\t\t\tmargin-right:4px;\n\t\t}\n\t}\n\t\n\t.ss-gridfield {\n\t\tmargin-top: 0;\n\t}\n\n\ttable.ss-gridfield-table {\n\t\ttd {\n\t\t\t&.bottom-all {\n\t\t\t\tpadding:0.7em;\n\t\t\t}\n\t\t}\n\t\ttr[data-class=Folder] {\n\t\t\ttd.col-StripThumbnail {\n\t\t\t\tbackground: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center;\n\t\t\t}\n\t\t}\n\t\ttr[data-class=File] {\n\t\t\ttd.col-StripThumbnail {\n\t\t\t\tbackground: transparent url(../images/treeicons/blue-document.png) no-repeat center;\n\t\t\t}\n\t\t}\n\t}\n}\n\t\n",""],"mappings":"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","names":[],"sourceRoot":"/source/"} */
diff --git a/gulpfile.js b/gulpfile.js
index 005d26a5..a0cdbb8f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,10 +21,10 @@ process.env.NODE_ENV = isDev ? 'development' : 'production';
 
 const PATHS = {
   MODULES: './node_modules',
-  CMS_JAVASCRIPT_SRC: './javascript/src',
-  CMS_JAVASCRIPT_DIST: './javascript/dist',
-  CMS_SCSS: './scss',
-  CMS_CSS: './css',
+  CMS_JS_SRC: './client/src',
+  CMS_JS_DIST: './client/dist/js',
+  CMS_CSS_SRC: './client/src/styles',
+  CMS_CSS_DIST: './client/dist/styles',
 };
 
 const babelifyOptions = {
@@ -82,7 +82,7 @@ gulp.task('bundle-legacy', function bundleLeftAndMain() {
   return browserify(Object.assign(
       {},
       browserifyOptions,
-      { entries: `${PATHS.CMS_JAVASCRIPT_SRC}/bundles/legacy.js` })
+      { entries: `${PATHS.CMS_JS_SRC}/bundles/legacy.js` })
   )
     .on('update', bundleLeftAndMain)
     .on('log', (msg) => gulpUtil.log('Finished', `bundled ${bundleFileName} ${msg}`))
@@ -97,30 +97,30 @@ gulp.task('bundle-legacy', function bundleLeftAndMain() {
     .pipe(sourcemaps.init({ loadMaps: true }))
     .pipe(uglify())
     .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest(PATHS.CMS_JAVASCRIPT_DIST));
+    .pipe(gulp.dest(PATHS.CMS_JS_DIST));
 });
 
 gulp.task('umd-cms', () => { // eslint-disable-line
-  return transformToUmd(glob.sync(`${PATHS.CMS_JAVASCRIPT_SRC}/*.js`), PATHS.CMS_JAVASCRIPT_DIST);
+  return transformToUmd(glob.sync(`${PATHS.CMS_JS_SRC}/*.js`), PATHS.CMS_JS_DIST);
 });
 
 gulp.task('umd-watch', () => { // eslint-disable-line
   if (isDev) {
-    gulp.watch(`${PATHS.CMS_JAVASCRIPT_SRC}/*.js`, ['umd-cms']);
+    gulp.watch(`${PATHS.CMS_JS_SRC}/*.js`, ['umd-cms']);
   }
 });
 
 gulp.task('css', ['compile:css'], () => { // eslint-disable-line
   if (isDev) {
-    gulp.watch(`${PATHS.CMS_SCSS}/**/*.scss`, ['compile:css']);
-    gulp.watch(`${PATHS.CMS_JAVASCRIPT_SRC}/**/*.scss`, ['compile:css']);
+    gulp.watch(`${PATHS.CMS_CSS_SRC}/**/*.scss`, ['compile:css']);
+    gulp.watch(`${PATHS.CMS_JS_SRC}/**/*.scss`, ['compile:css']);
   }
 });
 
 gulp.task('compile:css', () => { // eslint-disable-line
   const outputStyle = isDev ? 'expanded' : 'compressed';
 
-  return gulp.src(`${PATHS.CMS_SCSS}/**/*.scss`)
+  return gulp.src(`${PATHS.CMS_CSS_SRC}/**/*.scss`)
     .pipe(sourcemaps.init())
     .pipe(sass({ outputStyle })
       .on('error', notify.onError({
@@ -128,5 +128,5 @@ gulp.task('compile:css', () => { // eslint-disable-line
       }))
   )
   .pipe(sourcemaps.write())
-  .pipe(gulp.dest(PATHS.CMS_CSS));
+  .pipe(gulp.dest(PATHS.CMS_CSS_DIST));
 });
diff --git a/javascript/dist/bundle-legacy.js b/javascript/dist/bundle-legacy.js
deleted file mode 100644
index 1013382e..00000000
--- a/javascript/dist/bundle-legacy.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function t(e,n,i){function a(r,s){if(!n[r]){if(!e[r]){var d="function"==typeof require&&require;if(!s&&d)return d(r,!0);if(o)return o(r,!0);var l=new Error("Cannot find module '"+r+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[r]={exports:{}};e[r][0].call(c.exports,function(t){var n=e[r][1][t];return a(n?n:t)},c,c.exports,t,e,n,i)}return n[r].exports}for(var o="function"==typeof require&&require,r=0;r<i.length;r++)a(i[r]);return a}({1:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".cms-add-form .parent-mode :input").entwine({onclick:function(t){if("top"==this.val()){var e=this.closest("form").find("#Form_AddForm_ParentID_Holder .TreeDropdownField");e.setValue(""),e.setTitle("")}}}),t(".cms-add-form").entwine({ParentID:0,ParentCache:{},onadd:function(){var t=this;this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField").bind("change",function(){t.updateTypeList()}),this.find(".SelectionGroup.parent-mode").bind("change",function(){t.updateTypeList()}),this.updateTypeList()},loadCachedChildren:function(t){var e=this.getParentCache();return"undefined"!=typeof e[t]?e[t]:null},saveCachedChildren:function(t,e){var n=this.getParentCache();n[t]=e,this.setParentCache(n)},updateTypeList:function(){var e=this.data("hints"),n=this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField"),i=this.find("input[name=ParentModeField]:checked").val(),a=n.data("metadata"),o=a&&"child"===i?n.getValue()||this.getParentID():null,r=a?a.ClassName:null,s=r&&"child"===i?r:"Root",d="undefined"!=typeof e[s]?e[s]:null,l=this,c=d&&"undefined"!=typeof d.defaultChild?d.defaultChild:null,u=[];if(o){if(this.hasClass("loading"))return;return this.addClass("loading"),this.setParentID(o),n.getValue()||n.setValue(o),u=this.loadCachedChildren(o),null!==u?(this.updateSelectionFilter(u,c),void this.removeClass("loading")):(t.ajax({url:l.data("childfilter"),data:{ParentID:o},success:function(t){l.saveCachedChildren(o,t),l.updateSelectionFilter(t,c)},complete:function(){l.removeClass("loading")}}),!1)}u=d&&"undefined"!=typeof d.disallowedChildren?d.disallowedChildren:[],this.updateSelectionFilter(u,c)},updateSelectionFilter:function(e,n){var i=null;if(this.find("#Form_AddForm_PageType li").each(function(){var n=t(this).find("input").val(),a=-1===t.inArray(n,e);t(this).setEnabled(a),a||t(this).setSelected(!1),i=null===i?a:i&&a}),n)var a=this.find("#Form_AddForm_PageType li input[value="+n+"]").parents("li:first");else var a=this.find("#Form_AddForm_PageType li:not(.disabled):first");a.setSelected(!0),a.siblings().setSelected(!1);var o=this.find("#Form_AddForm_PageType li:not(.disabled)").length?"enable":"disable";this.find("button[name=action_doAdd]").button(o),this.find(".message-restricted")[i?"hide":"show"]()}}),t(".cms-add-form #Form_AddForm_PageType li").entwine({onclick:function(t){this.setSelected(!0)},setSelected:function(t){var e=this.find("input");t&&!e.is(":disabled")?(this.siblings().setSelected(!1),this.toggleClass("selected",!0),e.prop("checked",!0)):(this.toggleClass("selected",!1),e.prop("checked",!1))},setEnabled:function(e){t(this).toggleClass("disabled",!e),e?t(this).find("input").removeAttr("disabled"):t(this).find("input").attr("disabled","disabled").removeAttr("checked")}}),t(".cms-page-add-button").entwine({onclick:function(e){var n=t(".cms-tree"),i=t(".cms-list"),a=0;if(n.is(":visible")){var o=n.jstree("get_selected");a=o?t(o[0]).data("id"):null}else{var r=i.find('input[name="Page[GridState]"]').val();r&&(a=parseInt(JSON.parse(r).ParentID,10))}var s,d={selector:this.data("targetPanel"),pjax:this.data("pjax")};a?(extraParams=this.data("extraParams")?this.data("extraParams"):"",s=t.path.addSearchParams(i18n.sprintf(this.data("urlAddpage"),a),extraParams)):s=this.attr("href"),t(".cms-container").loadPanel(s,null,d),e.preventDefault(),this.blur()}})})},{jQuery:"jQuery"}],2:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss",function(t){t(".cms-edit-form :input[name=ClassName]").entwine({onchange:function(){alert(s["default"]._t("CMSMAIN.ALERTCLASSNAME"))}}),t(".cms-edit-form input[name=Title]").entwine({onmatch:function(){var e=this;e.data("OrigVal",e.val());var n=e.closest("form"),i=t("input:text[name=URLSegment]",n),a=t("input[name=LiveLink]",n);i.length>0&&(e._addActions(),this.bind("change",function(n){var o=e.data("OrigVal"),r=e.val();e.data("OrigVal",r),0===i.val().indexOf(i.data("defaultUrl"))&&""==a.val()?e.updateURLSegment(r):t(".update",e.parent()).show(),e.updateRelatedFields(r,o),e.updateBreadcrumbLabel(r)})),this._super()},onunmatch:function(){this._super()},updateRelatedFields:function(e,n){this.parents("form").find("input[name=MetaTitle], input[name=MenuTitle]").each(function(){var i=t(this);i.val()==n&&(i.val(e),i.updatedRelatedFields&&i.updatedRelatedFields())})},updateURLSegment:function(e){var n=t("input:text[name=URLSegment]",this.closest("form")),i=n.closest(".field.urlsegment"),a=t(".update",this.parent());i.update(e),a.is(":visible")&&a.hide()},updateBreadcrumbLabel:function(e){var n=(t(".cms-edit-form input[name=ID]").val(),t("span.cms-panel-link.crumb"));e&&""!=e&&n.text(e)},_addActions:function(){var e,n=this;e=t("<button />",{"class":"update ss-ui-button-small",text:s["default"]._t("URLSEGMENT.UpdateURL"),type:"button",click:function(t){t.preventDefault(),n.updateURLSegment(n.val())}}),e.insertAfter(n),e.hide()}}),t(".cms-edit-form .parentTypeSelector").entwine({onmatch:function(){var t=this;this.find(":input[name=ParentType]").bind("click",function(e){t._toggleSelection(e)}),this.find(".TreeDropdownField").bind("change",function(e){t._changeParentId(e)}),this._changeParentId(),this._toggleSelection(),this._super()},onunmatch:function(){this._super()},_toggleSelection:function(e){var n=this.find(":input[name=ParentType]:checked").val(),i=this.find("#Form_EditForm_ParentID_Holder");"root"==n?this.find(":input[name=ParentID]").val(0):this.find(":input[name=ParentID]").val(this.find("#Form_EditForm_ParentType_subpage").data("parentIdValue")),"root"!=n?i.slideDown(400,function(){t(this).css("overflow","visible")}):i.slideUp()},_changeParentId:function(t){var e=this.find(":input[name=ParentID]").val();this.find("#Form_EditForm_ParentType_subpage").data("parentIdValue",e)}}),t(".cms-edit-form #CanViewType, .cms-edit-form #CanEditType, .cms-edit-form #CanCreateTopLevelType").entwine({onmatch:function(){var e;"CanViewType"==this.attr("id")?e=t("#Form_EditForm_ViewerGroups_Holder"):"CanEditType"==this.attr("id")?e=t("#Form_EditForm_EditorGroups_Holder"):"CanCreateTopLevelType"==this.attr("id")&&(e=t("#Form_EditForm_CreateTopLevelGroups_Holder")),this.find(".optionset :input").bind("change",function(n){var i=t(this).closest(".middleColumn").parent("div");"OnlyTheseUsers"==n.target.value?(i.addClass("remove-splitter"),e.show()):(i.removeClass("remove-splitter"),e.hide())});var n=this.find("input[name="+this.attr("id")+"]:checked").val();e["OnlyTheseUsers"==n?"show":"hide"](),this._super()},onunmatch:function(){this._super()}}),t(".cms-edit-form .Actions #Form_EditForm_action_print").entwine({onclick:function(e){var n=t(this[0].form).attr("action").replace(/\?.*$/,"")+"/printable/"+t(":input[name=ID]",this[0].form).val();return"http://"!=n.substr(0,7)&&(n=t("base").attr("href")+n),window.open(n,"printable"),!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_rollback").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=n?s["default"].sprintf(s["default"]._t("CMSMain.RollbackToVersion"),n):s["default"]._t("CMSMain.ConfirmRestoreFromLive"),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_archive").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.Archive"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_restore").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="",a=this.data("toRoot");return i=s["default"].sprintf(s["default"]._t(a?"CMSMain.RestoreToRoot":"CMSMain.Restore"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_delete").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.DeleteFromDraft"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form .Actions #Form_EditForm_action_unpublish").entwine({onclick:function(t){var e=this.parents("form:first"),n=e.find(":input[name=Version]").val(),i="";return i=s["default"].sprintf(s["default"]._t("CMSMain.Unpublish"),n),confirm(i)?this._super(t):!1}}),t(".cms-edit-form.changed").entwine({onmatch:function(t){this.find("button[name=action_save]").button("option","showingAlternate",!0),this.find("button[name=action_publish]").button("option","showingAlternate",!0),this._super(t)},onunmatch:function(t){var e=this.find("button[name=action_save]");e.data("button")&&e.button("option","showingAlternate",!1);var n=this.find("button[name=action_publish]");n.data("button")&&n.button("option","showingAlternate",!1),this._super(t)}}),t(".cms-edit-form .Actions button[name=action_publish]").entwine({onbuttonafterrefreshalternate:function(){this.button("option","showingAlternate")?this.addClass("ss-ui-action-constructive"):this.removeClass("ss-ui-action-constructive")}}),t(".cms-edit-form .Actions button[name=action_save]").entwine({onbuttonafterrefreshalternate:function(){this.button("option","showingAlternate")?this.addClass("ss-ui-action-constructive"):this.removeClass("ss-ui-action-constructive")}}),t('.cms-edit-form.CMSPageSettingsController input[name="ParentType"]:checked').entwine({onmatch:function(){this.redraw(),this._super()},onunmatch:function(){this._super()},redraw:function(){var e=t(".cms-edit-form.CMSPageSettingsController #Form_EditForm_ParentID_Holder");"Form_EditForm_ParentType_root"==t(this).attr("id")?e.slideUp():e.slideDown()},onclick:function(){this.redraw()}}),"Form_EditForm_ParentType_root"==t('.cms-edit-form.CMSPageSettingsController input[name="ParentType"]:checked').attr("id")&&t(".cms-edit-form.CMSPageSettingsController #Form_EditForm_ParentID_Holder").hide()})},{i18n:"i18n",jQuery:"jQuery"}],3:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss.tree",function(t){t(".cms-tree").entwine({fromDocument:{"oncontext_show.vakata":function(t){this.adjustContextClass()}},adjustContextClass:function(){var e=t("#vakata-contextmenu").find("ul ul");e.each(function(n){var i="1",a=t(e[n]).find("li").length;a>20?i="3":a>10&&(i="2"),t(e[n]).addClass("col-"+i).removeClass("right"),t(e[n]).find("li").on("mouseenter",function(e){t(this).parent("ul").removeClass("right")})})},getTreeConfig:function(){var e=this,n=this._super();this.getHints();return n.plugins.push("contextmenu"),n.contextmenu={items:function(n){var i={edit:{label:s["default"]._t("Tree.EditPage","Edit page",100,"Used in the context menu when right-clicking on a page node in the CMS tree"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(s["default"].sprintf(e.data("urlEditpage"),n.data("id")))}}};n.hasClass("nochildren")||(i.showaslist={label:s["default"]._t("Tree.ShowAsList"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(e.data("urlListview")+"&ParentID="+n.data("id"),null,{tabState:{"pages-controller-cms-content":{tabSelector:".content-listview"}}})}});var a=(n.data("pagetype"),n.data("id")),o=n.find(">a .item").data("allowedchildren"),r={},d=!1;return t.each(o,function(n,i){d=!0,r["allowedchildren-"+n]={label:'<span class="jstree-pageicon"></span>'+i,_class:"class-"+n,action:function(i){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlAddpage"),a,n),e.data("extraParams")))}}}),d&&(i.addsubpage={label:s["default"]._t("Tree.AddSubPage","Add page under this page",100,"Used in the context menu when right-clicking on a page node in the CMS tree"),submenu:r}),i.duplicate={label:s["default"]._t("Tree.Duplicate"),submenu:[{label:s["default"]._t("Tree.ThisPageOnly"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlDuplicate"),n.data("id")),e.data("extraParams")))}},{label:s["default"]._t("Tree.ThisPageAndSubpages"),action:function(n){t(".cms-container").entwine(".ss").loadPanel(t.path.addSearchParams(s["default"].sprintf(e.data("urlDuplicatewithchildren"),n.data("id")),e.data("extraParams")))}}]},i}},n}}),t(".cms-tree a.jstree-clicked").entwine({onmatch:function(){var t,e=this,n=e.parents(".cms-panel-content");(e.offset().top<0||e.offset().top>n.height()-e.height())&&(t=n.scrollTop()+e.offset().top+n.height()/2,n.animate({scrollTop:t},"slow"))}}),t(".cms-tree-filtered .clear-filter").entwine({onclick:function(){window.location=location.protocol+"//"+location.host+location.pathname}}),t(".cms-tree-filtered").entwine({onmatch:function(){var e=this,n=function(){var n=t(".cms-content-tools .cms-panel-content").height()-e.parent().siblings(".cms-content-toolbar").outerHeight(!0);e.css("height",n+"px")};n(),t(window).on("resize",window.ss.debounce(n,300))}})})},{i18n:"i18n",jQuery:"jQuery"}],4:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".cms-content-header-info").entwine({"from .cms-panel":{ontoggle:function(t){var e=this.closest(".cms-content").find(t.target);0!==e.length&&this.parent()[e.hasClass("collapsed")?"addClass":"removeClass"]("collapsed")}}}),t(".cms-content-toolbar").entwine({onmatch:function(){var e=this;this._super(),t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var n=t(this),i=n.data("toolid");n.hasClass("active");void 0!==i&&(n.data("active",!1).removeClass("active"),t("#"+i).hide(),e.bindActionButtonEvents(n))})},onunmatch:function(){var e=this;this._super(),t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var n=t(this);e.unbindActionButtonEvents(n)})},bindActionButtonEvents:function(t){var e=this;t.on("click.cmsContentToolbar",function(n){e.showHideTool(t)})},unbindActionButtonEvents:function(t){t.off(".cmsContentToolbar")},showHideTool:function(e){var n=e.data("active"),i=e.data("toolid"),a=t("#"+i);t.each(this.find(".cms-actions-buttons-row .tool-button"),function(){var e=t(this),n=t("#"+e.data("toolid"));e.data("toolid")!==i&&(n.hide(),e.data("active",!1))}),e[n?"removeClass":"addClass"]("active"),a[n?"hide":"show"](),e.data("active",!n)}})})},{jQuery:"jQuery"}],5:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a),r=t("i18n"),s=i(r);o["default"].entwine("ss",function(t){t("#Form_VersionsForm").entwine({onmatch:function(){this._super()},onunmatch:function(){this._super()},onsubmit:function(e,n){e.preventDefault();var i;if(i=this.find(":input[name=ID]").val(),!i)return!1;var a,o,r,d,l,c;if(c=this.find(":input[name=CompareMode]").is(":checked"),r=this.find("table input[type=checkbox]").filter(":checked"),c){if(2!=r.length)return!1;d=r.eq(0).val(),l=r.eq(1).val(),a=this.find(":submit[name=action_doCompare]"),o=s["default"].sprintf(this.data("linkTmplCompare"),i,l,d)}else d=r.eq(0).val(),a=this.find(":submit[name=action_doShowVersion]"),o=s["default"].sprintf(this.data("linkTmplShow"),i,d);t(".cms-container").loadPanel(o,"",{pjax:"CurrentForm"})}}),t("#Form_VersionsForm input[name=ShowUnpublished]").entwine({onmatch:function(){this.toggle(),this._super()},onunmatch:function(){this._super()},onchange:function(){this.toggle()},toggle:function(){var e=t(this),n=e.parents("form");e.attr("checked")?n.find("tr[data-published=false]").show():n.find("tr[data-published=false]").hide()._unselect()}}),t("#Form_VersionsForm tbody tr").entwine({onclick:function(t){var e,n;return e=this.parents("form").find(":input[name=CompareMode]").attr("checked"),n=this.siblings(".active"),e&&this.hasClass("active")?void this._unselect():e?n.length>1?alert(s["default"]._t("ONLYSELECTTWO","You can only compare two versions at this time.")):(this._select(),void(1==n.length&&this.parents("form").submit())):(this._select(),n._unselect(),this.parents("form").submit(),void 0)},_unselect:function(){this.removeClass("active"),this.find(":input[type=checkbox]").attr("checked",!1)},_select:function(){this.addClass("active"),this.find(":input[type=checkbox]").attr("checked",!0)}})})},{i18n:"i18n",jQuery:"jQuery"}],6:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t("#Form_EditForm_RedirectionType input").entwine({onmatch:function(){var e=t(this);e.attr("checked")&&this.toggle(),this._super()},onunmatch:function(){this._super()},onclick:function(){this.toggle()},toggle:function(){"Internal"==t(this).attr("value")?(t("#Form_EditForm_ExternalURL_Holder").hide(),t("#Form_EditForm_LinkToID_Holder").show()):(t("#Form_EditForm_ExternalURL_Holder").show(),t("#Form_EditForm_LinkToID_Holder").hide())}})})},{jQuery:"jQuery"}],7:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function a(t){var e=document.getElementsByTagName("base")[0].href.replace("http://","").replace(/\//g,"_").replace(/\./g,"_");return e+t}var o=t("jQuery"),r=i(o);(0,r["default"])(document).ready(function(){(0,r["default"])("#switchView a.newWindow").on("click",function(t){var e=window.open(this.href,a(this.target));return e.focus(),!1}),(0,r["default"])("#SilverStripeNavigatorLink").on("click",function(t){return(0,r["default"])("#SilverStripeNavigatorLinkPopup").toggle(),!1}),(0,r["default"])("#SilverStripeNavigatorLinkPopup a.close").on("click",function(t){return(0,r["default"])("#SilverStripeNavigatorLinkPopup").hide(),!1}),(0,r["default"])("#SilverStripeNavigatorLinkPopup input").on("focus",function(t){this.select()})})},{jQuery:"jQuery"}],8:[function(t,e,n){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}var a=t("jQuery"),o=i(a);o["default"].entwine("ss",function(t){t(".field.urlsegment:not(.readonly)").entwine({MaxPreviewLength:55,Ellipsis:"...",onmatch:function(){this.find(":text").length&&this.toggleEdit(!1),this.redraw(),this._super()},redraw:function(){var t=this.find(":text"),e=decodeURI(t.data("prefix")+t.val()),n=e;e.length>this.getMaxPreviewLength()&&(n=this.getEllipsis()+e.substr(e.length-this.getMaxPreviewLength(),e.length)),this.find(".preview").attr("href",encodeURI(e+t.data("suffix"))).text(n)},toggleEdit:function(t){var e=this.find(":text");this.find(".preview-holder")[t?"hide":"show"](),this.find(".edit-holder")[t?"show":"hide"](),t&&(e.data("origval",e.val()),e.focus())},update:function(){var t=this,e=this.find(":text"),n=e.data("origval"),i=arguments[0],a=i&&""!==i?i:e.val();n!=a?(this.addClass("loading"),this.suggest(a,function(n){e.val(decodeURIComponent(n.value)),t.toggleEdit(!1),t.removeClass("loading"),t.redraw()})):(this.toggleEdit(!1),this.redraw())},cancel:function(){var t=this.find(":text");t.val(t.data("origval")),this.toggleEdit(!1)},suggest:function(e,n){var i=this,a=i.find(":text"),o=t.path.parseUrl(i.closest("form").attr("action")),r=o.hrefNoSearch+"/field/"+a.attr("name")+"/suggest/?value="+encodeURIComponent(e);o.search&&(r+="&"+o.search.replace(/^\?/,"")),t.ajax({url:r,success:function(t){n.apply(this,arguments)},error:function(t,e){t.statusText=t.responseText},complete:function(){i.removeClass("loading")}})}}),t(".field.urlsegment .edit").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").toggleEdit(!0)}}),t(".field.urlsegment .update").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").update()}}),t(".field.urlsegment .cancel").entwine({onclick:function(t){t.preventDefault(),this.closest(".field").cancel()}})})},{jQuery:"jQuery"}],9:[function(t,e,n){"use strict";t("../../src/CMSMain.AddForm.js"),t("../../src/CMSMain.EditForm.js"),t("../../src/CMSMain.js"),t("../../src/CMSMain.Tree.js"),t("../../src/CMSPageHistoryController.js"),t("../../src/RedirectorPage.js"),t("../../src/SilverStripeNavigator.js"),t("../../src/SiteTreeURLSegmentField.js")},{"../../src/CMSMain.AddForm.js":1,"../../src/CMSMain.EditForm.js":2,"../../src/CMSMain.Tree.js":3,"../../src/CMSMain.js":4,"../../src/CMSPageHistoryController.js":5,"../../src/RedirectorPage.js":6,"../../src/SilverStripeNavigator.js":7,"../../src/SiteTreeURLSegmentField.js":8}]},{},[9]);
-//# sourceMappingURL=bundle-legacy.js.map
diff --git a/javascript/src/bundles/legacy.js b/javascript/src/bundles/legacy.js
deleted file mode 100644
index bef9b487..00000000
--- a/javascript/src/bundles/legacy.js
+++ /dev/null
@@ -1,8 +0,0 @@
-require('../../src/CMSMain.AddForm.js');
-require('../../src/CMSMain.EditForm.js');
-require('../../src/CMSMain.js');
-require('../../src/CMSMain.Tree.js');
-require('../../src/CMSPageHistoryController.js');
-require('../../src/RedirectorPage.js');
-require('../../src/SilverStripeNavigator.js');
-require('../../src/SiteTreeURLSegmentField.js');