more file moving, app.js and package.json content updated