Simplify Vendor folder