Reorganizing angular app
Fixing broken middleware