moving search helpers into modules

moving search helpers into modules