refactor: simplify internal package ownership (#2539)