moved searcher into controller package
reorged some files