name refactoring & create new Class