Refactoring of program files
Refactoring of class names