reorganize for Curse Packaging System