Refactor router and auth work.