Major refactor of gulpfile