Refactoring class and file name