reorganized gulpfile