Package structure refactoring