Reorganized project layout.