Changed Package Helper invocation builders to create per-class instead of per-package