Updated Similarity Measures to match new metric types. Combined all
classes for Matching Similarity in only three.