Reorganized project structure