Simplify Vendor folder

Reorganize some stuff