Minor reorganization of emacs packages