Refactor gulp

not finished now.
Just a few proposals