Fix and simplify submodules setup