Moved things, write a few test outlines.

Now for the real work! Someone needs to try and implement the tests, add
their own, and see if everything works.