Reorganized search.lisp