Re-organization of gulp tasks