Moving more stuff to submodules, step one.
Moving more stuff to submodules, step two.