Update gulp tasks and structure