WIP refactor common features into RoutingBundle