Added MatchDay entity and some refactoring.