Clean up utils, resoliving deps
Clean up reqs, fix bad module names