Refactor - Move all message matching related classes to 'matchers' package