package strutcture refactoring