Convert to a more gulp-idiomatic structure