package refactorings