Move vendors to core