Refactor .emacs.d