move modules to submodules