moved a bunch from vendor to package-list-packages