Gulpfile.js reorganized