major refactoring of emacs init files