Refactoring + create new class using dialog