Delete MatchInfo class
move MatchInfo properties in Match class
Re-organize Service using Match