diff --git a/cpp/tbb_task_scheduler_init.cpp b/cpp/tbb/tbb_task_scheduler_init.cpp
similarity index 87%
rename from cpp/tbb_task_scheduler_init.cpp
rename to cpp/tbb/tbb_task_scheduler_init.cpp
index 2c44bd9..71784fb 100644
--- a/cpp/tbb_task_scheduler_init.cpp
+++ b/cpp/tbb/tbb_task_scheduler_init.cpp
@@ -1,8 +1,8 @@
 /* Check cf5-opt.vim defs.
-VIM: let g:lcppflags="-std=c++11 -O2 -pthread"
-VIM: let g:cppflags=g:Iboost.g:Itbb
-VIM: let g:ldflags=g:Lboost.g:Ltbb.g:tbbmalloc
-VIM: let g:ldlibpath=g:Bboost.g:Btbb
+VIM: let b:lcppflags="-std=c++11 -O2 -pthread"
+VIM: let b:cppflags=g:Iboost.g:Itbb
+VIM: let b:ldflags=g:Lboost.g:Ltbb.g:tbbmalloc
+VIM: let b:ldlibpath=g:Bboost.g:Btbb
 */
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/task_scheduler_init.h>