Complete refactor of app.js
Merge branch 'feature/refactor-app-js' into develop