Reorganised Vendor Includes (final)