Migration to submodules.