Correct submodules mess