fixing submodule mappings
better mapping of submodules