Project structure and class naming refactoring