Moved Matching rule data types into their own ns
Remove unrequired interfaces for Matching mappers