Refactor submodule structure