package refactoring (1)