Refactored packaging