Re-organize emacs.d/init.el again