solution reorganized for submodules support