reorganization, app.js cleaner