Restructure gulp tasks