submodules directories refactoring