Reorganised Vendor Includes (might work now)