move match sets into its own directory
add MatchSet module to match classes