Reorganized project structure and config