Moved matchit to submodule