diff --git a/vim/settings/gh-markdown.vim b/vim/ftdetect/ghmarkdown.vim
similarity index 100%
rename from vim/settings/gh-markdown.vim
rename to vim/ftdetect/ghmarkdown.vim
diff --git a/vim/settings/es6.vim b/vim/ftdetect/javascript.vim
similarity index 100%
rename from vim/settings/es6.vim
rename to vim/ftdetect/javascript.vim
diff --git a/vim/settings/README.md b/vim/settings/README.md
index 961db938b6..79f0907c4d 100644
--- a/vim/settings/README.md
+++ b/vim/settings/README.md
@@ -2,7 +2,7 @@ This directory contains settings for various vim plugins and vim itself.
 
 ## Plugin Settings
 
-Each plugin's overrides/settings should be put in a separate file named `{plugin-name}.vim`.
+Each plugin's overrides/settings should be put in a separate file named `plugin-{plugin-name}.vim`.
 
 ## Vim Settings
 
diff --git a/vim/settings/NERDtree-tabs.vim b/vim/settings/plugin-NERDtree-tabs.vim
similarity index 100%
rename from vim/settings/NERDtree-tabs.vim
rename to vim/settings/plugin-NERDtree-tabs.vim
diff --git a/vim/settings/NERDtree.vim b/vim/settings/plugin-NERDtree.vim
similarity index 100%
rename from vim/settings/NERDtree.vim
rename to vim/settings/plugin-NERDtree.vim
diff --git a/vim/settings/abbr.vim b/vim/settings/plugin-abbr.vim
similarity index 100%
rename from vim/settings/abbr.vim
rename to vim/settings/plugin-abbr.vim
diff --git a/vim/settings/ag.vim b/vim/settings/plugin-ag.vim
similarity index 100%
rename from vim/settings/ag.vim
rename to vim/settings/plugin-ag.vim
diff --git a/vim/settings/autotag.vim b/vim/settings/plugin-autotag.vim
similarity index 100%
rename from vim/settings/autotag.vim
rename to vim/settings/plugin-autotag.vim
diff --git a/vim/settings/camelcasemotion.vim b/vim/settings/plugin-camelcasemotion.vim
similarity index 100%
rename from vim/settings/camelcasemotion.vim
rename to vim/settings/plugin-camelcasemotion.vim
diff --git a/vim/settings/ctrlp.vim b/vim/settings/plugin-ctrlp.vim
similarity index 100%
rename from vim/settings/ctrlp.vim
rename to vim/settings/plugin-ctrlp.vim
diff --git a/vim/settings/easymotion.vim b/vim/settings/plugin-easymotion.vim
similarity index 100%
rename from vim/settings/easymotion.vim
rename to vim/settings/plugin-easymotion.vim
diff --git a/vim/settings/gundo.vim b/vim/settings/plugin-gundo.vim
similarity index 100%
rename from vim/settings/gundo.vim
rename to vim/settings/plugin-gundo.vim
diff --git a/vim/settings/iterm-rspec.vim b/vim/settings/plugin-iterm-rspec.vim
similarity index 100%
rename from vim/settings/iterm-rspec.vim
rename to vim/settings/plugin-iterm-rspec.vim
diff --git a/vim/settings/lightline.vim b/vim/settings/plugin-lightline.vim
similarity index 100%
rename from vim/settings/lightline.vim
rename to vim/settings/plugin-lightline.vim
diff --git a/vim/settings/neocomplete.vim b/vim/settings/plugin-neocomplete.vim
similarity index 100%
rename from vim/settings/neocomplete.vim
rename to vim/settings/plugin-neocomplete.vim
diff --git a/vim/settings/rails.vim b/vim/settings/plugin-rails.vim
similarity index 100%
rename from vim/settings/rails.vim
rename to vim/settings/plugin-rails.vim
diff --git a/vim/settings/rspec.vim b/vim/settings/plugin-rspec.vim
similarity index 100%
rename from vim/settings/rspec.vim
rename to vim/settings/plugin-rspec.vim
diff --git a/vim/settings/showmarks.vim b/vim/settings/plugin-showmarks.vim
similarity index 100%
rename from vim/settings/showmarks.vim
rename to vim/settings/plugin-showmarks.vim
diff --git a/vim/settings/sneak.vim b/vim/settings/plugin-sneak.vim
similarity index 100%
rename from vim/settings/sneak.vim
rename to vim/settings/plugin-sneak.vim
diff --git a/vim/settings/snipmate.vim b/vim/settings/plugin-snipmate.vim
similarity index 100%
rename from vim/settings/snipmate.vim
rename to vim/settings/plugin-snipmate.vim
diff --git a/vim/settings/solarized.vim b/vim/settings/plugin-solarized.vim
similarity index 97%
rename from vim/settings/solarized.vim
rename to vim/settings/plugin-solarized.vim
index 7bc14d266b..7e977f8829 100644
--- a/vim/settings/solarized.vim
+++ b/vim/settings/plugin-solarized.vim
@@ -73,5 +73,5 @@ if !exists("g:yadr_disable_solarized_enhancements")
   hi! EasyMotionTarget ctermfg=100 guifg=#4CE660 gui=bold
 
   " Make sure this file loads itself on top of any other color settings
-  au VimEnter * so ~/.vim/settings/solarized.vim
+  au VimEnter * so ~/.vim/settings/plugin-solarized.vim
 endif
diff --git a/vim/settings/surround.vim b/vim/settings/plugin-surround.vim
similarity index 100%
rename from vim/settings/surround.vim
rename to vim/settings/plugin-surround.vim
diff --git a/vim/settings/syntastic.vim b/vim/settings/plugin-syntastic.vim
similarity index 100%
rename from vim/settings/syntastic.vim
rename to vim/settings/plugin-syntastic.vim
diff --git a/vim/settings/tComment.vim b/vim/settings/plugin-tComment.vim
similarity index 100%
rename from vim/settings/tComment.vim
rename to vim/settings/plugin-tComment.vim
diff --git a/vim/settings/tidy.vim b/vim/settings/plugin-tidy.vim
similarity index 100%
rename from vim/settings/tidy.vim
rename to vim/settings/plugin-tidy.vim
diff --git a/vim/settings/unimpaired.vim b/vim/settings/plugin-unimpaired.vim
similarity index 100%
rename from vim/settings/unimpaired.vim
rename to vim/settings/plugin-unimpaired.vim
diff --git a/vim/settings/vim-fugitive.vim b/vim/settings/plugin-vim-fugitive.vim
similarity index 100%
rename from vim/settings/vim-fugitive.vim
rename to vim/settings/plugin-vim-fugitive.vim
diff --git a/vim/settings/vim-tmux-navigator.vim b/vim/settings/plugin-vim-tmux-navigator.vim
similarity index 100%
rename from vim/settings/vim-tmux-navigator.vim
rename to vim/settings/plugin-vim-tmux-navigator.vim
diff --git a/vim/settings/yankring.vim b/vim/settings/plugin-yankring.vim
similarity index 100%
rename from vim/settings/yankring.vim
rename to vim/settings/plugin-yankring.vim