Moved submodules under deps to be consistent.