Migrate Matchesxplayer class to a separate file