Add lots of things to .emacs and adjust structure