Move some vendor/test stuff around