Some package refactoring.