Replace package_id with org and offering
and fix other problems and related signatures