Update and fix up the repo. Make it a little more orderly.