separated admin and app, updated router's logic