Reworking of the content package builder.