Reorganize, get rid of one project