Re-organized the project structure.