Added submodules correctly.
Moved a couple more into submodules.