Move things around to work better as a submodule.