Introduce submodules, closes #8536