Cleaned up packages for emacs