Refactor routers