Revert "moved to vendor, renamed"

This reverts commit 94079f731ca85774ce446c0dffaf2426cb85d321.