Refactored the project structure.