WIP on reorganizing the router