Work-in-progress of content package management clean up / rewrite.