Refactoring of Classes