Finish conversion to Gulp