Re-introduce submodules