Moved the MAtcher interface to the new package