Refactored application routers