Update split to separate package_id into org and offering