Put the Match class in a separate module