move more stuff to melpa packages