Restructure to aid new top-level Workbench sections