RFC: Navigation restructuring