Refactor the scopes
Remove scopes

We refactored the Matcher class, so that we don't need those scopes anymore
Refactor Matcher class

Christoph helped us rewrite it so that we don't need the scopes from Incoming Events.
Create pending tests for Matcher class

to be continued/improved