Fix gulpfile, change structure