prepared class for new matcher
clean up

removed old plugin config
moved old classes to separate package
removed unused class