resolve commit conflict from config.js
restructure app files for project on heroku