Small package refactoring.