adopt lib/vendor structure
Merge pull request #8328 from rolandwalker/vendor_structure

adopt lib/vendor structure