Re-structuring everything and going back to Emacs 24.3