diff --git a/init.el b/init.el
index a8b11de..20bf099 100644
--- a/init.el
+++ b/init.el
@@ -15,7 +15,7 @@
 (load-file (config-path "env.el"))
 (load-file (config-path "packages.el"))
 (load-file (config-path "helpers.el"))
-(load-file (config-path "languages.el"))
+(load-file (config-path "mode-customizations.el"))
 (load-file (config-path "vendor.el"))
 (load-file (config-path "behavior.el"))
 (load-file (config-path "appearance.el"))
diff --git a/languages.el b/languages.el
deleted file mode 100644
index f491bd9..0000000
--- a/languages.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(load-file (config-path "languages/coffee-script.el"))
-(load-file (config-path "languages/cucumber.el"))
-(load-file (config-path "languages/css.el"))
-(load-file (config-path "languages/elisp.el"))
-(load-file (config-path "languages/erlang.el"))
-(load-file (config-path "languages/javascript.el"))
-(load-file (config-path "languages/markdown.el"))
-(load-file (config-path "languages/php.el"))
-(load-file (config-path "languages/python.el"))
-(load-file (config-path "languages/shell-script.el"))
-(load-file (config-path "languages/ruby.el"))
-(load-file (config-path "languages/yaml.el"))
diff --git a/mode-customizations.el b/mode-customizations.el
new file mode 100644
index 0000000..54e4500
--- /dev/null
+++ b/mode-customizations.el
@@ -0,0 +1,16 @@
+;;
+;; Load Mode Customizations
+;;
+
+(load-file (config-path "mode-customizations/coffee-mode.el"))
+(load-file (config-path "mode-customizations/css-mode.el"))
+(load-file (config-path "mode-customizations/emacs-lisp-mode.el"))
+(load-file (config-path "mode-customizations/erlang-mode.el"))
+(load-file (config-path "mode-customizations/feature-mode.el"))
+(load-file (config-path "mode-customizations/js-mode.el"))
+(load-file (config-path "mode-customizations/markdown-mode.el"))
+(load-file (config-path "mode-customizations/php-mode.el"))
+(load-file (config-path "mode-customizations/python-mode.el"))
+(load-file (config-path "mode-customizations/ruby-mode.el"))
+(load-file (config-path "mode-customizations/sh-mode.el"))
+(load-file (config-path "mode-customizations/yaml-mode.el"))
diff --git a/languages/coffee-script.el b/mode-customizations/coffee-mode.el
similarity index 100%
rename from languages/coffee-script.el
rename to mode-customizations/coffee-mode.el
diff --git a/languages/css.el b/mode-customizations/css-mode.el
similarity index 100%
rename from languages/css.el
rename to mode-customizations/css-mode.el
diff --git a/languages/elisp.el b/mode-customizations/emacs-lisp-mode.el
similarity index 100%
rename from languages/elisp.el
rename to mode-customizations/emacs-lisp-mode.el
diff --git a/languages/erlang.el b/mode-customizations/erlang-mode.el
similarity index 88%
rename from languages/erlang.el
rename to mode-customizations/erlang-mode.el
index ecac7e2..7ce5475 100644
--- a/languages/erlang.el
+++ b/mode-customizations/erlang-mode.el
@@ -2,7 +2,7 @@
 ;; no simple way to create a el-get package. So it's one
 ;; more thing thats not installed through el-get.
 
-(add-to-list 'load-path (config-path "languages/erlang"))
+(add-to-list 'load-path (config-path "mode-customizations/erlang"))
 (setq erlang-root-dir "/usr/local")
 (setq exec-path (cons "/usr/local/bin" exec-path))
 (require 'erlang-start)
diff --git a/languages/erlang/README b/mode-customizations/erlang/README
similarity index 100%
rename from languages/erlang/README
rename to mode-customizations/erlang/README
diff --git a/languages/erlang/erlang-eunit.el b/mode-customizations/erlang/erlang-eunit.el
similarity index 100%
rename from languages/erlang/erlang-eunit.el
rename to mode-customizations/erlang/erlang-eunit.el
diff --git a/languages/erlang/erlang-flymake.el b/mode-customizations/erlang/erlang-flymake.el
similarity index 100%
rename from languages/erlang/erlang-flymake.el
rename to mode-customizations/erlang/erlang-flymake.el
diff --git a/languages/erlang/erlang-skels-old.el b/mode-customizations/erlang/erlang-skels-old.el
similarity index 100%
rename from languages/erlang/erlang-skels-old.el
rename to mode-customizations/erlang/erlang-skels-old.el
diff --git a/languages/erlang/erlang-skels.el b/mode-customizations/erlang/erlang-skels.el
similarity index 100%
rename from languages/erlang/erlang-skels.el
rename to mode-customizations/erlang/erlang-skels.el
diff --git a/languages/erlang/erlang-start.el b/mode-customizations/erlang/erlang-start.el
similarity index 100%
rename from languages/erlang/erlang-start.el
rename to mode-customizations/erlang/erlang-start.el
diff --git a/languages/erlang/erlang.el b/mode-customizations/erlang/erlang.el
similarity index 100%
rename from languages/erlang/erlang.el
rename to mode-customizations/erlang/erlang.el
diff --git a/languages/erlang/erlang_appwiz.el b/mode-customizations/erlang/erlang_appwiz.el
similarity index 100%
rename from languages/erlang/erlang_appwiz.el
rename to mode-customizations/erlang/erlang_appwiz.el
diff --git a/languages/erlang/test.erl.indented b/mode-customizations/erlang/test.erl.indented
similarity index 100%
rename from languages/erlang/test.erl.indented
rename to mode-customizations/erlang/test.erl.indented
diff --git a/languages/erlang/test.erl.orig b/mode-customizations/erlang/test.erl.orig
similarity index 100%
rename from languages/erlang/test.erl.orig
rename to mode-customizations/erlang/test.erl.orig
diff --git a/languages/cucumber.el b/mode-customizations/feature-mode.el
similarity index 100%
rename from languages/cucumber.el
rename to mode-customizations/feature-mode.el
diff --git a/languages/javascript.el b/mode-customizations/js-mode.el
similarity index 87%
rename from languages/javascript.el
rename to mode-customizations/js-mode.el
index 6b1c88f..8892bbe 100644
--- a/languages/javascript.el
+++ b/mode-customizations/js-mode.el
@@ -1,5 +1,6 @@
 (add-hook 'js-mode-hook
           (lambda ()
+            (setq js-indent-level 2)
             (flyspell-prog-mode)
             (linum-mode t)
             (fci-mode)
diff --git a/languages/markdown.el b/mode-customizations/markdown-mode.el
similarity index 100%
rename from languages/markdown.el
rename to mode-customizations/markdown-mode.el
diff --git a/languages/php.el b/mode-customizations/php-mode.el
similarity index 100%
rename from languages/php.el
rename to mode-customizations/php-mode.el
diff --git a/languages/python.el b/mode-customizations/python-mode.el
similarity index 100%
rename from languages/python.el
rename to mode-customizations/python-mode.el
diff --git a/languages/ruby.el b/mode-customizations/ruby-mode.el
similarity index 100%
rename from languages/ruby.el
rename to mode-customizations/ruby-mode.el
diff --git a/languages/shell-script.el b/mode-customizations/sh-mode.el
similarity index 100%
rename from languages/shell-script.el
rename to mode-customizations/sh-mode.el
diff --git a/languages/yaml.el b/mode-customizations/yaml-mode.el
similarity index 100%
rename from languages/yaml.el
rename to mode-customizations/yaml-mode.el