Simplified the project structure.