Some general defun were extracted in util namespace. Search namespace were renamed.