[TASK] Accounts: Routing changes for improved architecture