Submodules reorganization