Organize app.js