refactor routers
Refactor routers