Angular Routing for App
Refactor Middleware