Fix submodule structure