Refactor gulp plugins
Refactor watch