Some package refactoring changes