Auth + Routing Refactor