changing to submodules