.emacs-init.org: minor restructuring