diff --git a/tools/vim/v8.ycm_extra_conf.py b/.ycm_extra_conf.py
similarity index 96%
rename from tools/vim/v8.ycm_extra_conf.py
rename to .ycm_extra_conf.py
index 412e17245b08..e065a0896bdb 100644
--- a/tools/vim/v8.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -9,11 +9,7 @@
 #   1. Install YCM [https://github.com/Valloric/YouCompleteMe]
 #          (Googlers should check out [go/ycm])
 #
-#   2. Point to this config file in your .vimrc:
-#          let g:ycm_global_ycm_extra_conf =
-#              '<v8_root>/tools/vim/v8.ycm_extra_conf.py'
-#
-#   3. Profit
+#   2. Profit
 #
 #
 # Usage notes:
@@ -129,7 +125,7 @@ def GetClangCommandFromNinjaForFilename(v8_root, filename):
         # try to use the default flags.
         return v8_flags
 
-  sys.path.append(os.path.join(v8_root, 'tools', 'vim'))
+  sys.path.append(os.path.join(v8_root, 'tools', 'ninja'))
   from ninja_output import GetNinjaOutputDirectory
   out_dir = os.path.realpath(GetNinjaOutputDirectory(v8_root))
 
diff --git a/tools/vim/ninja_output.py b/tools/ninja/ninja_output.py
similarity index 100%
rename from tools/vim/ninja_output.py
rename to tools/ninja/ninja_output.py
diff --git a/tools/vim/ninja-build.vim b/tools/vim/ninja-build.vim
index bae348868771..3e9b8948ca85 100644
--- a/tools/vim/ninja-build.vim
+++ b/tools/vim/ninja-build.vim
@@ -47,7 +47,7 @@ def path_to_build_dir(configuration):
   """Returns <v8_root>/<output_dir>/(Release|Debug)."""
 
   v8_root = path_to_source_root()
-  sys.path.append(os.path.join(v8_root, 'tools', 'vim'))
+  sys.path.append(os.path.join(v8_root, 'tools', 'ninja'))
   from ninja_output import GetNinjaOutputDirectory
   return GetNinjaOutputDirectory(v8_root, configuration)