Refactored packacke structure