restructure + gulp tasks