Submodule reworking