Refactor class WeekMatch and all the classes that use it