classes' hierarchy refactoring