Reorganised Vendor Includes