Make original ClusterMatcher inherit from AbstractClusterMatcher. Reorganize code...