Fix whitespace in app.js
Reorg angular files into areas