Adding in matcher and scorer plugin system, moved code to use plugins