reorganized gulp template