Move lisp files around for 24.4

Also add helm bindings etc, few other things.