Tons of changes to get this closer to being buildable from this directory;

still far away, but a lot closer than it was.