some package refactorings