Reorganized project into different purpose