package refactoring (3)