Restructured the emacs configuration