some reorganizing in gulp