- Reorganized project structure