Fix gulpfile organization