Refactor submodules