Updated root config files and played with gulpfile.js