Refactored project structure and gulpfile