Refactor vendor folder