minor package refactoring