Classes refactoring.