Major package refactoring.