Refactoring for better package organization and other changes.