remade the gulp structure