Routers refactored to use controllers