Move otext to deps/src/misc.

Also tidy up some of Makefiles for deps reorg.