major classification refactorings