Reorganized project directory structure