Improved logic and build files
Change app.js