Reorganized project layout