diff --git a/init.el b/init.el
index ffd1bd2..d019adf 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,6 @@
 ;; Generic Emacs stuff
-(add-to-list 'load-path "~/.emacs.d")
+(add-to-list 'load-path "~/.emacs.d/modes/")
+(add-to-list 'load-path "~/.emacs.d/misc/")
 (show-paren-mode 1)
 
 ;; multi-term
diff --git a/flymake.el b/misc/flymake.el
similarity index 100%
rename from flymake.el
rename to misc/flymake.el
diff --git a/multi-term.el b/misc/multi-term.el
similarity index 100%
rename from multi-term.el
rename to misc/multi-term.el
diff --git a/whitespace.el b/misc/whitespace.el
similarity index 100%
rename from whitespace.el
rename to misc/whitespace.el
diff --git a/drupal-mode.el b/modes/drupal-mode.el
similarity index 100%
rename from drupal-mode.el
rename to modes/drupal-mode.el
diff --git a/kivy-mode.el b/modes/kivy-mode.el
similarity index 100%
rename from kivy-mode.el
rename to modes/kivy-mode.el
diff --git a/markdown-mode.el b/modes/markdown-mode.el
similarity index 100%
rename from markdown-mode.el
rename to modes/markdown-mode.el
diff --git a/php-mode.el b/modes/php-mode.el
similarity index 100%
rename from php-mode.el
rename to modes/php-mode.el
diff --git a/scss-mode.el b/modes/scss-mode.el
similarity index 100%
rename from scss-mode.el
rename to modes/scss-mode.el