more package refactoring