migration to submodules: stage 1