Refactored structure packaging