Renamed Data to MatchData
more refactors
Fix Failing Test Logic