Moved submodules under deps to be consistent.
Merge pull request #32 from murrekatt/develop

Moved submodules under deps to be consistent.