Package structure refactor