Refactor vendorsetup build tweaks & included packages