clean up, moving around, fix reqs