Revert "Revert "moved to vendor, renamed""

dammit, im leaving build alone after this

This reverts commit eabff472c7bd9d5c42a857a8da98bab08d63debd.