Refactor submodule structure
Refactor submodule structure