Refactoring the project files and class names