Update gulpfile based on new dir structure
Update dir structure