Fix keyword-search for Elisp (cl-style defun* etc)
Reorganize source-file.