Package structure reworked.