some rename according to convention
Searcher class added (test for now)