Transfer of legacy components to submodule