Move lisp packages to lisp/

Emacs warned that including the way I was including the load path might
cause problems. This was a suggested solution.