diff --git a/examples/ch2-01/hello-01/main.go b/examples/ch2-01-quick-guide/hello-01/main.go similarity index 100% rename from examples/ch2-01/hello-01/main.go rename to examples/ch2-01-quick-guide/hello-01/main.go diff --git a/examples/ch2-01/hello-02/main.go b/examples/ch2-01-quick-guide/hello-02/main.go similarity index 100% rename from examples/ch2-01/hello-02/main.go rename to examples/ch2-01-quick-guide/hello-02/main.go diff --git a/examples/ch2-01/hello-03/hello.c b/examples/ch2-01-quick-guide/hello-03/hello.c similarity index 100% rename from examples/ch2-01/hello-03/hello.c rename to examples/ch2-01-quick-guide/hello-03/hello.c diff --git a/examples/ch2-01/hello-03/main.go b/examples/ch2-01-quick-guide/hello-03/main.go similarity index 100% rename from examples/ch2-01/hello-03/main.go rename to examples/ch2-01-quick-guide/hello-03/main.go diff --git a/examples/ch2-01/hello-04/main.go b/examples/ch2-01-quick-guide/hello-04/main.go similarity index 100% rename from examples/ch2-01/hello-04/main.go rename to examples/ch2-01-quick-guide/hello-04/main.go diff --git a/examples/ch2-01/hello-05/main.go b/examples/ch2-01-quick-guide/hello-05/main.go similarity index 100% rename from examples/ch2-01/hello-05/main.go rename to examples/ch2-01-quick-guide/hello-05/main.go diff --git a/examples/ch2-01/hello-06/main.go b/examples/ch2-01-quick-guide/hello-06/main.go similarity index 100% rename from examples/ch2-01/hello-06/main.go rename to examples/ch2-01-quick-guide/hello-06/main.go diff --git a/examples/ch2-04/return-go-ptr/main.go b/examples/ch2-04-func/return-go-ptr/main.go similarity index 100% rename from examples/ch2-04/return-go-ptr/main.go rename to examples/ch2-04-func/return-go-ptr/main.go diff --git a/examples/ch2-05/class-cc2go/main.go b/examples/ch2-08-class/class-cc2go/main.go similarity index 100% rename from examples/ch2-05/class-cc2go/main.go rename to examples/ch2-08-class/class-cc2go/main.go diff --git a/examples/ch2-05/class-cc2go/my_buffer.cc b/examples/ch2-08-class/class-cc2go/my_buffer.cc similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer.cc rename to examples/ch2-08-class/class-cc2go/my_buffer.cc diff --git a/examples/ch2-05/class-cc2go/my_buffer.go b/examples/ch2-08-class/class-cc2go/my_buffer.go similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer.go rename to examples/ch2-08-class/class-cc2go/my_buffer.go diff --git a/examples/ch2-05/class-cc2go/my_buffer.h b/examples/ch2-08-class/class-cc2go/my_buffer.h similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer.h rename to examples/ch2-08-class/class-cc2go/my_buffer.h diff --git a/examples/ch2-05/class-cc2go/my_buffer_capi.cc b/examples/ch2-08-class/class-cc2go/my_buffer_capi.cc similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer_capi.cc rename to examples/ch2-08-class/class-cc2go/my_buffer_capi.cc diff --git a/examples/ch2-05/class-cc2go/my_buffer_capi.go b/examples/ch2-08-class/class-cc2go/my_buffer_capi.go similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer_capi.go rename to examples/ch2-08-class/class-cc2go/my_buffer_capi.go diff --git a/examples/ch2-05/class-cc2go/my_buffer_capi.h b/examples/ch2-08-class/class-cc2go/my_buffer_capi.h similarity index 100% rename from examples/ch2-05/class-cc2go/my_buffer_capi.h rename to examples/ch2-08-class/class-cc2go/my_buffer_capi.h diff --git a/examples/ch2-05/class-go2cc/goobj.go b/examples/ch2-08-class/class-go2cc/goobj.go similarity index 100% rename from examples/ch2-05/class-go2cc/goobj.go rename to examples/ch2-08-class/class-go2cc/goobj.go diff --git a/examples/ch2-05/class-go2cc/main.cc b/examples/ch2-08-class/class-go2cc/main.cc similarity index 100% rename from examples/ch2-05/class-go2cc/main.cc rename to examples/ch2-08-class/class-go2cc/main.cc diff --git a/examples/ch2-05/class-go2cc/main.go b/examples/ch2-08-class/class-go2cc/main.go similarity index 100% rename from examples/ch2-05/class-go2cc/main.go rename to examples/ch2-08-class/class-go2cc/main.go diff --git a/examples/ch2-05/class-go2cc/persion.go b/examples/ch2-08-class/class-go2cc/persion.go similarity index 100% rename from examples/ch2-05/class-go2cc/persion.go rename to examples/ch2-08-class/class-go2cc/persion.go diff --git a/examples/ch2-05/class-go2cc/person.cc b/examples/ch2-08-class/class-go2cc/person.cc similarity index 100% rename from examples/ch2-05/class-go2cc/person.cc rename to examples/ch2-08-class/class-go2cc/person.cc diff --git a/examples/ch2-05/class-go2cc/person.h b/examples/ch2-08-class/class-go2cc/person.h similarity index 100% rename from examples/ch2-05/class-go2cc/person.h rename to examples/ch2-08-class/class-go2cc/person.h diff --git a/examples/ch2-05/class-go2cc/person_capi.go b/examples/ch2-08-class/class-go2cc/person_capi.go similarity index 100% rename from examples/ch2-05/class-go2cc/person_capi.go rename to examples/ch2-08-class/class-go2cc/person_capi.go diff --git a/examples/ch2-05/class-go2cc/person_capi.h b/examples/ch2-08-class/class-go2cc/person_capi.h similarity index 100% rename from examples/ch2-05/class-go2cc/person_capi.h rename to examples/ch2-08-class/class-go2cc/person_capi.h diff --git a/examples/ch2-06/incorrect-dll-api/Makefile b/examples/ch2-09-so-and-lib/incorrect-dll-api/Makefile similarity index 100% rename from examples/ch2-06/incorrect-dll-api/Makefile rename to examples/ch2-09-so-and-lib/incorrect-dll-api/Makefile diff --git a/examples/ch2-06/incorrect-dll-api/main.go b/examples/ch2-09-so-and-lib/incorrect-dll-api/main.go similarity index 100% rename from examples/ch2-06/incorrect-dll-api/main.go rename to examples/ch2-09-so-and-lib/incorrect-dll-api/main.go diff --git a/examples/ch2-06/incorrect-dll-api/mystring/Makefile b/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/Makefile similarity index 100% rename from examples/ch2-06/incorrect-dll-api/mystring/Makefile rename to examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/Makefile diff --git a/examples/ch2-06/incorrect-dll-api/mystring/mystring.c b/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.c similarity index 100% rename from examples/ch2-06/incorrect-dll-api/mystring/mystring.c rename to examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.c diff --git a/examples/ch2-06/incorrect-dll-api/mystring/mystring.h b/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.h similarity index 100% rename from examples/ch2-06/incorrect-dll-api/mystring/mystring.h rename to examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.h diff --git a/examples/ch2-06/make-clib-dll/Makefile b/examples/ch2-09-so-and-lib/make-clib-dll/Makefile similarity index 100% rename from examples/ch2-06/make-clib-dll/Makefile rename to examples/ch2-09-so-and-lib/make-clib-dll/Makefile diff --git a/examples/ch2-06/make-clib-dll/_test_main.c b/examples/ch2-09-so-and-lib/make-clib-dll/_test_main.c similarity index 100% rename from examples/ch2-06/make-clib-dll/_test_main.c rename to examples/ch2-09-so-and-lib/make-clib-dll/_test_main.c diff --git a/examples/ch2-06/make-clib-dll/main.go b/examples/ch2-09-so-and-lib/make-clib-dll/main.go similarity index 100% rename from examples/ch2-06/make-clib-dll/main.go rename to examples/ch2-09-so-and-lib/make-clib-dll/main.go diff --git a/examples/ch2-06/make-clib-dll/number-win64.def b/examples/ch2-09-so-and-lib/make-clib-dll/number-win64.def similarity index 100% rename from examples/ch2-06/make-clib-dll/number-win64.def rename to examples/ch2-09-so-and-lib/make-clib-dll/number-win64.def diff --git a/examples/ch2-06/make-clib-dll/number.h b/examples/ch2-09-so-and-lib/make-clib-dll/number.h similarity index 100% rename from examples/ch2-06/make-clib-dll/number.h rename to examples/ch2-09-so-and-lib/make-clib-dll/number.h diff --git a/examples/ch2-06/make-clib-from-multi-pkg/Makefile b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/Makefile similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/Makefile rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/Makefile diff --git a/examples/ch2-06/make-clib-from-multi-pkg/_test_main.c b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/_test_main.c similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/_test_main.c rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/_test_main.c diff --git a/examples/ch2-06/make-clib-from-multi-pkg/main.go b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.go similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/main.go rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.go diff --git a/examples/ch2-06/make-clib-from-multi-pkg/main.h b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.h similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/main.h rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.h diff --git a/examples/ch2-06/make-clib-from-multi-pkg/number/number.go b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.go similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/number/number.go rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.go diff --git a/examples/ch2-06/make-clib-from-multi-pkg/number/number.h b/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.h similarity index 100% rename from examples/ch2-06/make-clib-from-multi-pkg/number/number.h rename to examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.h diff --git a/examples/ch2-06/make-clib-shared/Makefile b/examples/ch2-09-so-and-lib/make-clib-shared/Makefile similarity index 100% rename from examples/ch2-06/make-clib-shared/Makefile rename to examples/ch2-09-so-and-lib/make-clib-shared/Makefile diff --git a/examples/ch2-06/make-clib-shared/_test_main.c b/examples/ch2-09-so-and-lib/make-clib-shared/_test_main.c similarity index 100% rename from examples/ch2-06/make-clib-shared/_test_main.c rename to examples/ch2-09-so-and-lib/make-clib-shared/_test_main.c diff --git a/examples/ch2-06/make-clib-shared/main.go b/examples/ch2-09-so-and-lib/make-clib-shared/main.go similarity index 100% rename from examples/ch2-06/make-clib-shared/main.go rename to examples/ch2-09-so-and-lib/make-clib-shared/main.go diff --git a/examples/ch2-06/make-clib-shared/number.h b/examples/ch2-09-so-and-lib/make-clib-shared/number.h similarity index 100% rename from examples/ch2-06/make-clib-shared/number.h rename to examples/ch2-09-so-and-lib/make-clib-shared/number.h diff --git a/examples/ch2-06/make-clib-static/Makefile b/examples/ch2-09-so-and-lib/make-clib-static/Makefile similarity index 100% rename from examples/ch2-06/make-clib-static/Makefile rename to examples/ch2-09-so-and-lib/make-clib-static/Makefile diff --git a/examples/ch2-06/make-clib-static/_test_main.c b/examples/ch2-09-so-and-lib/make-clib-static/_test_main.c similarity index 100% rename from examples/ch2-06/make-clib-static/_test_main.c rename to examples/ch2-09-so-and-lib/make-clib-static/_test_main.c diff --git a/examples/ch2-06/make-clib-static/main.go b/examples/ch2-09-so-and-lib/make-clib-static/main.go similarity index 100% rename from examples/ch2-06/make-clib-static/main.go rename to examples/ch2-09-so-and-lib/make-clib-static/main.go diff --git a/examples/ch2-06/make-clib-static/number.h b/examples/ch2-09-so-and-lib/make-clib-static/number.h similarity index 100% rename from examples/ch2-06/make-clib-static/number.h rename to examples/ch2-09-so-and-lib/make-clib-static/number.h diff --git a/examples/ch2-06/plugin/Makefile b/examples/ch2-09-so-and-lib/plugin/Makefile similarity index 100% rename from examples/ch2-06/plugin/Makefile rename to examples/ch2-09-so-and-lib/plugin/Makefile diff --git a/examples/ch2-06/plugin/main.go b/examples/ch2-09-so-and-lib/plugin/main.go similarity index 100% rename from examples/ch2-06/plugin/main.go rename to examples/ch2-09-so-and-lib/plugin/main.go diff --git a/examples/ch2-06/plugin/plugin.go b/examples/ch2-09-so-and-lib/plugin/plugin.go similarity index 100% rename from examples/ch2-06/plugin/plugin.go rename to examples/ch2-09-so-and-lib/plugin/plugin.go diff --git a/examples/ch2-06/use-clib-shared/Makefile b/examples/ch2-09-so-and-lib/use-clib-shared/Makefile similarity index 100% rename from examples/ch2-06/use-clib-shared/Makefile rename to examples/ch2-09-so-and-lib/use-clib-shared/Makefile diff --git a/examples/ch2-06/use-clib-shared/main.go b/examples/ch2-09-so-and-lib/use-clib-shared/main.go similarity index 100% rename from examples/ch2-06/use-clib-shared/main.go rename to examples/ch2-09-so-and-lib/use-clib-shared/main.go diff --git a/examples/ch2-06/use-clib-shared/number/Makefile b/examples/ch2-09-so-and-lib/use-clib-shared/number/Makefile similarity index 100% rename from examples/ch2-06/use-clib-shared/number/Makefile rename to examples/ch2-09-so-and-lib/use-clib-shared/number/Makefile diff --git a/examples/ch2-06/use-clib-shared/number/number.c b/examples/ch2-09-so-and-lib/use-clib-shared/number/number.c similarity index 100% rename from examples/ch2-06/use-clib-shared/number/number.c rename to examples/ch2-09-so-and-lib/use-clib-shared/number/number.c diff --git a/examples/ch2-06/use-clib-shared/number/number.h b/examples/ch2-09-so-and-lib/use-clib-shared/number/number.h similarity index 100% rename from examples/ch2-06/use-clib-shared/number/number.h rename to examples/ch2-09-so-and-lib/use-clib-shared/number/number.h diff --git a/examples/ch2-06/use-clib-static-v1/Makefile b/examples/ch2-09-so-and-lib/use-clib-static-v1/Makefile similarity index 100% rename from examples/ch2-06/use-clib-static-v1/Makefile rename to examples/ch2-09-so-and-lib/use-clib-static-v1/Makefile diff --git a/examples/ch2-06/use-clib-static-v1/main.go b/examples/ch2-09-so-and-lib/use-clib-static-v1/main.go similarity index 100% rename from examples/ch2-06/use-clib-static-v1/main.go rename to examples/ch2-09-so-and-lib/use-clib-static-v1/main.go diff --git a/examples/ch2-06/use-clib-static-v1/number/Makefile b/examples/ch2-09-so-and-lib/use-clib-static-v1/number/Makefile similarity index 100% rename from examples/ch2-06/use-clib-static-v1/number/Makefile rename to examples/ch2-09-so-and-lib/use-clib-static-v1/number/Makefile diff --git a/examples/ch2-06/use-clib-static-v1/number/number.c b/examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.c similarity index 100% rename from examples/ch2-06/use-clib-static-v1/number/number.c rename to examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.c diff --git a/examples/ch2-06/use-clib-static-v1/number/number.h b/examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.h similarity index 100% rename from examples/ch2-06/use-clib-static-v1/number/number.h rename to examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.h diff --git a/examples/ch2-06/use-clib-static-v2/Makefile b/examples/ch2-09-so-and-lib/use-clib-static-v2/Makefile similarity index 100% rename from examples/ch2-06/use-clib-static-v2/Makefile rename to examples/ch2-09-so-and-lib/use-clib-static-v2/Makefile diff --git a/examples/ch2-06/use-clib-static-v2/main.go b/examples/ch2-09-so-and-lib/use-clib-static-v2/main.go similarity index 100% rename from examples/ch2-06/use-clib-static-v2/main.go rename to examples/ch2-09-so-and-lib/use-clib-static-v2/main.go diff --git a/examples/ch2-06/use-clib-static-v2/number/Makefile b/examples/ch2-09-so-and-lib/use-clib-static-v2/number/Makefile similarity index 100% rename from examples/ch2-06/use-clib-static-v2/number/Makefile rename to examples/ch2-09-so-and-lib/use-clib-static-v2/number/Makefile diff --git a/examples/ch2-06/use-clib-static-v2/number/number.c b/examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.c similarity index 100% rename from examples/ch2-06/use-clib-static-v2/number/number.c rename to examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.c diff --git a/examples/ch2-06/use-clib-static-v2/number/number.h b/examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.h similarity index 100% rename from examples/ch2-06/use-clib-static-v2/number/number.h rename to examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.h diff --git a/examples/ch2-06/use-clib-static-v2/z_link_number_c.c b/examples/ch2-09-so-and-lib/use-clib-static-v2/z_link_number_c.c similarity index 100% rename from examples/ch2-06/use-clib-static-v2/z_link_number_c.c rename to examples/ch2-09-so-and-lib/use-clib-static-v2/z_link_number_c.c diff --git a/examples/ch2-07/hello-py/Makefile b/examples/ch2-10-py/hello-py/Makefile similarity index 100% rename from examples/ch2-07/hello-py/Makefile rename to examples/ch2-10-py/hello-py/Makefile diff --git a/examples/ch2-07/hello-py/gopkg.h b/examples/ch2-10-py/hello-py/gopkg.h similarity index 100% rename from examples/ch2-07/hello-py/gopkg.h rename to examples/ch2-10-py/hello-py/gopkg.h diff --git a/examples/ch2-07/hello-py/main.go b/examples/ch2-10-py/hello-py/main.go similarity index 100% rename from examples/ch2-07/hello-py/main.go rename to examples/ch2-10-py/hello-py/main.go diff --git a/examples/ch2-07/hello-py/py3-config.go b/examples/ch2-10-py/hello-py/py3-config.go similarity index 100% rename from examples/ch2-07/hello-py/py3-config.go rename to examples/ch2-10-py/hello-py/py3-config.go diff --git a/examples/ch2-07/hello-so/Makefile b/examples/ch2-10-py/hello-so/Makefile similarity index 100% rename from examples/ch2-07/hello-so/Makefile rename to examples/ch2-10-py/hello-so/Makefile diff --git a/examples/ch2-07/hello-so/_test_so.c b/examples/ch2-10-py/hello-so/_test_so.c similarity index 100% rename from examples/ch2-07/hello-so/_test_so.c rename to examples/ch2-10-py/hello-so/_test_so.c diff --git a/examples/ch2-07/hello-so/hello.py b/examples/ch2-10-py/hello-so/hello.py similarity index 100% rename from examples/ch2-07/hello-so/hello.py rename to examples/ch2-10-py/hello-so/hello.py diff --git a/examples/ch2-07/hello-so/main.go b/examples/ch2-10-py/hello-so/main.go similarity index 100% rename from examples/ch2-07/hello-so/main.go rename to examples/ch2-10-py/hello-so/main.go diff --git a/examples/ch2-07/hello-so/say-hello.h b/examples/ch2-10-py/hello-so/say-hello.h similarity index 100% rename from examples/ch2-07/hello-so/say-hello.h rename to examples/ch2-10-py/hello-so/say-hello.h diff --git a/examples/ch2-08/hello-swig-v1/Makefile b/examples/ch2-xx-08/hello-swig-v1/Makefile similarity index 100% rename from examples/ch2-08/hello-swig-v1/Makefile rename to examples/ch2-xx-08/hello-swig-v1/Makefile diff --git a/examples/ch2-08/hello-swig-v1/hello.cc b/examples/ch2-xx-08/hello-swig-v1/hello.cc similarity index 100% rename from examples/ch2-08/hello-swig-v1/hello.cc rename to examples/ch2-xx-08/hello-swig-v1/hello.cc diff --git a/examples/ch2-08/hello-swig-v1/hello.swigcxx b/examples/ch2-xx-08/hello-swig-v1/hello.swigcxx similarity index 100% rename from examples/ch2-08/hello-swig-v1/hello.swigcxx rename to examples/ch2-xx-08/hello-swig-v1/hello.swigcxx diff --git a/examples/ch2-08/hello-swig-v1/hello_test.go b/examples/ch2-xx-08/hello-swig-v1/hello_test.go similarity index 100% rename from examples/ch2-08/hello-swig-v1/hello_test.go rename to examples/ch2-xx-08/hello-swig-v1/hello_test.go diff --git a/examples/ch2-08/hello-swig-v1/runme.go b/examples/ch2-xx-08/hello-swig-v1/runme.go similarity index 100% rename from examples/ch2-08/hello-swig-v1/runme.go rename to examples/ch2-xx-08/hello-swig-v1/runme.go diff --git a/examples/ch2-08/hello-swig-v2/Makefile b/examples/ch2-xx-08/hello-swig-v2/Makefile similarity index 100% rename from examples/ch2-08/hello-swig-v2/Makefile rename to examples/ch2-xx-08/hello-swig-v2/Makefile diff --git a/examples/ch2-08/hello-swig-v2/hello.cc b/examples/ch2-xx-08/hello-swig-v2/hello.cc similarity index 100% rename from examples/ch2-08/hello-swig-v2/hello.cc rename to examples/ch2-xx-08/hello-swig-v2/hello.cc diff --git a/examples/ch2-08/hello-swig-v2/hello.go b/examples/ch2-xx-08/hello-swig-v2/hello.go similarity index 100% rename from examples/ch2-08/hello-swig-v2/hello.go rename to examples/ch2-xx-08/hello-swig-v2/hello.go diff --git a/examples/ch2-08/hello-swig-v2/hello.i b/examples/ch2-xx-08/hello-swig-v2/hello.i similarity index 100% rename from examples/ch2-08/hello-swig-v2/hello.i rename to examples/ch2-xx-08/hello-swig-v2/hello.i diff --git a/examples/ch2-08/hello-swig-v2/runme.go b/examples/ch2-xx-08/hello-swig-v2/runme.go similarity index 100% rename from examples/ch2-08/hello-swig-v2/runme.go rename to examples/ch2-xx-08/hello-swig-v2/runme.go diff --git a/examples/ch2-08/hello-swig-v2/swig_wrap.cc b/examples/ch2-xx-08/hello-swig-v2/swig_wrap.cc similarity index 100% rename from examples/ch2-08/hello-swig-v2/swig_wrap.cc rename to examples/ch2-xx-08/hello-swig-v2/swig_wrap.cc