Move elisp into lisp/ directory, to appease new Emacs warning