Emacs: Use lisp subfolder

.emacs.d/init.el

@@ -27,7 +27,7 @@ Example: to assign some-function to C-i, use
     (make-directory emacs-cache-folder t))
 
 ;; Load config easily.
-(add-to-list 'load-path "~/.emacs.d")
+(add-to-list 'load-path "~/.emacs.d/lisp")
 
 ;; Local plugin folder for quick install. All files in this folder will be
 ;; accessible to Emacs config. This is done to separate the versioned config

.emacs.d/local.el

@@ -1,24 +0,0 @@
-;; Temp fix:
-;; http://blog.gmane.org/gmane.emacs.cc-mode.general
-;; (message "@@@ LOADED")
-;; (defmacro c-with-all-but-one-cpps-commented-out (beg end &rest forms)
-;;   ;; Execute FORMS... whilst the syntactic effect of all characters in
-;;   ;; every CPP region APART FROM THE ONE BETWEEN BEG and END is
-;;   ;; suppressed.
-;;   (message "@@@ C FIX")
-;;   `(unwind-protect
-;;        (c-save-buffer-state ()
-;;          (save-restriction
-;;            (widen)
-;;            (c-clear-cpp-delimiters ,beg ,end))
-;;          ,`(c-with-cpps-commented-out ,@forms))
-;;      (c-save-buffer-state ()
-;;        (save-restriction
-;;          (widen)
-;;          (c-set-cpp-delimiters ,beg ,end)))))
-
-;; Org Mode
-(eval-after-load "org"
-  '(progn
-     (add-to-list
-      'org-agenda-files "~/projects/kth-ta/agenda.org")))