submodules restructurization