Reorganized project slightly