Refactoring the project structure.