Reworked gulpfile.js