Refactoring
Add gulp tasks