Conversion to submodule sanity