Reorganized project structure.