reorganized for new Curse Packaging System