diff --git a/vim/git.vim b/vim/plugin/git.vim
similarity index 100%
rename from vim/git.vim
rename to vim/plugin/git.vim
diff --git a/vim/scratch.vim b/vim/plugin/scratch.vim
similarity index 100%
rename from vim/scratch.vim
rename to vim/plugin/scratch.vim
diff --git a/vim/shame.vim b/vim/plugin/shame.vim
similarity index 100%
rename from vim/shame.vim
rename to vim/plugin/shame.vim
diff --git a/vim/surround.vim b/vim/plugin/surround.vim
similarity index 100%
rename from vim/surround.vim
rename to vim/plugin/surround.vim
diff --git a/vimrc b/vimrc
index 3dbeec3..a88196d 100644
--- a/vimrc
+++ b/vimrc
@@ -2,8 +2,3 @@
 "!!! makes use of marker '
 
 let &rtp=expand('<sfile>:p:h').'/vim,'.&rtp
-
-run git.vim
-run surround.vim
-run scratch.vim
-run shame.vim