Account for renamed in newly rebased code
Extract sub-menus and dialogs out into classes