Better org handling in the emacs setup