reorganized accoirding to proj reqs