package structure refactoring