diff --git a/src/general/1_hello_world/README.md b/src/1-getting-started/1_hello_world/README.md
similarity index 100%
rename from src/general/1_hello_world/README.md
rename to src/1-getting-started/1_hello_world/README.md
diff --git a/src/general/1_hello_world/nan/binding.gyp b/src/1-getting-started/1_hello_world/nan/binding.gyp
similarity index 100%
rename from src/general/1_hello_world/nan/binding.gyp
rename to src/1-getting-started/1_hello_world/nan/binding.gyp
diff --git a/src/general/1_hello_world/nan/hello.cc b/src/1-getting-started/1_hello_world/nan/hello.cc
similarity index 100%
rename from src/general/1_hello_world/nan/hello.cc
rename to src/1-getting-started/1_hello_world/nan/hello.cc
diff --git a/src/general/1_hello_world/nan/hello.js b/src/1-getting-started/1_hello_world/nan/hello.js
similarity index 100%
rename from src/general/1_hello_world/nan/hello.js
rename to src/1-getting-started/1_hello_world/nan/hello.js
diff --git a/src/general/1_hello_world/nan/package.json b/src/1-getting-started/1_hello_world/nan/package.json
similarity index 100%
rename from src/general/1_hello_world/nan/package.json
rename to src/1-getting-started/1_hello_world/nan/package.json
diff --git a/src/general/1_hello_world/napi/binding.gyp b/src/1-getting-started/1_hello_world/napi/binding.gyp
similarity index 100%
rename from src/general/1_hello_world/napi/binding.gyp
rename to src/1-getting-started/1_hello_world/napi/binding.gyp
diff --git a/src/general/1_hello_world/napi/hello.c b/src/1-getting-started/1_hello_world/napi/hello.c
similarity index 100%
rename from src/general/1_hello_world/napi/hello.c
rename to src/1-getting-started/1_hello_world/napi/hello.c
diff --git a/src/general/1_hello_world/napi/hello.js b/src/1-getting-started/1_hello_world/napi/hello.js
similarity index 100%
rename from src/general/1_hello_world/napi/hello.js
rename to src/1-getting-started/1_hello_world/napi/hello.js
diff --git a/src/general/1_hello_world/napi/package.json b/src/1-getting-started/1_hello_world/napi/package.json
similarity index 100%
rename from src/general/1_hello_world/napi/package.json
rename to src/1-getting-started/1_hello_world/napi/package.json
diff --git a/src/general/1_hello_world/node-addon-api-addon-class/binding.gyp b/src/1-getting-started/1_hello_world/node-addon-api-addon-class/binding.gyp
similarity index 100%
rename from src/general/1_hello_world/node-addon-api-addon-class/binding.gyp
rename to src/1-getting-started/1_hello_world/node-addon-api-addon-class/binding.gyp
diff --git a/src/general/1_hello_world/node-addon-api-addon-class/hello.cc b/src/1-getting-started/1_hello_world/node-addon-api-addon-class/hello.cc
similarity index 100%
rename from src/general/1_hello_world/node-addon-api-addon-class/hello.cc
rename to src/1-getting-started/1_hello_world/node-addon-api-addon-class/hello.cc
diff --git a/src/general/1_hello_world/node-addon-api-addon-class/hello.js b/src/1-getting-started/1_hello_world/node-addon-api-addon-class/hello.js
similarity index 100%
rename from src/general/1_hello_world/node-addon-api-addon-class/hello.js
rename to src/1-getting-started/1_hello_world/node-addon-api-addon-class/hello.js
diff --git a/src/general/1_hello_world/node-addon-api-addon-class/package.json b/src/1-getting-started/1_hello_world/node-addon-api-addon-class/package.json
similarity index 100%
rename from src/general/1_hello_world/node-addon-api-addon-class/package.json
rename to src/1-getting-started/1_hello_world/node-addon-api-addon-class/package.json
diff --git a/src/general/1_hello_world/node-addon-api/binding.gyp b/src/1-getting-started/1_hello_world/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/1_hello_world/node-addon-api/binding.gyp
rename to src/1-getting-started/1_hello_world/node-addon-api/binding.gyp
diff --git a/src/general/1_hello_world/node-addon-api/hello.cc b/src/1-getting-started/1_hello_world/node-addon-api/hello.cc
similarity index 100%
rename from src/general/1_hello_world/node-addon-api/hello.cc
rename to src/1-getting-started/1_hello_world/node-addon-api/hello.cc
diff --git a/src/general/1_hello_world/node-addon-api/hello.js b/src/1-getting-started/1_hello_world/node-addon-api/hello.js
similarity index 100%
rename from src/general/1_hello_world/node-addon-api/hello.js
rename to src/1-getting-started/1_hello_world/node-addon-api/hello.js
diff --git a/src/general/1_hello_world/node-addon-api/package.json b/src/1-getting-started/1_hello_world/node-addon-api/package.json
similarity index 100%
rename from src/general/1_hello_world/node-addon-api/package.json
rename to src/1-getting-started/1_hello_world/node-addon-api/package.json
diff --git a/src/general/2_function_arguments/README.md b/src/1-getting-started/2_function_arguments/README.md
similarity index 100%
rename from src/general/2_function_arguments/README.md
rename to src/1-getting-started/2_function_arguments/README.md
diff --git a/src/general/2_function_arguments/nan/addon.cc b/src/1-getting-started/2_function_arguments/nan/addon.cc
similarity index 100%
rename from src/general/2_function_arguments/nan/addon.cc
rename to src/1-getting-started/2_function_arguments/nan/addon.cc
diff --git a/src/general/2_function_arguments/nan/addon.js b/src/1-getting-started/2_function_arguments/nan/addon.js
similarity index 100%
rename from src/general/2_function_arguments/nan/addon.js
rename to src/1-getting-started/2_function_arguments/nan/addon.js
diff --git a/src/general/2_function_arguments/nan/binding.gyp b/src/1-getting-started/2_function_arguments/nan/binding.gyp
similarity index 100%
rename from src/general/2_function_arguments/nan/binding.gyp
rename to src/1-getting-started/2_function_arguments/nan/binding.gyp
diff --git a/src/general/2_function_arguments/nan/package.json b/src/1-getting-started/2_function_arguments/nan/package.json
similarity index 100%
rename from src/general/2_function_arguments/nan/package.json
rename to src/1-getting-started/2_function_arguments/nan/package.json
diff --git a/src/general/2_function_arguments/napi/addon.c b/src/1-getting-started/2_function_arguments/napi/addon.c
similarity index 100%
rename from src/general/2_function_arguments/napi/addon.c
rename to src/1-getting-started/2_function_arguments/napi/addon.c
diff --git a/src/general/2_function_arguments/napi/addon.js b/src/1-getting-started/2_function_arguments/napi/addon.js
similarity index 100%
rename from src/general/2_function_arguments/napi/addon.js
rename to src/1-getting-started/2_function_arguments/napi/addon.js
diff --git a/src/general/2_function_arguments/napi/binding.gyp b/src/1-getting-started/2_function_arguments/napi/binding.gyp
similarity index 100%
rename from src/general/2_function_arguments/napi/binding.gyp
rename to src/1-getting-started/2_function_arguments/napi/binding.gyp
diff --git a/src/general/2_function_arguments/napi/package.json b/src/1-getting-started/2_function_arguments/napi/package.json
similarity index 100%
rename from src/general/2_function_arguments/napi/package.json
rename to src/1-getting-started/2_function_arguments/napi/package.json
diff --git a/src/general/2_function_arguments/node-addon-api/addon.cc b/src/1-getting-started/2_function_arguments/node-addon-api/addon.cc
similarity index 100%
rename from src/general/2_function_arguments/node-addon-api/addon.cc
rename to src/1-getting-started/2_function_arguments/node-addon-api/addon.cc
diff --git a/src/general/2_function_arguments/node-addon-api/addon.js b/src/1-getting-started/2_function_arguments/node-addon-api/addon.js
similarity index 100%
rename from src/general/2_function_arguments/node-addon-api/addon.js
rename to src/1-getting-started/2_function_arguments/node-addon-api/addon.js
diff --git a/src/general/2_function_arguments/node-addon-api/binding.gyp b/src/1-getting-started/2_function_arguments/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/2_function_arguments/node-addon-api/binding.gyp
rename to src/1-getting-started/2_function_arguments/node-addon-api/binding.gyp
diff --git a/src/general/2_function_arguments/node-addon-api/package.json b/src/1-getting-started/2_function_arguments/node-addon-api/package.json
similarity index 100%
rename from src/general/2_function_arguments/node-addon-api/package.json
rename to src/1-getting-started/2_function_arguments/node-addon-api/package.json
diff --git a/src/general/3_callbacks/nan/addon.cc b/src/1-getting-started/3_callbacks/nan/addon.cc
similarity index 100%
rename from src/general/3_callbacks/nan/addon.cc
rename to src/1-getting-started/3_callbacks/nan/addon.cc
diff --git a/src/general/3_callbacks/nan/addon.js b/src/1-getting-started/3_callbacks/nan/addon.js
similarity index 100%
rename from src/general/3_callbacks/nan/addon.js
rename to src/1-getting-started/3_callbacks/nan/addon.js
diff --git a/src/general/3_callbacks/nan/binding.gyp b/src/1-getting-started/3_callbacks/nan/binding.gyp
similarity index 100%
rename from src/general/3_callbacks/nan/binding.gyp
rename to src/1-getting-started/3_callbacks/nan/binding.gyp
diff --git a/src/general/3_callbacks/nan/package.json b/src/1-getting-started/3_callbacks/nan/package.json
similarity index 100%
rename from src/general/3_callbacks/nan/package.json
rename to src/1-getting-started/3_callbacks/nan/package.json
diff --git a/src/general/3_callbacks/napi/addon.c b/src/1-getting-started/3_callbacks/napi/addon.c
similarity index 100%
rename from src/general/3_callbacks/napi/addon.c
rename to src/1-getting-started/3_callbacks/napi/addon.c
diff --git a/src/general/3_callbacks/napi/addon.js b/src/1-getting-started/3_callbacks/napi/addon.js
similarity index 100%
rename from src/general/3_callbacks/napi/addon.js
rename to src/1-getting-started/3_callbacks/napi/addon.js
diff --git a/src/general/3_callbacks/napi/binding.gyp b/src/1-getting-started/3_callbacks/napi/binding.gyp
similarity index 100%
rename from src/general/3_callbacks/napi/binding.gyp
rename to src/1-getting-started/3_callbacks/napi/binding.gyp
diff --git a/src/general/3_callbacks/napi/package.json b/src/1-getting-started/3_callbacks/napi/package.json
similarity index 100%
rename from src/general/3_callbacks/napi/package.json
rename to src/1-getting-started/3_callbacks/napi/package.json
diff --git a/src/general/3_callbacks/node-addon-api/addon.cc b/src/1-getting-started/3_callbacks/node-addon-api/addon.cc
similarity index 100%
rename from src/general/3_callbacks/node-addon-api/addon.cc
rename to src/1-getting-started/3_callbacks/node-addon-api/addon.cc
diff --git a/src/general/3_callbacks/node-addon-api/addon.js b/src/1-getting-started/3_callbacks/node-addon-api/addon.js
similarity index 100%
rename from src/general/3_callbacks/node-addon-api/addon.js
rename to src/1-getting-started/3_callbacks/node-addon-api/addon.js
diff --git a/src/general/3_callbacks/node-addon-api/binding.gyp b/src/1-getting-started/3_callbacks/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/3_callbacks/node-addon-api/binding.gyp
rename to src/1-getting-started/3_callbacks/node-addon-api/binding.gyp
diff --git a/src/general/3_callbacks/node-addon-api/package.json b/src/1-getting-started/3_callbacks/node-addon-api/package.json
similarity index 100%
rename from src/general/3_callbacks/node-addon-api/package.json
rename to src/1-getting-started/3_callbacks/node-addon-api/package.json
diff --git a/src/general/4_object_factory/nan/addon.cc b/src/1-getting-started/4_object_factory/nan/addon.cc
similarity index 100%
rename from src/general/4_object_factory/nan/addon.cc
rename to src/1-getting-started/4_object_factory/nan/addon.cc
diff --git a/src/general/4_object_factory/nan/addon.js b/src/1-getting-started/4_object_factory/nan/addon.js
similarity index 100%
rename from src/general/4_object_factory/nan/addon.js
rename to src/1-getting-started/4_object_factory/nan/addon.js
diff --git a/src/general/4_object_factory/nan/binding.gyp b/src/1-getting-started/4_object_factory/nan/binding.gyp
similarity index 100%
rename from src/general/4_object_factory/nan/binding.gyp
rename to src/1-getting-started/4_object_factory/nan/binding.gyp
diff --git a/src/general/4_object_factory/nan/package.json b/src/1-getting-started/4_object_factory/nan/package.json
similarity index 100%
rename from src/general/4_object_factory/nan/package.json
rename to src/1-getting-started/4_object_factory/nan/package.json
diff --git a/src/general/4_object_factory/napi/addon.c b/src/1-getting-started/4_object_factory/napi/addon.c
similarity index 100%
rename from src/general/4_object_factory/napi/addon.c
rename to src/1-getting-started/4_object_factory/napi/addon.c
diff --git a/src/general/4_object_factory/napi/addon.js b/src/1-getting-started/4_object_factory/napi/addon.js
similarity index 100%
rename from src/general/4_object_factory/napi/addon.js
rename to src/1-getting-started/4_object_factory/napi/addon.js
diff --git a/src/general/4_object_factory/napi/binding.gyp b/src/1-getting-started/4_object_factory/napi/binding.gyp
similarity index 100%
rename from src/general/4_object_factory/napi/binding.gyp
rename to src/1-getting-started/4_object_factory/napi/binding.gyp
diff --git a/src/general/4_object_factory/napi/package.json b/src/1-getting-started/4_object_factory/napi/package.json
similarity index 100%
rename from src/general/4_object_factory/napi/package.json
rename to src/1-getting-started/4_object_factory/napi/package.json
diff --git a/src/general/4_object_factory/node-addon-api/addon.cc b/src/1-getting-started/4_object_factory/node-addon-api/addon.cc
similarity index 100%
rename from src/general/4_object_factory/node-addon-api/addon.cc
rename to src/1-getting-started/4_object_factory/node-addon-api/addon.cc
diff --git a/src/general/4_object_factory/node-addon-api/addon.js b/src/1-getting-started/4_object_factory/node-addon-api/addon.js
similarity index 100%
rename from src/general/4_object_factory/node-addon-api/addon.js
rename to src/1-getting-started/4_object_factory/node-addon-api/addon.js
diff --git a/src/general/4_object_factory/node-addon-api/binding.gyp b/src/1-getting-started/4_object_factory/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/4_object_factory/node-addon-api/binding.gyp
rename to src/1-getting-started/4_object_factory/node-addon-api/binding.gyp
diff --git a/src/general/4_object_factory/node-addon-api/package.json b/src/1-getting-started/4_object_factory/node-addon-api/package.json
similarity index 100%
rename from src/general/4_object_factory/node-addon-api/package.json
rename to src/1-getting-started/4_object_factory/node-addon-api/package.json
diff --git a/src/general/5_function_factory/nan/addon.cc b/src/1-getting-started/5_function_factory/nan/addon.cc
similarity index 100%
rename from src/general/5_function_factory/nan/addon.cc
rename to src/1-getting-started/5_function_factory/nan/addon.cc
diff --git a/src/general/5_function_factory/nan/addon.js b/src/1-getting-started/5_function_factory/nan/addon.js
similarity index 100%
rename from src/general/5_function_factory/nan/addon.js
rename to src/1-getting-started/5_function_factory/nan/addon.js
diff --git a/src/general/5_function_factory/nan/binding.gyp b/src/1-getting-started/5_function_factory/nan/binding.gyp
similarity index 100%
rename from src/general/5_function_factory/nan/binding.gyp
rename to src/1-getting-started/5_function_factory/nan/binding.gyp
diff --git a/src/general/5_function_factory/nan/package.json b/src/1-getting-started/5_function_factory/nan/package.json
similarity index 100%
rename from src/general/5_function_factory/nan/package.json
rename to src/1-getting-started/5_function_factory/nan/package.json
diff --git a/src/general/5_function_factory/napi/addon.c b/src/1-getting-started/5_function_factory/napi/addon.c
similarity index 100%
rename from src/general/5_function_factory/napi/addon.c
rename to src/1-getting-started/5_function_factory/napi/addon.c
diff --git a/src/general/5_function_factory/napi/addon.js b/src/1-getting-started/5_function_factory/napi/addon.js
similarity index 100%
rename from src/general/5_function_factory/napi/addon.js
rename to src/1-getting-started/5_function_factory/napi/addon.js
diff --git a/src/general/5_function_factory/napi/binding.gyp b/src/1-getting-started/5_function_factory/napi/binding.gyp
similarity index 100%
rename from src/general/5_function_factory/napi/binding.gyp
rename to src/1-getting-started/5_function_factory/napi/binding.gyp
diff --git a/src/general/5_function_factory/napi/package.json b/src/1-getting-started/5_function_factory/napi/package.json
similarity index 100%
rename from src/general/5_function_factory/napi/package.json
rename to src/1-getting-started/5_function_factory/napi/package.json
diff --git a/src/general/5_function_factory/node-addon-api/addon.cc b/src/1-getting-started/5_function_factory/node-addon-api/addon.cc
similarity index 100%
rename from src/general/5_function_factory/node-addon-api/addon.cc
rename to src/1-getting-started/5_function_factory/node-addon-api/addon.cc
diff --git a/src/general/5_function_factory/node-addon-api/addon.js b/src/1-getting-started/5_function_factory/node-addon-api/addon.js
similarity index 100%
rename from src/general/5_function_factory/node-addon-api/addon.js
rename to src/1-getting-started/5_function_factory/node-addon-api/addon.js
diff --git a/src/general/5_function_factory/node-addon-api/binding.gyp b/src/1-getting-started/5_function_factory/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/5_function_factory/node-addon-api/binding.gyp
rename to src/1-getting-started/5_function_factory/node-addon-api/binding.gyp
diff --git a/src/general/5_function_factory/node-addon-api/package.json b/src/1-getting-started/5_function_factory/node-addon-api/package.json
similarity index 100%
rename from src/general/5_function_factory/node-addon-api/package.json
rename to src/1-getting-started/5_function_factory/node-addon-api/package.json
diff --git a/src/general/6_object_wrap/nan/addon.cc b/src/1-getting-started/6_object_wrap/nan/addon.cc
similarity index 100%
rename from src/general/6_object_wrap/nan/addon.cc
rename to src/1-getting-started/6_object_wrap/nan/addon.cc
diff --git a/src/general/6_object_wrap/nan/addon.js b/src/1-getting-started/6_object_wrap/nan/addon.js
similarity index 100%
rename from src/general/6_object_wrap/nan/addon.js
rename to src/1-getting-started/6_object_wrap/nan/addon.js
diff --git a/src/general/6_object_wrap/nan/binding.gyp b/src/1-getting-started/6_object_wrap/nan/binding.gyp
similarity index 100%
rename from src/general/6_object_wrap/nan/binding.gyp
rename to src/1-getting-started/6_object_wrap/nan/binding.gyp
diff --git a/src/general/6_object_wrap/nan/myobject.cc b/src/1-getting-started/6_object_wrap/nan/myobject.cc
similarity index 100%
rename from src/general/6_object_wrap/nan/myobject.cc
rename to src/1-getting-started/6_object_wrap/nan/myobject.cc
diff --git a/src/general/6_object_wrap/nan/myobject.h b/src/1-getting-started/6_object_wrap/nan/myobject.h
similarity index 100%
rename from src/general/6_object_wrap/nan/myobject.h
rename to src/1-getting-started/6_object_wrap/nan/myobject.h
diff --git a/src/general/6_object_wrap/nan/package.json b/src/1-getting-started/6_object_wrap/nan/package.json
similarity index 100%
rename from src/general/6_object_wrap/nan/package.json
rename to src/1-getting-started/6_object_wrap/nan/package.json
diff --git a/src/general/6_object_wrap/napi/addon.cc b/src/1-getting-started/6_object_wrap/napi/addon.cc
similarity index 100%
rename from src/general/6_object_wrap/napi/addon.cc
rename to src/1-getting-started/6_object_wrap/napi/addon.cc
diff --git a/src/general/6_object_wrap/napi/addon.js b/src/1-getting-started/6_object_wrap/napi/addon.js
similarity index 100%
rename from src/general/6_object_wrap/napi/addon.js
rename to src/1-getting-started/6_object_wrap/napi/addon.js
diff --git a/src/general/6_object_wrap/napi/binding.gyp b/src/1-getting-started/6_object_wrap/napi/binding.gyp
similarity index 100%
rename from src/general/6_object_wrap/napi/binding.gyp
rename to src/1-getting-started/6_object_wrap/napi/binding.gyp
diff --git a/src/general/6_object_wrap/napi/myobject.cc b/src/1-getting-started/6_object_wrap/napi/myobject.cc
similarity index 100%
rename from src/general/6_object_wrap/napi/myobject.cc
rename to src/1-getting-started/6_object_wrap/napi/myobject.cc
diff --git a/src/general/6_object_wrap/napi/myobject.h b/src/1-getting-started/6_object_wrap/napi/myobject.h
similarity index 100%
rename from src/general/6_object_wrap/napi/myobject.h
rename to src/1-getting-started/6_object_wrap/napi/myobject.h
diff --git a/src/general/6_object_wrap/napi/package.json b/src/1-getting-started/6_object_wrap/napi/package.json
similarity index 100%
rename from src/general/6_object_wrap/napi/package.json
rename to src/1-getting-started/6_object_wrap/napi/package.json
diff --git a/src/general/6_object_wrap/node-addon-api/addon.cc b/src/1-getting-started/6_object_wrap/node-addon-api/addon.cc
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/addon.cc
rename to src/1-getting-started/6_object_wrap/node-addon-api/addon.cc
diff --git a/src/general/6_object_wrap/node-addon-api/addon.js b/src/1-getting-started/6_object_wrap/node-addon-api/addon.js
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/addon.js
rename to src/1-getting-started/6_object_wrap/node-addon-api/addon.js
diff --git a/src/general/6_object_wrap/node-addon-api/binding.gyp b/src/1-getting-started/6_object_wrap/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/binding.gyp
rename to src/1-getting-started/6_object_wrap/node-addon-api/binding.gyp
diff --git a/src/general/6_object_wrap/node-addon-api/myobject.cc b/src/1-getting-started/6_object_wrap/node-addon-api/myobject.cc
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/myobject.cc
rename to src/1-getting-started/6_object_wrap/node-addon-api/myobject.cc
diff --git a/src/general/6_object_wrap/node-addon-api/myobject.h b/src/1-getting-started/6_object_wrap/node-addon-api/myobject.h
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/myobject.h
rename to src/1-getting-started/6_object_wrap/node-addon-api/myobject.h
diff --git a/src/general/6_object_wrap/node-addon-api/package.json b/src/1-getting-started/6_object_wrap/node-addon-api/package.json
similarity index 100%
rename from src/general/6_object_wrap/node-addon-api/package.json
rename to src/1-getting-started/6_object_wrap/node-addon-api/package.json
diff --git a/src/general/7_factory_wrap/nan/addon.cc b/src/1-getting-started/7_factory_wrap/nan/addon.cc
similarity index 100%
rename from src/general/7_factory_wrap/nan/addon.cc
rename to src/1-getting-started/7_factory_wrap/nan/addon.cc
diff --git a/src/general/7_factory_wrap/nan/addon.js b/src/1-getting-started/7_factory_wrap/nan/addon.js
similarity index 100%
rename from src/general/7_factory_wrap/nan/addon.js
rename to src/1-getting-started/7_factory_wrap/nan/addon.js
diff --git a/src/general/7_factory_wrap/nan/binding.gyp b/src/1-getting-started/7_factory_wrap/nan/binding.gyp
similarity index 100%
rename from src/general/7_factory_wrap/nan/binding.gyp
rename to src/1-getting-started/7_factory_wrap/nan/binding.gyp
diff --git a/src/general/7_factory_wrap/nan/myobject.cc b/src/1-getting-started/7_factory_wrap/nan/myobject.cc
similarity index 100%
rename from src/general/7_factory_wrap/nan/myobject.cc
rename to src/1-getting-started/7_factory_wrap/nan/myobject.cc
diff --git a/src/general/7_factory_wrap/nan/myobject.h b/src/1-getting-started/7_factory_wrap/nan/myobject.h
similarity index 100%
rename from src/general/7_factory_wrap/nan/myobject.h
rename to src/1-getting-started/7_factory_wrap/nan/myobject.h
diff --git a/src/general/7_factory_wrap/nan/package.json b/src/1-getting-started/7_factory_wrap/nan/package.json
similarity index 100%
rename from src/general/7_factory_wrap/nan/package.json
rename to src/1-getting-started/7_factory_wrap/nan/package.json
diff --git a/src/general/7_factory_wrap/napi/addon.cc b/src/1-getting-started/7_factory_wrap/napi/addon.cc
similarity index 100%
rename from src/general/7_factory_wrap/napi/addon.cc
rename to src/1-getting-started/7_factory_wrap/napi/addon.cc
diff --git a/src/general/7_factory_wrap/napi/addon.js b/src/1-getting-started/7_factory_wrap/napi/addon.js
similarity index 100%
rename from src/general/7_factory_wrap/napi/addon.js
rename to src/1-getting-started/7_factory_wrap/napi/addon.js
diff --git a/src/general/7_factory_wrap/napi/binding.gyp b/src/1-getting-started/7_factory_wrap/napi/binding.gyp
similarity index 100%
rename from src/general/7_factory_wrap/napi/binding.gyp
rename to src/1-getting-started/7_factory_wrap/napi/binding.gyp
diff --git a/src/general/7_factory_wrap/napi/myobject.cc b/src/1-getting-started/7_factory_wrap/napi/myobject.cc
similarity index 100%
rename from src/general/7_factory_wrap/napi/myobject.cc
rename to src/1-getting-started/7_factory_wrap/napi/myobject.cc
diff --git a/src/general/7_factory_wrap/napi/myobject.h b/src/1-getting-started/7_factory_wrap/napi/myobject.h
similarity index 100%
rename from src/general/7_factory_wrap/napi/myobject.h
rename to src/1-getting-started/7_factory_wrap/napi/myobject.h
diff --git a/src/general/7_factory_wrap/napi/package.json b/src/1-getting-started/7_factory_wrap/napi/package.json
similarity index 100%
rename from src/general/7_factory_wrap/napi/package.json
rename to src/1-getting-started/7_factory_wrap/napi/package.json
diff --git a/src/general/7_factory_wrap/node-addon-api/addon.cc b/src/1-getting-started/7_factory_wrap/node-addon-api/addon.cc
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/addon.cc
rename to src/1-getting-started/7_factory_wrap/node-addon-api/addon.cc
diff --git a/src/general/7_factory_wrap/node-addon-api/addon.js b/src/1-getting-started/7_factory_wrap/node-addon-api/addon.js
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/addon.js
rename to src/1-getting-started/7_factory_wrap/node-addon-api/addon.js
diff --git a/src/general/7_factory_wrap/node-addon-api/binding.gyp b/src/1-getting-started/7_factory_wrap/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/binding.gyp
rename to src/1-getting-started/7_factory_wrap/node-addon-api/binding.gyp
diff --git a/src/general/7_factory_wrap/node-addon-api/myobject.cc b/src/1-getting-started/7_factory_wrap/node-addon-api/myobject.cc
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/myobject.cc
rename to src/1-getting-started/7_factory_wrap/node-addon-api/myobject.cc
diff --git a/src/general/7_factory_wrap/node-addon-api/myobject.h b/src/1-getting-started/7_factory_wrap/node-addon-api/myobject.h
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/myobject.h
rename to src/1-getting-started/7_factory_wrap/node-addon-api/myobject.h
diff --git a/src/general/7_factory_wrap/node-addon-api/package.json b/src/1-getting-started/7_factory_wrap/node-addon-api/package.json
similarity index 100%
rename from src/general/7_factory_wrap/node-addon-api/package.json
rename to src/1-getting-started/7_factory_wrap/node-addon-api/package.json
diff --git a/src/general/a-first-project/node-addon-api/README.md b/src/1-getting-started/a-first-project/node-addon-api/README.md
similarity index 100%
rename from src/general/a-first-project/node-addon-api/README.md
rename to src/1-getting-started/a-first-project/node-addon-api/README.md
diff --git a/src/general/a-first-project/node-addon-api/binding.gyp b/src/1-getting-started/a-first-project/node-addon-api/binding.gyp
similarity index 100%
rename from src/general/a-first-project/node-addon-api/binding.gyp
rename to src/1-getting-started/a-first-project/node-addon-api/binding.gyp
diff --git a/src/general/a-first-project/node-addon-api/lib/binding.js b/src/1-getting-started/a-first-project/node-addon-api/lib/binding.js
similarity index 100%
rename from src/general/a-first-project/node-addon-api/lib/binding.js
rename to src/1-getting-started/a-first-project/node-addon-api/lib/binding.js
diff --git a/src/general/a-first-project/node-addon-api/package.json b/src/1-getting-started/a-first-project/node-addon-api/package.json
similarity index 100%
rename from src/general/a-first-project/node-addon-api/package.json
rename to src/1-getting-started/a-first-project/node-addon-api/package.json
diff --git a/src/general/a-first-project/node-addon-api/src/hello_world.cc b/src/1-getting-started/a-first-project/node-addon-api/src/hello_world.cc
similarity index 100%
rename from src/general/a-first-project/node-addon-api/src/hello_world.cc
rename to src/1-getting-started/a-first-project/node-addon-api/src/hello_world.cc
diff --git a/src/general/a-first-project/node-addon-api/test/test_binding.js b/src/1-getting-started/a-first-project/node-addon-api/test/test_binding.js
similarity index 100%
rename from src/general/a-first-project/node-addon-api/test/test_binding.js
rename to src/1-getting-started/a-first-project/node-addon-api/test/test_binding.js
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/addon.cc b/src/2-js-to-native-conversion/8_passing_wrapped/nan/addon.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/addon.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/addon.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/addon.js b/src/2-js-to-native-conversion/8_passing_wrapped/nan/addon.js
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/addon.js
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/addon.js
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/binding.gyp b/src/2-js-to-native-conversion/8_passing_wrapped/nan/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/binding.gyp
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/binding.gyp
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/myobject.cc b/src/2-js-to-native-conversion/8_passing_wrapped/nan/myobject.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/myobject.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/myobject.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/myobject.h b/src/2-js-to-native-conversion/8_passing_wrapped/nan/myobject.h
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/myobject.h
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/myobject.h
diff --git a/src/js-to-native-conversion/8_passing_wrapped/nan/package.json b/src/2-js-to-native-conversion/8_passing_wrapped/nan/package.json
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/nan/package.json
rename to src/2-js-to-native-conversion/8_passing_wrapped/nan/package.json
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/addon.cc b/src/2-js-to-native-conversion/8_passing_wrapped/napi/addon.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/addon.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/addon.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/addon.js b/src/2-js-to-native-conversion/8_passing_wrapped/napi/addon.js
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/addon.js
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/addon.js
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/binding.gyp b/src/2-js-to-native-conversion/8_passing_wrapped/napi/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/binding.gyp
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/binding.gyp
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/myobject.cc b/src/2-js-to-native-conversion/8_passing_wrapped/napi/myobject.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/myobject.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/myobject.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/myobject.h b/src/2-js-to-native-conversion/8_passing_wrapped/napi/myobject.h
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/myobject.h
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/myobject.h
diff --git a/src/js-to-native-conversion/8_passing_wrapped/napi/package.json b/src/2-js-to-native-conversion/8_passing_wrapped/napi/package.json
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/napi/package.json
rename to src/2-js-to-native-conversion/8_passing_wrapped/napi/package.json
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.cc b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.js b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.js
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.js
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/addon.js
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/binding.gyp b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/binding.gyp
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/binding.gyp
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.cc b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.cc
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.cc
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.cc
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.h b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.h
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.h
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/myobject.h
diff --git a/src/js-to-native-conversion/8_passing_wrapped/node-addon-api/package.json b/src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/package.json
similarity index 100%
rename from src/js-to-native-conversion/8_passing_wrapped/node-addon-api/package.json
rename to src/2-js-to-native-conversion/8_passing_wrapped/node-addon-api/package.json
diff --git a/src/js-to-native-conversion/array_buffer_to_native/node-addon-api/array_buffer_to_native.cc b/src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/array_buffer_to_native.cc
similarity index 100%
rename from src/js-to-native-conversion/array_buffer_to_native/node-addon-api/array_buffer_to_native.cc
rename to src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/array_buffer_to_native.cc
diff --git a/src/js-to-native-conversion/array_buffer_to_native/node-addon-api/binding.gyp b/src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/array_buffer_to_native/node-addon-api/binding.gyp
rename to src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/binding.gyp
diff --git a/src/js-to-native-conversion/array_buffer_to_native/node-addon-api/index.js b/src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/index.js
similarity index 100%
rename from src/js-to-native-conversion/array_buffer_to_native/node-addon-api/index.js
rename to src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/index.js
diff --git a/src/js-to-native-conversion/array_buffer_to_native/node-addon-api/package.json b/src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/package.json
similarity index 100%
rename from src/js-to-native-conversion/array_buffer_to_native/node-addon-api/package.json
rename to src/2-js-to-native-conversion/array_buffer_to_native/node-addon-api/package.json
diff --git a/src/js-to-native-conversion/object-template-demo/README.md b/src/2-js-to-native-conversion/object-template-demo/README.md
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/README.md
rename to src/2-js-to-native-conversion/object-template-demo/README.md
diff --git a/src/js-to-native-conversion/object-template-demo/nan/binding.gyp b/src/2-js-to-native-conversion/object-template-demo/nan/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/nan/binding.gyp
rename to src/2-js-to-native-conversion/object-template-demo/nan/binding.gyp
diff --git a/src/js-to-native-conversion/object-template-demo/nan/index.js b/src/2-js-to-native-conversion/object-template-demo/nan/index.js
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/nan/index.js
rename to src/2-js-to-native-conversion/object-template-demo/nan/index.js
diff --git a/src/js-to-native-conversion/object-template-demo/nan/object-template-demo.cc b/src/2-js-to-native-conversion/object-template-demo/nan/object-template-demo.cc
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/nan/object-template-demo.cc
rename to src/2-js-to-native-conversion/object-template-demo/nan/object-template-demo.cc
diff --git a/src/js-to-native-conversion/object-template-demo/nan/package.json b/src/2-js-to-native-conversion/object-template-demo/nan/package.json
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/nan/package.json
rename to src/2-js-to-native-conversion/object-template-demo/nan/package.json
diff --git a/src/js-to-native-conversion/object-template-demo/napi/binding.gyp b/src/2-js-to-native-conversion/object-template-demo/napi/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/binding.gyp
rename to src/2-js-to-native-conversion/object-template-demo/napi/binding.gyp
diff --git a/src/js-to-native-conversion/object-template-demo/napi/index.js b/src/2-js-to-native-conversion/object-template-demo/napi/index.js
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/index.js
rename to src/2-js-to-native-conversion/object-template-demo/napi/index.js
diff --git a/src/js-to-native-conversion/object-template-demo/napi/node-api-common.h b/src/2-js-to-native-conversion/object-template-demo/napi/node-api-common.h
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/node-api-common.h
rename to src/2-js-to-native-conversion/object-template-demo/napi/node-api-common.h
diff --git a/src/js-to-native-conversion/object-template-demo/napi/object-template-demo.cc b/src/2-js-to-native-conversion/object-template-demo/napi/object-template-demo.cc
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/object-template-demo.cc
rename to src/2-js-to-native-conversion/object-template-demo/napi/object-template-demo.cc
diff --git a/src/js-to-native-conversion/object-template-demo/napi/package.json b/src/2-js-to-native-conversion/object-template-demo/napi/package.json
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/package.json
rename to src/2-js-to-native-conversion/object-template-demo/napi/package.json
diff --git a/src/js-to-native-conversion/object-template-demo/napi/proxy-template.cc b/src/2-js-to-native-conversion/object-template-demo/napi/proxy-template.cc
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/proxy-template.cc
rename to src/2-js-to-native-conversion/object-template-demo/napi/proxy-template.cc
diff --git a/src/js-to-native-conversion/object-template-demo/napi/proxy-template.h b/src/2-js-to-native-conversion/object-template-demo/napi/proxy-template.h
similarity index 100%
rename from src/js-to-native-conversion/object-template-demo/napi/proxy-template.h
rename to src/2-js-to-native-conversion/object-template-demo/napi/proxy-template.h
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/README.md b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/README.md
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/README.md
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/README.md
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/binding.gyp b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/binding.gyp
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/binding.gyp
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/lib/binding.js b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/lib/binding.js
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/lib/binding.js
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/lib/binding.js
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/package.json b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/package.json
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/package.json
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/package.json
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.cc b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.cc
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.cc
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.cc
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.h b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.h
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.h
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/src/object_wrap_demo.h
diff --git a/src/js-to-native-conversion/object-wrap-demo/node-addon-api/test/test_binding.js b/src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/test/test_binding.js
similarity index 100%
rename from src/js-to-native-conversion/object-wrap-demo/node-addon-api/test/test_binding.js
rename to src/2-js-to-native-conversion/object-wrap-demo/node-addon-api/test/test_binding.js
diff --git a/src/js-to-native-conversion/typed_array_to_native/node-addon-api/binding.gyp b/src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/binding.gyp
similarity index 100%
rename from src/js-to-native-conversion/typed_array_to_native/node-addon-api/binding.gyp
rename to src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/binding.gyp
diff --git a/src/js-to-native-conversion/typed_array_to_native/node-addon-api/index.js b/src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/index.js
similarity index 100%
rename from src/js-to-native-conversion/typed_array_to_native/node-addon-api/index.js
rename to src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/index.js
diff --git a/src/js-to-native-conversion/typed_array_to_native/node-addon-api/package.json b/src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/package.json
similarity index 100%
rename from src/js-to-native-conversion/typed_array_to_native/node-addon-api/package.json
rename to src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/package.json
diff --git a/src/js-to-native-conversion/typed_array_to_native/node-addon-api/typed_array_to_native.cc b/src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/typed_array_to_native.cc
similarity index 100%
rename from src/js-to-native-conversion/typed_array_to_native/node-addon-api/typed_array_to_native.cc
rename to src/2-js-to-native-conversion/typed_array_to_native/node-addon-api/typed_array_to_native.cc
diff --git a/src/context-awareness/napi/binding.gyp b/src/3-context-awareness/napi/binding.gyp
similarity index 100%
rename from src/context-awareness/napi/binding.gyp
rename to src/3-context-awareness/napi/binding.gyp
diff --git a/src/context-awareness/napi/index.js b/src/3-context-awareness/napi/index.js
similarity index 100%
rename from src/context-awareness/napi/index.js
rename to src/3-context-awareness/napi/index.js
diff --git a/src/context-awareness/napi/multiple_load.c b/src/3-context-awareness/napi/multiple_load.c
similarity index 100%
rename from src/context-awareness/napi/multiple_load.c
rename to src/3-context-awareness/napi/multiple_load.c
diff --git a/src/context-awareness/napi/package.json b/src/3-context-awareness/napi/package.json
similarity index 100%
rename from src/context-awareness/napi/package.json
rename to src/3-context-awareness/napi/package.json
diff --git a/src/context-awareness/node_10/binding.gyp b/src/3-context-awareness/node_10/binding.gyp
similarity index 100%
rename from src/context-awareness/node_10/binding.gyp
rename to src/3-context-awareness/node_10/binding.gyp
diff --git a/src/context-awareness/node_10/index.js b/src/3-context-awareness/node_10/index.js
similarity index 100%
rename from src/context-awareness/node_10/index.js
rename to src/3-context-awareness/node_10/index.js
diff --git a/src/context-awareness/node_10/multiple_load.cc b/src/3-context-awareness/node_10/multiple_load.cc
similarity index 100%
rename from src/context-awareness/node_10/multiple_load.cc
rename to src/3-context-awareness/node_10/multiple_load.cc
diff --git a/src/context-awareness/node_10/package.json b/src/3-context-awareness/node_10/package.json
similarity index 100%
rename from src/context-awareness/node_10/package.json
rename to src/3-context-awareness/node_10/package.json
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/binding.gyp b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/binding.gyp
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/binding.gyp
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/binding.gyp
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/index.js b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/index.js
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/index.js
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/index.js
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/package.json b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/package.json
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/package.json
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/package.json
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/src/binding.cc b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/binding.cc
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/src/binding.cc
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/binding.cc
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.cc b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.cc
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.cc
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.cc
diff --git a/src/references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.h b/src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.h
similarity index 100%
rename from src/references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.h
rename to src/4-references-and-handle-scope/function-reference-demo/node-addon-api/src/native-addon.h
diff --git a/src/async-work/async-iterator/node-addon-api/CMakeLists.txt b/src/5-async-work/async-iterator/node-addon-api/CMakeLists.txt
similarity index 100%
rename from src/async-work/async-iterator/node-addon-api/CMakeLists.txt
rename to src/5-async-work/async-iterator/node-addon-api/CMakeLists.txt
diff --git a/src/async-work/async-iterator/node-addon-api/example.cc b/src/5-async-work/async-iterator/node-addon-api/example.cc
similarity index 100%
rename from src/async-work/async-iterator/node-addon-api/example.cc
rename to src/5-async-work/async-iterator/node-addon-api/example.cc
diff --git a/src/async-work/async-iterator/node-addon-api/index.js b/src/5-async-work/async-iterator/node-addon-api/index.js
similarity index 100%
rename from src/async-work/async-iterator/node-addon-api/index.js
rename to src/5-async-work/async-iterator/node-addon-api/index.js
diff --git a/src/async-work/async-iterator/node-addon-api/package.json b/src/5-async-work/async-iterator/node-addon-api/package.json
similarity index 100%
rename from src/async-work/async-iterator/node-addon-api/package.json
rename to src/5-async-work/async-iterator/node-addon-api/package.json
diff --git a/src/async-work/async_pi_estimate/nan/README.md b/src/5-async-work/async_pi_estimate/nan/README.md
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/README.md
rename to src/5-async-work/async_pi_estimate/nan/README.md
diff --git a/src/async-work/async_pi_estimate/nan/addon.cc b/src/5-async-work/async_pi_estimate/nan/addon.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/addon.cc
rename to src/5-async-work/async_pi_estimate/nan/addon.cc
diff --git a/src/async-work/async_pi_estimate/nan/addon.js b/src/5-async-work/async_pi_estimate/nan/addon.js
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/addon.js
rename to src/5-async-work/async_pi_estimate/nan/addon.js
diff --git a/src/async-work/async_pi_estimate/nan/async.cc b/src/5-async-work/async_pi_estimate/nan/async.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/async.cc
rename to src/5-async-work/async_pi_estimate/nan/async.cc
diff --git a/src/async-work/async_pi_estimate/nan/async.h b/src/5-async-work/async_pi_estimate/nan/async.h
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/async.h
rename to src/5-async-work/async_pi_estimate/nan/async.h
diff --git a/src/async-work/async_pi_estimate/nan/binding.gyp b/src/5-async-work/async_pi_estimate/nan/binding.gyp
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/binding.gyp
rename to src/5-async-work/async_pi_estimate/nan/binding.gyp
diff --git a/src/async-work/async_pi_estimate/nan/package.json b/src/5-async-work/async_pi_estimate/nan/package.json
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/package.json
rename to src/5-async-work/async_pi_estimate/nan/package.json
diff --git a/src/async-work/async_pi_estimate/nan/pi_est.cc b/src/5-async-work/async_pi_estimate/nan/pi_est.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/pi_est.cc
rename to src/5-async-work/async_pi_estimate/nan/pi_est.cc
diff --git a/src/async-work/async_pi_estimate/nan/pi_est.h b/src/5-async-work/async_pi_estimate/nan/pi_est.h
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/pi_est.h
rename to src/5-async-work/async_pi_estimate/nan/pi_est.h
diff --git a/src/async-work/async_pi_estimate/nan/sync.cc b/src/5-async-work/async_pi_estimate/nan/sync.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/sync.cc
rename to src/5-async-work/async_pi_estimate/nan/sync.cc
diff --git a/src/async-work/async_pi_estimate/nan/sync.h b/src/5-async-work/async_pi_estimate/nan/sync.h
similarity index 100%
rename from src/async-work/async_pi_estimate/nan/sync.h
rename to src/5-async-work/async_pi_estimate/nan/sync.h
diff --git a/src/async-work/async_pi_estimate/node-addon-api/README.md b/src/5-async-work/async_pi_estimate/node-addon-api/README.md
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/README.md
rename to src/5-async-work/async_pi_estimate/node-addon-api/README.md
diff --git a/src/async-work/async_pi_estimate/node-addon-api/addon.cc b/src/5-async-work/async_pi_estimate/node-addon-api/addon.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/addon.cc
rename to src/5-async-work/async_pi_estimate/node-addon-api/addon.cc
diff --git a/src/async-work/async_pi_estimate/node-addon-api/addon.js b/src/5-async-work/async_pi_estimate/node-addon-api/addon.js
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/addon.js
rename to src/5-async-work/async_pi_estimate/node-addon-api/addon.js
diff --git a/src/async-work/async_pi_estimate/node-addon-api/async.cc b/src/5-async-work/async_pi_estimate/node-addon-api/async.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/async.cc
rename to src/5-async-work/async_pi_estimate/node-addon-api/async.cc
diff --git a/src/async-work/async_pi_estimate/node-addon-api/async.h b/src/5-async-work/async_pi_estimate/node-addon-api/async.h
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/async.h
rename to src/5-async-work/async_pi_estimate/node-addon-api/async.h
diff --git a/src/async-work/async_pi_estimate/node-addon-api/binding.gyp b/src/5-async-work/async_pi_estimate/node-addon-api/binding.gyp
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/binding.gyp
rename to src/5-async-work/async_pi_estimate/node-addon-api/binding.gyp
diff --git a/src/async-work/async_pi_estimate/node-addon-api/package.json b/src/5-async-work/async_pi_estimate/node-addon-api/package.json
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/package.json
rename to src/5-async-work/async_pi_estimate/node-addon-api/package.json
diff --git a/src/async-work/async_pi_estimate/node-addon-api/pi_est.cc b/src/5-async-work/async_pi_estimate/node-addon-api/pi_est.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/pi_est.cc
rename to src/5-async-work/async_pi_estimate/node-addon-api/pi_est.cc
diff --git a/src/async-work/async_pi_estimate/node-addon-api/pi_est.h b/src/5-async-work/async_pi_estimate/node-addon-api/pi_est.h
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/pi_est.h
rename to src/5-async-work/async_pi_estimate/node-addon-api/pi_est.h
diff --git a/src/async-work/async_pi_estimate/node-addon-api/sync.cc b/src/5-async-work/async_pi_estimate/node-addon-api/sync.cc
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/sync.cc
rename to src/5-async-work/async_pi_estimate/node-addon-api/sync.cc
diff --git a/src/async-work/async_pi_estimate/node-addon-api/sync.h b/src/5-async-work/async_pi_estimate/node-addon-api/sync.h
similarity index 100%
rename from src/async-work/async_pi_estimate/node-addon-api/sync.h
rename to src/5-async-work/async_pi_estimate/node-addon-api/sync.h
diff --git a/src/async-work/async_work_promise/napi/binding.c b/src/5-async-work/async_work_promise/napi/binding.c
similarity index 100%
rename from src/async-work/async_work_promise/napi/binding.c
rename to src/5-async-work/async_work_promise/napi/binding.c
diff --git a/src/async-work/async_work_promise/napi/binding.gyp b/src/5-async-work/async_work_promise/napi/binding.gyp
similarity index 100%
rename from src/async-work/async_work_promise/napi/binding.gyp
rename to src/5-async-work/async_work_promise/napi/binding.gyp
diff --git a/src/async-work/async_work_promise/napi/index.js b/src/5-async-work/async_work_promise/napi/index.js
similarity index 100%
rename from src/async-work/async_work_promise/napi/index.js
rename to src/5-async-work/async_work_promise/napi/index.js
diff --git a/src/async-work/async_work_promise/napi/package.json b/src/5-async-work/async_work_promise/napi/package.json
similarity index 100%
rename from src/async-work/async_work_promise/napi/package.json
rename to src/5-async-work/async_work_promise/napi/package.json
diff --git a/src/async-work/async_work_promise/node-addon-api/addon.cc b/src/5-async-work/async_work_promise/node-addon-api/addon.cc
similarity index 100%
rename from src/async-work/async_work_promise/node-addon-api/addon.cc
rename to src/5-async-work/async_work_promise/node-addon-api/addon.cc
diff --git a/src/async-work/async_work_promise/node-addon-api/binding.gyp b/src/5-async-work/async_work_promise/node-addon-api/binding.gyp
similarity index 100%
rename from src/async-work/async_work_promise/node-addon-api/binding.gyp
rename to src/5-async-work/async_work_promise/node-addon-api/binding.gyp
diff --git a/src/async-work/async_work_promise/node-addon-api/index.js b/src/5-async-work/async_work_promise/node-addon-api/index.js
similarity index 100%
rename from src/async-work/async_work_promise/node-addon-api/index.js
rename to src/5-async-work/async_work_promise/node-addon-api/index.js
diff --git a/src/async-work/async_work_promise/node-addon-api/package.json b/src/5-async-work/async_work_promise/node-addon-api/package.json
similarity index 100%
rename from src/async-work/async_work_promise/node-addon-api/package.json
rename to src/5-async-work/async_work_promise/node-addon-api/package.json
diff --git a/src/async-work/async_work_promise/node-addon-api/worker.h b/src/5-async-work/async_work_promise/node-addon-api/worker.h
similarity index 100%
rename from src/async-work/async_work_promise/node-addon-api/worker.h
rename to src/5-async-work/async_work_promise/node-addon-api/worker.h
diff --git a/src/async-work/async_work_thread_safe_function/napi/binding.c b/src/5-async-work/async_work_thread_safe_function/napi/binding.c
similarity index 100%
rename from src/async-work/async_work_thread_safe_function/napi/binding.c
rename to src/5-async-work/async_work_thread_safe_function/napi/binding.c
diff --git a/src/async-work/async_work_thread_safe_function/napi/binding.gyp b/src/5-async-work/async_work_thread_safe_function/napi/binding.gyp
similarity index 100%
rename from src/async-work/async_work_thread_safe_function/napi/binding.gyp
rename to src/5-async-work/async_work_thread_safe_function/napi/binding.gyp
diff --git a/src/async-work/async_work_thread_safe_function/napi/index.js b/src/5-async-work/async_work_thread_safe_function/napi/index.js
similarity index 100%
rename from src/async-work/async_work_thread_safe_function/napi/index.js
rename to src/5-async-work/async_work_thread_safe_function/napi/index.js
diff --git a/src/async-work/async_work_thread_safe_function/napi/package.json b/src/5-async-work/async_work_thread_safe_function/napi/package.json
similarity index 100%
rename from src/async-work/async_work_thread_safe_function/napi/package.json
rename to src/5-async-work/async_work_thread_safe_function/napi/package.json
diff --git a/src/async-work/call-js-from-async-worker-execute/node-addon-api/binding.gyp b/src/5-async-work/call-js-from-async-worker-execute/node-addon-api/binding.gyp
similarity index 100%
rename from src/async-work/call-js-from-async-worker-execute/node-addon-api/binding.gyp
rename to src/5-async-work/call-js-from-async-worker-execute/node-addon-api/binding.gyp
diff --git a/src/async-work/call-js-from-async-worker-execute/node-addon-api/index.js b/src/5-async-work/call-js-from-async-worker-execute/node-addon-api/index.js
similarity index 100%
rename from src/async-work/call-js-from-async-worker-execute/node-addon-api/index.js
rename to src/5-async-work/call-js-from-async-worker-execute/node-addon-api/index.js
diff --git a/src/async-work/call-js-from-async-worker-execute/node-addon-api/package.json b/src/5-async-work/call-js-from-async-worker-execute/node-addon-api/package.json
similarity index 100%
rename from src/async-work/call-js-from-async-worker-execute/node-addon-api/package.json
rename to src/5-async-work/call-js-from-async-worker-execute/node-addon-api/package.json
diff --git a/src/async-work/call-js-from-async-worker-execute/node-addon-api/src/binding.cc b/src/5-async-work/call-js-from-async-worker-execute/node-addon-api/src/binding.cc
similarity index 100%
rename from src/async-work/call-js-from-async-worker-execute/node-addon-api/src/binding.cc
rename to src/5-async-work/call-js-from-async-worker-execute/node-addon-api/src/binding.cc
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/README.md b/src/5-async-work/napi-asyncworker-example/node-addon-api/README.md
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/README.md
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/README.md
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/binding.gyp b/src/5-async-work/napi-asyncworker-example/node-addon-api/binding.gyp
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/binding.gyp
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/binding.gyp
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/package.json b/src/5-async-work/napi-asyncworker-example/node-addon-api/package.json
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/package.json
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/package.json
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/src/RunSimpleAsyncWorker.cc b/src/5-async-work/napi-asyncworker-example/node-addon-api/src/RunSimpleAsyncWorker.cc
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/src/RunSimpleAsyncWorker.cc
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/src/RunSimpleAsyncWorker.cc
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.cc b/src/5-async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.cc
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.cc
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.cc
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.h b/src/5-async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.h
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.h
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/src/SimpleAsyncWorker.h
diff --git a/src/async-work/napi-asyncworker-example/node-addon-api/test/Test.js b/src/5-async-work/napi-asyncworker-example/node-addon-api/test/Test.js
similarity index 100%
rename from src/async-work/napi-asyncworker-example/node-addon-api/test/Test.js
rename to src/5-async-work/napi-asyncworker-example/node-addon-api/test/Test.js
diff --git a/src/threadsafe-function/promise-callback-demo/node-addon-api/README.md b/src/6-threadsafe-function/promise-callback-demo/node-addon-api/README.md
similarity index 100%
rename from src/threadsafe-function/promise-callback-demo/node-addon-api/README.md
rename to src/6-threadsafe-function/promise-callback-demo/node-addon-api/README.md
diff --git a/src/threadsafe-function/promise-callback-demo/node-addon-api/binding.gyp b/src/6-threadsafe-function/promise-callback-demo/node-addon-api/binding.gyp
similarity index 100%
rename from src/threadsafe-function/promise-callback-demo/node-addon-api/binding.gyp
rename to src/6-threadsafe-function/promise-callback-demo/node-addon-api/binding.gyp
diff --git a/src/threadsafe-function/promise-callback-demo/node-addon-api/package.json b/src/6-threadsafe-function/promise-callback-demo/node-addon-api/package.json
similarity index 100%
rename from src/threadsafe-function/promise-callback-demo/node-addon-api/package.json
rename to src/6-threadsafe-function/promise-callback-demo/node-addon-api/package.json
diff --git a/src/threadsafe-function/promise-callback-demo/node-addon-api/src/promise_callback_demo.cc b/src/6-threadsafe-function/promise-callback-demo/node-addon-api/src/promise_callback_demo.cc
similarity index 100%
rename from src/threadsafe-function/promise-callback-demo/node-addon-api/src/promise_callback_demo.cc
rename to src/6-threadsafe-function/promise-callback-demo/node-addon-api/src/promise_callback_demo.cc
diff --git a/src/threadsafe-function/promise-callback-demo/node-addon-api/test/index.js b/src/6-threadsafe-function/promise-callback-demo/node-addon-api/test/index.js
similarity index 100%
rename from src/threadsafe-function/promise-callback-demo/node-addon-api/test/index.js
rename to src/6-threadsafe-function/promise-callback-demo/node-addon-api/test/index.js
diff --git a/src/threadsafe-function/thread_safe_function_counting/node-addon-api/addon.cc b/src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/addon.cc
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_counting/node-addon-api/addon.cc
rename to src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/addon.cc
diff --git a/src/threadsafe-function/thread_safe_function_counting/node-addon-api/addon.js b/src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/addon.js
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_counting/node-addon-api/addon.js
rename to src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/addon.js
diff --git a/src/threadsafe-function/thread_safe_function_counting/node-addon-api/binding.gyp b/src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/binding.gyp
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_counting/node-addon-api/binding.gyp
rename to src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/binding.gyp
diff --git a/src/threadsafe-function/thread_safe_function_counting/node-addon-api/package.json b/src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/package.json
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_counting/node-addon-api/package.json
rename to src/6-threadsafe-function/thread_safe_function_counting/node-addon-api/package.json
diff --git a/src/threadsafe-function/thread_safe_function_round_trip/napi/binding.gyp b/src/6-threadsafe-function/thread_safe_function_round_trip/napi/binding.gyp
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_round_trip/napi/binding.gyp
rename to src/6-threadsafe-function/thread_safe_function_round_trip/napi/binding.gyp
diff --git a/src/threadsafe-function/thread_safe_function_round_trip/napi/index.js b/src/6-threadsafe-function/thread_safe_function_round_trip/napi/index.js
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_round_trip/napi/index.js
rename to src/6-threadsafe-function/thread_safe_function_round_trip/napi/index.js
diff --git a/src/threadsafe-function/thread_safe_function_round_trip/napi/package.json b/src/6-threadsafe-function/thread_safe_function_round_trip/napi/package.json
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_round_trip/napi/package.json
rename to src/6-threadsafe-function/thread_safe_function_round_trip/napi/package.json
diff --git a/src/threadsafe-function/thread_safe_function_round_trip/napi/round_trip.c b/src/6-threadsafe-function/thread_safe_function_round_trip/napi/round_trip.c
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_round_trip/napi/round_trip.c
rename to src/6-threadsafe-function/thread_safe_function_round_trip/napi/round_trip.c
diff --git a/src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/binding.gyp b/src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/binding.gyp
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/binding.gyp
rename to src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/binding.gyp
diff --git a/src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/package.json b/src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/package.json
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/package.json
rename to src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/package.json
diff --git a/src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.cc b/src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.cc
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.cc
rename to src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.cc
diff --git a/src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.js b/src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.js
similarity index 100%
rename from src/threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.js
rename to src/6-threadsafe-function/thread_safe_function_with_object_wrap/node-addon-api/tsfn_object_wrap.js
diff --git a/src/threadsafe-function/threadsafe-async-iterator/node-addon-api/CMakeLists.txt b/src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/CMakeLists.txt
similarity index 100%
rename from src/threadsafe-function/threadsafe-async-iterator/node-addon-api/CMakeLists.txt
rename to src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/CMakeLists.txt
diff --git a/src/threadsafe-function/threadsafe-async-iterator/node-addon-api/example.cc b/src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/example.cc
similarity index 100%
rename from src/threadsafe-function/threadsafe-async-iterator/node-addon-api/example.cc
rename to src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/example.cc
diff --git a/src/threadsafe-function/threadsafe-async-iterator/node-addon-api/index.js b/src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/index.js
similarity index 100%
rename from src/threadsafe-function/threadsafe-async-iterator/node-addon-api/index.js
rename to src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/index.js
diff --git a/src/threadsafe-function/threadsafe-async-iterator/node-addon-api/package.json b/src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/package.json
similarity index 100%
rename from src/threadsafe-function/threadsafe-async-iterator/node-addon-api/package.json
rename to src/6-threadsafe-function/threadsafe-async-iterator/node-addon-api/package.json
diff --git a/src/threadsafe-function/typed_threadsafe_function/node-addon-api/CMakeLists.txt b/src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/CMakeLists.txt
similarity index 100%
rename from src/threadsafe-function/typed_threadsafe_function/node-addon-api/CMakeLists.txt
rename to src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/CMakeLists.txt
diff --git a/src/threadsafe-function/typed_threadsafe_function/node-addon-api/clock.cc b/src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/clock.cc
similarity index 100%
rename from src/threadsafe-function/typed_threadsafe_function/node-addon-api/clock.cc
rename to src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/clock.cc
diff --git a/src/threadsafe-function/typed_threadsafe_function/node-addon-api/index.js b/src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/index.js
similarity index 100%
rename from src/threadsafe-function/typed_threadsafe_function/node-addon-api/index.js
rename to src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/index.js
diff --git a/src/threadsafe-function/typed_threadsafe_function/node-addon-api/package.json b/src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/package.json
similarity index 100%
rename from src/threadsafe-function/typed_threadsafe_function/node-addon-api/package.json
rename to src/6-threadsafe-function/typed_threadsafe_function/node-addon-api/package.json
diff --git a/src/events/emit_event_from_cpp/node-addon-api/binding.gyp b/src/7-events/emit_event_from_cpp/node-addon-api/binding.gyp
similarity index 100%
rename from src/events/emit_event_from_cpp/node-addon-api/binding.gyp
rename to src/7-events/emit_event_from_cpp/node-addon-api/binding.gyp
diff --git a/src/events/emit_event_from_cpp/node-addon-api/index.js b/src/7-events/emit_event_from_cpp/node-addon-api/index.js
similarity index 100%
rename from src/events/emit_event_from_cpp/node-addon-api/index.js
rename to src/7-events/emit_event_from_cpp/node-addon-api/index.js
diff --git a/src/events/emit_event_from_cpp/node-addon-api/package.json b/src/7-events/emit_event_from_cpp/node-addon-api/package.json
similarity index 100%
rename from src/events/emit_event_from_cpp/node-addon-api/package.json
rename to src/7-events/emit_event_from_cpp/node-addon-api/package.json
diff --git a/src/events/emit_event_from_cpp/node-addon-api/src/emit-from-cpp.cc b/src/7-events/emit_event_from_cpp/node-addon-api/src/emit-from-cpp.cc
similarity index 100%
rename from src/events/emit_event_from_cpp/node-addon-api/src/emit-from-cpp.cc
rename to src/7-events/emit_event_from_cpp/node-addon-api/src/emit-from-cpp.cc
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/binding.gyp b/src/7-events/inherits_from_event_emitter/node-addon-api/binding.gyp
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/binding.gyp
rename to src/7-events/inherits_from_event_emitter/node-addon-api/binding.gyp
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/index.js b/src/7-events/inherits_from_event_emitter/node-addon-api/index.js
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/index.js
rename to src/7-events/inherits_from_event_emitter/node-addon-api/index.js
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/package.json b/src/7-events/inherits_from_event_emitter/node-addon-api/package.json
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/package.json
rename to src/7-events/inherits_from_event_emitter/node-addon-api/package.json
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/src/binding.cc b/src/7-events/inherits_from_event_emitter/node-addon-api/src/binding.cc
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/src/binding.cc
rename to src/7-events/inherits_from_event_emitter/node-addon-api/src/binding.cc
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc b/src/7-events/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc
rename to src/7-events/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc
diff --git a/src/events/inherits_from_event_emitter/node-addon-api/src/native-emitter.h b/src/7-events/inherits_from_event_emitter/node-addon-api/src/native-emitter.h
similarity index 100%
rename from src/events/inherits_from_event_emitter/node-addon-api/src/native-emitter.h
rename to src/7-events/inherits_from_event_emitter/node-addon-api/src/native-emitter.h
diff --git a/src/tooling/typescript_with_addon/node-addon-api/CMakeLists.txt b/src/8-tooling/typescript_with_addon/node-addon-api/CMakeLists.txt
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/CMakeLists.txt
rename to src/8-tooling/typescript_with_addon/node-addon-api/CMakeLists.txt
diff --git a/src/tooling/typescript_with_addon/node-addon-api/README.md b/src/8-tooling/typescript_with_addon/node-addon-api/README.md
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/README.md
rename to src/8-tooling/typescript_with_addon/node-addon-api/README.md
diff --git a/src/tooling/typescript_with_addon/node-addon-api/cPart.c b/src/8-tooling/typescript_with_addon/node-addon-api/cPart.c
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/cPart.c
rename to src/8-tooling/typescript_with_addon/node-addon-api/cPart.c
diff --git a/src/tooling/typescript_with_addon/node-addon-api/cPart.h b/src/8-tooling/typescript_with_addon/node-addon-api/cPart.h
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/cPart.h
rename to src/8-tooling/typescript_with_addon/node-addon-api/cPart.h
diff --git a/src/tooling/typescript_with_addon/node-addon-api/cppPart.cpp b/src/8-tooling/typescript_with_addon/node-addon-api/cppPart.cpp
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/cppPart.cpp
rename to src/8-tooling/typescript_with_addon/node-addon-api/cppPart.cpp
diff --git a/src/tooling/typescript_with_addon/node-addon-api/index.ts b/src/8-tooling/typescript_with_addon/node-addon-api/index.ts
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/index.ts
rename to src/8-tooling/typescript_with_addon/node-addon-api/index.ts
diff --git a/src/tooling/typescript_with_addon/node-addon-api/jsPart.js b/src/8-tooling/typescript_with_addon/node-addon-api/jsPart.js
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/jsPart.js
rename to src/8-tooling/typescript_with_addon/node-addon-api/jsPart.js
diff --git a/src/tooling/typescript_with_addon/node-addon-api/napiPart.cpp b/src/8-tooling/typescript_with_addon/node-addon-api/napiPart.cpp
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/napiPart.cpp
rename to src/8-tooling/typescript_with_addon/node-addon-api/napiPart.cpp
diff --git a/src/tooling/typescript_with_addon/node-addon-api/package.json b/src/8-tooling/typescript_with_addon/node-addon-api/package.json
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/package.json
rename to src/8-tooling/typescript_with_addon/node-addon-api/package.json
diff --git a/src/tooling/typescript_with_addon/node-addon-api/tsconfig.json b/src/8-tooling/typescript_with_addon/node-addon-api/tsconfig.json
similarity index 100%
rename from src/tooling/typescript_with_addon/node-addon-api/tsconfig.json
rename to src/8-tooling/typescript_with_addon/node-addon-api/tsconfig.json