reorganized gulpfile.js part 1
reorganized gulpfile.js part 2