refactored gulp structure