Cleanup: Move stuff around a bit.
Update README a wee bit.