Restructure to aid new top-level Workbench sections
(cherry picked from commit 6340b17a9c9539fcc3fef4f71f256df0f51d6e80)