Updated gulp and src files
- trying to solve the issue with gulp by changing some flow