Additional refactoring of package names.