Package structure Refactored