change location of Match
Refactoring: uses match objects
Refactoring: Changed directories and modules of some classes
Tests for simple objects  --> TDD
New mocks for matchclasses