Refactor gulpfile and enabled es6