Move PackageGenerator logic to EmailAdapter