Moved dependencies into submodules