Reorganized project structure and naming