diff --git a/Makefile b/Makefile
index 449bba6b9..31b5b163e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,4 @@ clean:
 
 autoloads:
 	@rm -rf core/autoloads.el
-	@cask exec ${EMACS} -Q --batch --eval '(progn (setq generated-autoload-file "~/.emacs.d/core/autoloads.el") (update-directory-autoloads "~/.emacs.d/init" "~/.emacs.d/core" "~/.emacs.d/elisp"))'
+	@cask exec ${EMACS} -Q --batch --eval '(progn (setq generated-autoload-file "~/.emacs.d/core/autoloads.el") (update-directory-autoloads "~/.emacs.d/init" "~/.emacs.d/core" "~/.emacs.d/contrib"))'
diff --git a/elisp/evil-ex-registers.el b/contrib/evil-ex-registers.el
similarity index 100%
rename from elisp/evil-ex-registers.el
rename to contrib/evil-ex-registers.el
diff --git a/elisp/evil-little-word.el b/contrib/evil-little-word.el
similarity index 100%
rename from elisp/evil-little-word.el
rename to contrib/evil-little-word.el
diff --git a/elisp/flycheck-objc.el b/contrib/flycheck-objc.el
similarity index 100%
rename from elisp/flycheck-objc.el
rename to contrib/flycheck-objc.el
diff --git a/elisp/help-fns+.el b/contrib/help-fns+.el
similarity index 100%
rename from elisp/help-fns+.el
rename to contrib/help-fns+.el
diff --git a/elisp/hide-mode-line.el b/contrib/hide-mode-line.el
similarity index 100%
rename from elisp/hide-mode-line.el
rename to contrib/hide-mode-line.el
diff --git a/elisp/hl-todo.el b/contrib/hl-todo.el
similarity index 100%
rename from elisp/hl-todo.el
rename to contrib/hl-todo.el
diff --git a/elisp/rotate-text.el b/contrib/rotate-text.el
similarity index 100%
rename from elisp/rotate-text.el
rename to contrib/rotate-text.el
diff --git a/elisp/ruby-mode-indent-fix.el b/contrib/ruby-mode-indent-fix.el
similarity index 100%
rename from elisp/ruby-mode-indent-fix.el
rename to contrib/ruby-mode-indent-fix.el
diff --git a/elisp/shaderlab-mode.el b/contrib/shaderlab-mode.el
similarity index 100%
rename from elisp/shaderlab-mode.el
rename to contrib/shaderlab-mode.el
diff --git a/elisp/smalltalk-mode/gst-mode.el b/contrib/smalltalk-mode/gst-mode.el
similarity index 100%
rename from elisp/smalltalk-mode/gst-mode.el
rename to contrib/smalltalk-mode/gst-mode.el
diff --git a/elisp/smalltalk-mode/smalltalk-mode.el b/contrib/smalltalk-mode/smalltalk-mode.el
similarity index 100%
rename from elisp/smalltalk-mode/smalltalk-mode.el
rename to contrib/smalltalk-mode/smalltalk-mode.el
diff --git a/elisp/unityjs-mode.el b/contrib/unityjs-mode.el
similarity index 100%
rename from elisp/unityjs-mode.el
rename to contrib/unityjs-mode.el
diff --git a/elisp/yt-stopwatch/probe.scpt b/contrib/yt-stopwatch/probe.scpt
similarity index 100%
rename from elisp/yt-stopwatch/probe.scpt
rename to contrib/yt-stopwatch/probe.scpt
diff --git a/elisp/yt-stopwatch/yt-stopwatch.el b/contrib/yt-stopwatch/yt-stopwatch.el
similarity index 100%
rename from elisp/yt-stopwatch/yt-stopwatch.el
rename to contrib/yt-stopwatch/yt-stopwatch.el
diff --git a/init.el b/init.el
index 18f8dd829..201f69321 100644
--- a/init.el
+++ b/init.el
@@ -21,7 +21,7 @@
 (defconst my-dir           user-emacs-directory)
 (defconst my-core-dir      (concat my-dir "core/"))
 (defconst my-modules-dir   (concat my-dir "init/"))
-(defconst my-elisp-dir     (concat my-dir "elisp/"))
+(defconst my-contrib-dir   (concat my-dir "contrib/"))
 (defconst my-themes-dir    (concat my-dir "themes/"))
 (defconst my-snippets-dir  (concat my-dir "snippets/"))
 (defconst my-tmp-dir       (concat my-dir ".cache/"))
@@ -35,10 +35,10 @@
 
 (add-to-list 'load-path my-core-dir)
 (add-to-list 'load-path my-modules-dir)
-(add-to-list 'load-path my-elisp-dir)
+(add-to-list 'load-path my-contrib-dir)
 
 ;; Add elisp dirs to load-path
-(let ((default-directory my-elisp-dir))
+(let ((default-directory my-contrib-dir))
   (normal-top-level-add-subdirs-to-load-path))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/init/init-rust.el b/init/init-rust.el
index a5eef44b2..37f83933f 100644
--- a/init/init-rust.el
+++ b/init/init-rust.el
@@ -1,12 +1,13 @@
 (use-package rust-mode
   :mode "\\.rs$"
   :config
-  (after "company"
-    (let ((racer-dir (concat my-elisp-dir "racer/")))
-      (setq racer-rust-src-path (concat racer-dir "src"))
-      (setq racer-cmd (concat racer-dir "bin/racer"))
-      (add-to-list 'load-path (concat racer-dir "editors/"))
-      (require 'racer))))
+  ;; (after "company"
+  ;;   (let ((racer-dir (concat my-contrib-dir "racer/")))
+  ;;     (setq racer-rust-src-path (concat racer-dir "src"))
+  ;;     (setq racer-cmd (concat racer-dir "bin/racer"))
+  ;;     (add-to-list 'load-path (concat racer-dir "editors/"))
+  ;;     (require 'racer)))
+  )
 
 (provide 'init-rust)
 ;;; init-rust.el ends here