refactor chunk-matching; move code into proper place; 

* use a class instance instead of globals in whoosh matcher class
* move/rename the kwd chunk matchers