diff --git a/vim/.gitignore b/vim/vim/.gitignore
similarity index 100%
rename from vim/.gitignore
rename to vim/vim/.gitignore
diff --git a/vim/after/syntax/blah.vim b/vim/vim/after/syntax/blah.vim
similarity index 100%
rename from vim/after/syntax/blah.vim
rename to vim/vim/after/syntax/blah.vim
diff --git a/vim/autoload/taskpaper.vim b/vim/vim/autoload/taskpaper.vim
similarity index 100%
rename from vim/autoload/taskpaper.vim
rename to vim/vim/autoload/taskpaper.vim
diff --git a/vim/colors/xterm16.vim b/vim/vim/colors/xterm16.vim
similarity index 100%
rename from vim/colors/xterm16.vim
rename to vim/vim/colors/xterm16.vim
diff --git a/vim/doc/example.taskpaper b/vim/vim/doc/example.taskpaper
similarity index 100%
rename from vim/doc/example.taskpaper
rename to vim/vim/doc/example.taskpaper
diff --git a/vim/doc/tags b/vim/vim/doc/tags
similarity index 100%
rename from vim/doc/tags
rename to vim/vim/doc/tags
diff --git a/vim/doc/taskpaper.txt b/vim/vim/doc/taskpaper.txt
similarity index 100%
rename from vim/doc/taskpaper.txt
rename to vim/vim/doc/taskpaper.txt
diff --git a/vim/doc/taskpaper_hacking.txt b/vim/vim/doc/taskpaper_hacking.txt
similarity index 100%
rename from vim/doc/taskpaper_hacking.txt
rename to vim/vim/doc/taskpaper_hacking.txt
diff --git a/vim/doc/taskpaper_licence.txt b/vim/vim/doc/taskpaper_licence.txt
similarity index 100%
rename from vim/doc/taskpaper_licence.txt
rename to vim/vim/doc/taskpaper_licence.txt
diff --git a/vim/ftdetect/pug.vim b/vim/vim/ftdetect/pug.vim
similarity index 100%
rename from vim/ftdetect/pug.vim
rename to vim/vim/ftdetect/pug.vim
diff --git a/vim/ftdetect/taskpaper.vim b/vim/vim/ftdetect/taskpaper.vim
similarity index 100%
rename from vim/ftdetect/taskpaper.vim
rename to vim/vim/ftdetect/taskpaper.vim
diff --git a/vim/ftdetect/tex.vim b/vim/vim/ftdetect/tex.vim
similarity index 100%
rename from vim/ftdetect/tex.vim
rename to vim/vim/ftdetect/tex.vim
diff --git a/vim/ftplugin/jade.vim b/vim/vim/ftplugin/jade.vim
similarity index 100%
rename from vim/ftplugin/jade.vim
rename to vim/vim/ftplugin/jade.vim
diff --git a/vim/ftplugin/pug.vim b/vim/vim/ftplugin/pug.vim
similarity index 100%
rename from vim/ftplugin/pug.vim
rename to vim/vim/ftplugin/pug.vim
diff --git a/vim/ftplugin/taskpaper.vim b/vim/vim/ftplugin/taskpaper.vim
similarity index 100%
rename from vim/ftplugin/taskpaper.vim
rename to vim/vim/ftplugin/taskpaper.vim
diff --git a/vim/indent/jade.vim b/vim/vim/indent/jade.vim
similarity index 100%
rename from vim/indent/jade.vim
rename to vim/vim/indent/jade.vim
diff --git a/vim/indent/pug.vim b/vim/vim/indent/pug.vim
similarity index 100%
rename from vim/indent/pug.vim
rename to vim/vim/indent/pug.vim
diff --git a/vim/rename_this_to_plugin/ctab.vim b/vim/vim/rename_this_to_plugin/ctab.vim
similarity index 100%
rename from vim/rename_this_to_plugin/ctab.vim
rename to vim/vim/rename_this_to_plugin/ctab.vim
diff --git a/vim/spell/en.utf-8.add b/vim/vim/spell/en.utf-8.add
similarity index 100%
rename from vim/spell/en.utf-8.add
rename to vim/vim/spell/en.utf-8.add
diff --git a/vim/spell/en.utf-8.add.spl b/vim/vim/spell/en.utf-8.add.spl
similarity index 100%
rename from vim/spell/en.utf-8.add.spl
rename to vim/vim/spell/en.utf-8.add.spl
diff --git a/vim/syntax/jade.vim b/vim/vim/syntax/jade.vim
similarity index 100%
rename from vim/syntax/jade.vim
rename to vim/vim/syntax/jade.vim
diff --git a/vim/syntax/pug.vim b/vim/vim/syntax/pug.vim
similarity index 100%
rename from vim/syntax/pug.vim
rename to vim/vim/syntax/pug.vim
diff --git a/vim/syntax/taskpaper.vim b/vim/vim/syntax/taskpaper.vim
similarity index 100%
rename from vim/syntax/taskpaper.vim
rename to vim/vim/syntax/taskpaper.vim
diff --git a/vimrc b/vim/vimrc
similarity index 100%
rename from vimrc
rename to vim/vimrc
diff --git a/zshrc b/zsh/zshrc
similarity index 100%
rename from zshrc
rename to zsh/zshrc