further modularizes Auth and Router services
further modularizes Auth and Router services