package refactoring (2)