diff --git a/examples/ch2-10-py/hello-py/Makefile b/examples/ch2.10/hello-py/Makefile
similarity index 100%
rename from examples/ch2-10-py/hello-py/Makefile
rename to examples/ch2.10/hello-py/Makefile
diff --git a/examples/ch2-10-py/hello-py/gopkg.h b/examples/ch2.10/hello-py/gopkg.h
similarity index 100%
rename from examples/ch2-10-py/hello-py/gopkg.h
rename to examples/ch2.10/hello-py/gopkg.h
diff --git a/examples/ch2-10-py/hello-py/main.go b/examples/ch2.10/hello-py/main.go
similarity index 100%
rename from examples/ch2-10-py/hello-py/main.go
rename to examples/ch2.10/hello-py/main.go
diff --git a/examples/ch2-10-py/hello-py/py3-config.go b/examples/ch2.10/hello-py/py3-config.go
similarity index 100%
rename from examples/ch2-10-py/hello-py/py3-config.go
rename to examples/ch2.10/hello-py/py3-config.go
diff --git a/examples/ch2-10-py/hello-so/Makefile b/examples/ch2.10/hello-so/Makefile
similarity index 100%
rename from examples/ch2-10-py/hello-so/Makefile
rename to examples/ch2.10/hello-so/Makefile
diff --git a/examples/ch2-10-py/hello-so/_test_so.c b/examples/ch2.10/hello-so/_test_so.c
similarity index 100%
rename from examples/ch2-10-py/hello-so/_test_so.c
rename to examples/ch2.10/hello-so/_test_so.c
diff --git a/examples/ch2-10-py/hello-so/hello.py b/examples/ch2.10/hello-so/hello.py
similarity index 100%
rename from examples/ch2-10-py/hello-so/hello.py
rename to examples/ch2.10/hello-so/hello.py
diff --git a/examples/ch2-10-py/hello-so/main.go b/examples/ch2.10/hello-so/main.go
similarity index 100%
rename from examples/ch2-10-py/hello-so/main.go
rename to examples/ch2.10/hello-so/main.go
diff --git a/examples/ch2-10-py/hello-so/say-hello.h b/examples/ch2.10/hello-so/say-hello.h
similarity index 100%
rename from examples/ch2-10-py/hello-so/say-hello.h
rename to examples/ch2.10/hello-so/say-hello.h
diff --git a/examples/ch2-04-func/return-go-ptr/main.go b/examples/ch2.4/return-go-ptr/main.go
similarity index 100%
rename from examples/ch2-04-func/return-go-ptr/main.go
rename to examples/ch2.4/return-go-ptr/main.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/Makefile b/examples/ch2.5/01-cgo-gen-files/Makefile
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/Makefile
rename to examples/ch2.5/01-cgo-gen-files/Makefile
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_export.c b/examples/ch2.5/01-cgo-gen-files/_obj/_cgo_export.c
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_export.c
rename to examples/ch2.5/01-cgo-gen-files/_obj/_cgo_export.c
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_export.h b/examples/ch2.5/01-cgo-gen-files/_obj/_cgo_export.h
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_export.h
rename to examples/ch2.5/01-cgo-gen-files/_obj/_cgo_export.h
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_flags b/examples/ch2.5/01-cgo-gen-files/_obj/_cgo_flags
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_flags
rename to examples/ch2.5/01-cgo-gen-files/_obj/_cgo_flags
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_gotypes.go b/examples/ch2.5/01-cgo-gen-files/_obj/_cgo_gotypes.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_gotypes.go
rename to examples/ch2.5/01-cgo-gen-files/_obj/_cgo_gotypes.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_main.c b/examples/ch2.5/01-cgo-gen-files/_obj/_cgo_main.c
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/_cgo_main.c
rename to examples/ch2.5/01-cgo-gen-files/_obj/_cgo_main.c
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/hello.cgo1.go b/examples/ch2.5/01-cgo-gen-files/_obj/hello.cgo1.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/hello.cgo1.go
rename to examples/ch2.5/01-cgo-gen-files/_obj/hello.cgo1.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/hello.cgo2.c b/examples/ch2.5/01-cgo-gen-files/_obj/hello.cgo2.c
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/hello.cgo2.c
rename to examples/ch2.5/01-cgo-gen-files/_obj/hello.cgo2.c
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/main.cgo1.go b/examples/ch2.5/01-cgo-gen-files/_obj/main.cgo1.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/main.cgo1.go
rename to examples/ch2.5/01-cgo-gen-files/_obj/main.cgo1.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/_obj/main.cgo2.c b/examples/ch2.5/01-cgo-gen-files/_obj/main.cgo2.c
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/_obj/main.cgo2.c
rename to examples/ch2.5/01-cgo-gen-files/_obj/main.cgo2.c
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/hello.go b/examples/ch2.5/01-cgo-gen-files/hello.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/hello.go
rename to examples/ch2.5/01-cgo-gen-files/hello.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/main.go b/examples/ch2.5/01-cgo-gen-files/main.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/main.go
rename to examples/ch2.5/01-cgo-gen-files/main.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/nocgo_1.go b/examples/ch2.5/01-cgo-gen-files/nocgo_1.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/nocgo_1.go
rename to examples/ch2.5/01-cgo-gen-files/nocgo_1.go
diff --git a/examples/ch2-05-internal/01-cgo-gen-files/nocgo_x.go b/examples/ch2.5/01-cgo-gen-files/nocgo_x.go
similarity index 100%
rename from examples/ch2-05-internal/01-cgo-gen-files/nocgo_x.go
rename to examples/ch2.5/01-cgo-gen-files/nocgo_x.go
diff --git a/examples/ch2-05-internal/02-go-call-c-func/Makefile b/examples/ch2.5/02-go-call-c-func/Makefile
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/Makefile
rename to examples/ch2.5/02-go-call-c-func/Makefile
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_export.c b/examples/ch2.5/02-go-call-c-func/_obj/_cgo_export.c
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_export.c
rename to examples/ch2.5/02-go-call-c-func/_obj/_cgo_export.c
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_export.h b/examples/ch2.5/02-go-call-c-func/_obj/_cgo_export.h
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_export.h
rename to examples/ch2.5/02-go-call-c-func/_obj/_cgo_export.h
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_flags b/examples/ch2.5/02-go-call-c-func/_obj/_cgo_flags
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_flags
rename to examples/ch2.5/02-go-call-c-func/_obj/_cgo_flags
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_gotypes.go b/examples/ch2.5/02-go-call-c-func/_obj/_cgo_gotypes.go
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_gotypes.go
rename to examples/ch2.5/02-go-call-c-func/_obj/_cgo_gotypes.go
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_main.c b/examples/ch2.5/02-go-call-c-func/_obj/_cgo_main.c
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/_cgo_main.c
rename to examples/ch2.5/02-go-call-c-func/_obj/_cgo_main.c
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/main.cgo1.go b/examples/ch2.5/02-go-call-c-func/_obj/main.cgo1.go
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/main.cgo1.go
rename to examples/ch2.5/02-go-call-c-func/_obj/main.cgo1.go
diff --git a/examples/ch2-05-internal/02-go-call-c-func/_obj/main.cgo2.c b/examples/ch2.5/02-go-call-c-func/_obj/main.cgo2.c
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/_obj/main.cgo2.c
rename to examples/ch2.5/02-go-call-c-func/_obj/main.cgo2.c
diff --git a/examples/ch2-05-internal/02-go-call-c-func/main.go b/examples/ch2.5/02-go-call-c-func/main.go
similarity index 100%
rename from examples/ch2-05-internal/02-go-call-c-func/main.go
rename to examples/ch2.5/02-go-call-c-func/main.go
diff --git a/examples/ch2-05-internal/03-c-call-go-func/Makefile b/examples/ch2.5/03-c-call-go-func/Makefile
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/Makefile
rename to examples/ch2.5/03-c-call-go-func/Makefile
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_export.c b/examples/ch2.5/03-c-call-go-func/_obj/_cgo_export.c
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_export.c
rename to examples/ch2.5/03-c-call-go-func/_obj/_cgo_export.c
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_export.h b/examples/ch2.5/03-c-call-go-func/_obj/_cgo_export.h
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_export.h
rename to examples/ch2.5/03-c-call-go-func/_obj/_cgo_export.h
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_flags b/examples/ch2.5/03-c-call-go-func/_obj/_cgo_flags
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_flags
rename to examples/ch2.5/03-c-call-go-func/_obj/_cgo_flags
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_gotypes.go b/examples/ch2.5/03-c-call-go-func/_obj/_cgo_gotypes.go
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_gotypes.go
rename to examples/ch2.5/03-c-call-go-func/_obj/_cgo_gotypes.go
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_main.c b/examples/ch2.5/03-c-call-go-func/_obj/_cgo_main.c
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/_cgo_main.c
rename to examples/ch2.5/03-c-call-go-func/_obj/_cgo_main.c
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/sum.cgo1.go b/examples/ch2.5/03-c-call-go-func/_obj/sum.cgo1.go
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/sum.cgo1.go
rename to examples/ch2.5/03-c-call-go-func/_obj/sum.cgo1.go
diff --git a/examples/ch2-05-internal/03-c-call-go-func/_obj/sum.cgo2.c b/examples/ch2.5/03-c-call-go-func/_obj/sum.cgo2.c
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/_obj/sum.cgo2.c
rename to examples/ch2.5/03-c-call-go-func/_obj/sum.cgo2.c
diff --git a/examples/ch2-05-internal/03-c-call-go-func/main.c b/examples/ch2.5/03-c-call-go-func/main.c
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/main.c
rename to examples/ch2.5/03-c-call-go-func/main.c
diff --git a/examples/ch2-05-internal/03-c-call-go-func/sum.go b/examples/ch2.5/03-c-call-go-func/sum.go
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/sum.go
rename to examples/ch2.5/03-c-call-go-func/sum.go
diff --git a/examples/ch2-05-internal/03-c-call-go-func/sum.h b/examples/ch2.5/03-c-call-go-func/sum.h
similarity index 100%
rename from examples/ch2-05-internal/03-c-call-go-func/sum.h
rename to examples/ch2.5/03-c-call-go-func/sum.h
diff --git a/examples/ch2-06-qsort/01-qsort-v1/Makefile b/examples/ch2.6/01-qsort-v1/Makefile
similarity index 100%
rename from examples/ch2-06-qsort/01-qsort-v1/Makefile
rename to examples/ch2.6/01-qsort-v1/Makefile
diff --git a/examples/ch2-06-qsort/01-qsort-v1/main.c b/examples/ch2.6/01-qsort-v1/main.c
similarity index 100%
rename from examples/ch2-06-qsort/01-qsort-v1/main.c
rename to examples/ch2.6/01-qsort-v1/main.c
diff --git a/examples/ch2-06-qsort/02-qsort-v2/main.go b/examples/ch2.6/02-qsort-v2/main.go
similarity index 100%
rename from examples/ch2-06-qsort/02-qsort-v2/main.go
rename to examples/ch2.6/02-qsort-v2/main.go
diff --git a/examples/ch2-06-qsort/02-qsort-v2/qsort.go b/examples/ch2.6/02-qsort-v2/qsort.go
similarity index 100%
rename from examples/ch2-06-qsort/02-qsort-v2/qsort.go
rename to examples/ch2.6/02-qsort-v2/qsort.go
diff --git a/examples/ch2-06-qsort/02-qsort-v2/qsort_test.go b/examples/ch2.6/02-qsort-v2/qsort_test.go
similarity index 100%
rename from examples/ch2-06-qsort/02-qsort-v2/qsort_test.go
rename to examples/ch2.6/02-qsort-v2/qsort_test.go
diff --git a/examples/ch2-06-qsort/02-qsort-v2/test_helper.go b/examples/ch2.6/02-qsort-v2/test_helper.go
similarity index 100%
rename from examples/ch2-06-qsort/02-qsort-v2/test_helper.go
rename to examples/ch2.6/02-qsort-v2/test_helper.go
diff --git a/examples/ch2-06-qsort/03-qsort-v3/main.go b/examples/ch2.6/03-qsort-v3/main.go
similarity index 100%
rename from examples/ch2-06-qsort/03-qsort-v3/main.go
rename to examples/ch2.6/03-qsort-v3/main.go
diff --git a/examples/ch2-06-qsort/03-qsort-v3/sort.go b/examples/ch2.6/03-qsort-v3/sort.go
similarity index 100%
rename from examples/ch2-06-qsort/03-qsort-v3/sort.go
rename to examples/ch2.6/03-qsort-v3/sort.go
diff --git a/examples/ch2-06-qsort/03-qsort-v3/sort_test.go b/examples/ch2.6/03-qsort-v3/sort_test.go
similarity index 100%
rename from examples/ch2-06-qsort/03-qsort-v3/sort_test.go
rename to examples/ch2.6/03-qsort-v3/sort_test.go
diff --git a/examples/ch2-06-qsort/04-qsort-v4/main.go b/examples/ch2.6/04-qsort-v4/main.go
similarity index 100%
rename from examples/ch2-06-qsort/04-qsort-v4/main.go
rename to examples/ch2.6/04-qsort-v4/main.go
diff --git a/examples/ch2-06-qsort/04-qsort-v4/sort.go b/examples/ch2.6/04-qsort-v4/sort.go
similarity index 100%
rename from examples/ch2-06-qsort/04-qsort-v4/sort.go
rename to examples/ch2.6/04-qsort-v4/sort.go
diff --git a/examples/ch2-06-qsort/04-qsort-v4/sort_test.go b/examples/ch2.6/04-qsort-v4/sort_test.go
similarity index 100%
rename from examples/ch2-06-qsort/04-qsort-v4/sort_test.go
rename to examples/ch2.6/04-qsort-v4/sort_test.go
diff --git a/examples/ch2-08-class/class-cc2go/main.go b/examples/ch2.8/class-cc2go/main.go
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/main.go
rename to examples/ch2.8/class-cc2go/main.go
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer.cc b/examples/ch2.8/class-cc2go/my_buffer.cc
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer.cc
rename to examples/ch2.8/class-cc2go/my_buffer.cc
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer.go b/examples/ch2.8/class-cc2go/my_buffer.go
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer.go
rename to examples/ch2.8/class-cc2go/my_buffer.go
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer.h b/examples/ch2.8/class-cc2go/my_buffer.h
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer.h
rename to examples/ch2.8/class-cc2go/my_buffer.h
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer_capi.cc b/examples/ch2.8/class-cc2go/my_buffer_capi.cc
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer_capi.cc
rename to examples/ch2.8/class-cc2go/my_buffer_capi.cc
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer_capi.go b/examples/ch2.8/class-cc2go/my_buffer_capi.go
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer_capi.go
rename to examples/ch2.8/class-cc2go/my_buffer_capi.go
diff --git a/examples/ch2-08-class/class-cc2go/my_buffer_capi.h b/examples/ch2.8/class-cc2go/my_buffer_capi.h
similarity index 100%
rename from examples/ch2-08-class/class-cc2go/my_buffer_capi.h
rename to examples/ch2.8/class-cc2go/my_buffer_capi.h
diff --git a/examples/ch2-08-class/class-go2cc/goobj.go b/examples/ch2.8/class-go2cc/goobj.go
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/goobj.go
rename to examples/ch2.8/class-go2cc/goobj.go
diff --git a/examples/ch2-08-class/class-go2cc/main.cc b/examples/ch2.8/class-go2cc/main.cc
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/main.cc
rename to examples/ch2.8/class-go2cc/main.cc
diff --git a/examples/ch2-08-class/class-go2cc/main.go b/examples/ch2.8/class-go2cc/main.go
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/main.go
rename to examples/ch2.8/class-go2cc/main.go
diff --git a/examples/ch2-08-class/class-go2cc/persion.go b/examples/ch2.8/class-go2cc/persion.go
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/persion.go
rename to examples/ch2.8/class-go2cc/persion.go
diff --git a/examples/ch2-08-class/class-go2cc/person.cc b/examples/ch2.8/class-go2cc/person.cc
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/person.cc
rename to examples/ch2.8/class-go2cc/person.cc
diff --git a/examples/ch2-08-class/class-go2cc/person.h b/examples/ch2.8/class-go2cc/person.h
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/person.h
rename to examples/ch2.8/class-go2cc/person.h
diff --git a/examples/ch2-08-class/class-go2cc/person_capi.go b/examples/ch2.8/class-go2cc/person_capi.go
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/person_capi.go
rename to examples/ch2.8/class-go2cc/person_capi.go
diff --git a/examples/ch2-08-class/class-go2cc/person_capi.h b/examples/ch2.8/class-go2cc/person_capi.h
similarity index 100%
rename from examples/ch2-08-class/class-go2cc/person_capi.h
rename to examples/ch2.8/class-go2cc/person_capi.h
diff --git a/examples/ch2-09-so-and-lib/incorrect-dll-api/Makefile b/examples/ch2.9/incorrect-dll-api/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/incorrect-dll-api/Makefile
rename to examples/ch2.9/incorrect-dll-api/Makefile
diff --git a/examples/ch2-09-so-and-lib/incorrect-dll-api/main.go b/examples/ch2.9/incorrect-dll-api/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/incorrect-dll-api/main.go
rename to examples/ch2.9/incorrect-dll-api/main.go
diff --git a/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/Makefile b/examples/ch2.9/incorrect-dll-api/mystring/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/Makefile
rename to examples/ch2.9/incorrect-dll-api/mystring/Makefile
diff --git a/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.c b/examples/ch2.9/incorrect-dll-api/mystring/mystring.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.c
rename to examples/ch2.9/incorrect-dll-api/mystring/mystring.c
diff --git a/examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.h b/examples/ch2.9/incorrect-dll-api/mystring/mystring.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/incorrect-dll-api/mystring/mystring.h
rename to examples/ch2.9/incorrect-dll-api/mystring/mystring.h
diff --git a/examples/ch2-09-so-and-lib/make-clib-dll/Makefile b/examples/ch2.9/make-clib-dll/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-dll/Makefile
rename to examples/ch2.9/make-clib-dll/Makefile
diff --git a/examples/ch2-09-so-and-lib/make-clib-dll/_test_main.c b/examples/ch2.9/make-clib-dll/_test_main.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-dll/_test_main.c
rename to examples/ch2.9/make-clib-dll/_test_main.c
diff --git a/examples/ch2-09-so-and-lib/make-clib-dll/main.go b/examples/ch2.9/make-clib-dll/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-dll/main.go
rename to examples/ch2.9/make-clib-dll/main.go
diff --git a/examples/ch2-09-so-and-lib/make-clib-dll/number-win64.def b/examples/ch2.9/make-clib-dll/number-win64.def
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-dll/number-win64.def
rename to examples/ch2.9/make-clib-dll/number-win64.def
diff --git a/examples/ch2-09-so-and-lib/make-clib-dll/number.h b/examples/ch2.9/make-clib-dll/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-dll/number.h
rename to examples/ch2.9/make-clib-dll/number.h
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/Makefile b/examples/ch2.9/make-clib-from-multi-pkg/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/Makefile
rename to examples/ch2.9/make-clib-from-multi-pkg/Makefile
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/_test_main.c b/examples/ch2.9/make-clib-from-multi-pkg/_test_main.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/_test_main.c
rename to examples/ch2.9/make-clib-from-multi-pkg/_test_main.c
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.go b/examples/ch2.9/make-clib-from-multi-pkg/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.go
rename to examples/ch2.9/make-clib-from-multi-pkg/main.go
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.h b/examples/ch2.9/make-clib-from-multi-pkg/main.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/main.h
rename to examples/ch2.9/make-clib-from-multi-pkg/main.h
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.go b/examples/ch2.9/make-clib-from-multi-pkg/number/number.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.go
rename to examples/ch2.9/make-clib-from-multi-pkg/number/number.go
diff --git a/examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.h b/examples/ch2.9/make-clib-from-multi-pkg/number/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-from-multi-pkg/number/number.h
rename to examples/ch2.9/make-clib-from-multi-pkg/number/number.h
diff --git a/examples/ch2-09-so-and-lib/make-clib-shared/Makefile b/examples/ch2.9/make-clib-shared/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-shared/Makefile
rename to examples/ch2.9/make-clib-shared/Makefile
diff --git a/examples/ch2-09-so-and-lib/make-clib-shared/_test_main.c b/examples/ch2.9/make-clib-shared/_test_main.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-shared/_test_main.c
rename to examples/ch2.9/make-clib-shared/_test_main.c
diff --git a/examples/ch2-09-so-and-lib/make-clib-shared/main.go b/examples/ch2.9/make-clib-shared/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-shared/main.go
rename to examples/ch2.9/make-clib-shared/main.go
diff --git a/examples/ch2-09-so-and-lib/make-clib-shared/number.h b/examples/ch2.9/make-clib-shared/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-shared/number.h
rename to examples/ch2.9/make-clib-shared/number.h
diff --git a/examples/ch2-09-so-and-lib/make-clib-static/Makefile b/examples/ch2.9/make-clib-static/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-static/Makefile
rename to examples/ch2.9/make-clib-static/Makefile
diff --git a/examples/ch2-09-so-and-lib/make-clib-static/_test_main.c b/examples/ch2.9/make-clib-static/_test_main.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-static/_test_main.c
rename to examples/ch2.9/make-clib-static/_test_main.c
diff --git a/examples/ch2-09-so-and-lib/make-clib-static/main.go b/examples/ch2.9/make-clib-static/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-static/main.go
rename to examples/ch2.9/make-clib-static/main.go
diff --git a/examples/ch2-09-so-and-lib/make-clib-static/number.h b/examples/ch2.9/make-clib-static/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/make-clib-static/number.h
rename to examples/ch2.9/make-clib-static/number.h
diff --git a/examples/ch2-09-so-and-lib/plugin/Makefile b/examples/ch2.9/plugin/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/plugin/Makefile
rename to examples/ch2.9/plugin/Makefile
diff --git a/examples/ch2-09-so-and-lib/plugin/main.go b/examples/ch2.9/plugin/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/plugin/main.go
rename to examples/ch2.9/plugin/main.go
diff --git a/examples/ch2-09-so-and-lib/plugin/plugin.go b/examples/ch2.9/plugin/plugin.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/plugin/plugin.go
rename to examples/ch2.9/plugin/plugin.go
diff --git a/examples/ch2-09-so-and-lib/use-clib-shared/Makefile b/examples/ch2.9/use-clib-shared/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-shared/Makefile
rename to examples/ch2.9/use-clib-shared/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-shared/main.go b/examples/ch2.9/use-clib-shared/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-shared/main.go
rename to examples/ch2.9/use-clib-shared/main.go
diff --git a/examples/ch2-09-so-and-lib/use-clib-shared/number/Makefile b/examples/ch2.9/use-clib-shared/number/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-shared/number/Makefile
rename to examples/ch2.9/use-clib-shared/number/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-shared/number/number.c b/examples/ch2.9/use-clib-shared/number/number.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-shared/number/number.c
rename to examples/ch2.9/use-clib-shared/number/number.c
diff --git a/examples/ch2-09-so-and-lib/use-clib-shared/number/number.h b/examples/ch2.9/use-clib-shared/number/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-shared/number/number.h
rename to examples/ch2.9/use-clib-shared/number/number.h
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v1/Makefile b/examples/ch2.9/use-clib-static-v1/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v1/Makefile
rename to examples/ch2.9/use-clib-static-v1/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v1/main.go b/examples/ch2.9/use-clib-static-v1/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v1/main.go
rename to examples/ch2.9/use-clib-static-v1/main.go
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v1/number/Makefile b/examples/ch2.9/use-clib-static-v1/number/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v1/number/Makefile
rename to examples/ch2.9/use-clib-static-v1/number/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.c b/examples/ch2.9/use-clib-static-v1/number/number.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.c
rename to examples/ch2.9/use-clib-static-v1/number/number.c
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.h b/examples/ch2.9/use-clib-static-v1/number/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v1/number/number.h
rename to examples/ch2.9/use-clib-static-v1/number/number.h
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/Makefile b/examples/ch2.9/use-clib-static-v2/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/Makefile
rename to examples/ch2.9/use-clib-static-v2/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/main.go b/examples/ch2.9/use-clib-static-v2/main.go
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/main.go
rename to examples/ch2.9/use-clib-static-v2/main.go
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/number/Makefile b/examples/ch2.9/use-clib-static-v2/number/Makefile
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/number/Makefile
rename to examples/ch2.9/use-clib-static-v2/number/Makefile
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.c b/examples/ch2.9/use-clib-static-v2/number/number.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.c
rename to examples/ch2.9/use-clib-static-v2/number/number.c
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.h b/examples/ch2.9/use-clib-static-v2/number/number.h
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/number/number.h
rename to examples/ch2.9/use-clib-static-v2/number/number.h
diff --git a/examples/ch2-09-so-and-lib/use-clib-static-v2/z_link_number_c.c b/examples/ch2.9/use-clib-static-v2/z_link_number_c.c
similarity index 100%
rename from examples/ch2-09-so-and-lib/use-clib-static-v2/z_link_number_c.c
rename to examples/ch2.9/use-clib-static-v2/z_link_number_c.c
diff --git a/examples/ch2-xx-08/hello-swig-v1/Makefile b/examples/ch2.x/hello-swig-v1/Makefile
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v1/Makefile
rename to examples/ch2.x/hello-swig-v1/Makefile
diff --git a/examples/ch2-xx-08/hello-swig-v1/hello.cc b/examples/ch2.x/hello-swig-v1/hello.cc
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v1/hello.cc
rename to examples/ch2.x/hello-swig-v1/hello.cc
diff --git a/examples/ch2-xx-08/hello-swig-v1/hello.swigcxx b/examples/ch2.x/hello-swig-v1/hello.swigcxx
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v1/hello.swigcxx
rename to examples/ch2.x/hello-swig-v1/hello.swigcxx
diff --git a/examples/ch2-xx-08/hello-swig-v1/hello_test.go b/examples/ch2.x/hello-swig-v1/hello_test.go
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v1/hello_test.go
rename to examples/ch2.x/hello-swig-v1/hello_test.go
diff --git a/examples/ch2-xx-08/hello-swig-v1/runme.go b/examples/ch2.x/hello-swig-v1/runme.go
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v1/runme.go
rename to examples/ch2.x/hello-swig-v1/runme.go
diff --git a/examples/ch2-xx-08/hello-swig-v2/Makefile b/examples/ch2.x/hello-swig-v2/Makefile
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/Makefile
rename to examples/ch2.x/hello-swig-v2/Makefile
diff --git a/examples/ch2-xx-08/hello-swig-v2/hello.cc b/examples/ch2.x/hello-swig-v2/hello.cc
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/hello.cc
rename to examples/ch2.x/hello-swig-v2/hello.cc
diff --git a/examples/ch2-xx-08/hello-swig-v2/hello.go b/examples/ch2.x/hello-swig-v2/hello.go
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/hello.go
rename to examples/ch2.x/hello-swig-v2/hello.go
diff --git a/examples/ch2-xx-08/hello-swig-v2/hello.i b/examples/ch2.x/hello-swig-v2/hello.i
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/hello.i
rename to examples/ch2.x/hello-swig-v2/hello.i
diff --git a/examples/ch2-xx-08/hello-swig-v2/runme.go b/examples/ch2.x/hello-swig-v2/runme.go
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/runme.go
rename to examples/ch2.x/hello-swig-v2/runme.go
diff --git a/examples/ch2-xx-08/hello-swig-v2/swig_wrap.cc b/examples/ch2.x/hello-swig-v2/swig_wrap.cc
similarity index 100%
rename from examples/ch2-xx-08/hello-swig-v2/swig_wrap.cc
rename to examples/ch2.x/hello-swig-v2/swig_wrap.cc
diff --git a/examples/ch2-xx/hello/.gitignore b/examples/ch2.x/hello/.gitignore
similarity index 100%
rename from examples/ch2-xx/hello/.gitignore
rename to examples/ch2.x/hello/.gitignore
diff --git a/examples/ch2-xx/hello/Makefile b/examples/ch2.x/hello/Makefile
similarity index 100%
rename from examples/ch2-xx/hello/Makefile
rename to examples/ch2.x/hello/Makefile
diff --git a/examples/ch2-xx/hello/_obj/_cgo_export.c b/examples/ch2.x/hello/_obj/_cgo_export.c
similarity index 100%
rename from examples/ch2-xx/hello/_obj/_cgo_export.c
rename to examples/ch2.x/hello/_obj/_cgo_export.c
diff --git a/examples/ch2-xx/hello/_obj/_cgo_export.h b/examples/ch2.x/hello/_obj/_cgo_export.h
similarity index 100%
rename from examples/ch2-xx/hello/_obj/_cgo_export.h
rename to examples/ch2.x/hello/_obj/_cgo_export.h
diff --git a/examples/ch2-xx/hello/_obj/_cgo_flags b/examples/ch2.x/hello/_obj/_cgo_flags
similarity index 100%
rename from examples/ch2-xx/hello/_obj/_cgo_flags
rename to examples/ch2.x/hello/_obj/_cgo_flags
diff --git a/examples/ch2-xx/hello/_obj/_cgo_gotypes.go b/examples/ch2.x/hello/_obj/_cgo_gotypes.go
similarity index 100%
rename from examples/ch2-xx/hello/_obj/_cgo_gotypes.go
rename to examples/ch2.x/hello/_obj/_cgo_gotypes.go
diff --git a/examples/ch2-xx/hello/_obj/_cgo_main.c b/examples/ch2.x/hello/_obj/_cgo_main.c
similarity index 100%
rename from examples/ch2-xx/hello/_obj/_cgo_main.c
rename to examples/ch2.x/hello/_obj/_cgo_main.c
diff --git a/examples/ch2-xx/hello/_obj/hello.cgo1.go b/examples/ch2.x/hello/_obj/hello.cgo1.go
similarity index 100%
rename from examples/ch2-xx/hello/_obj/hello.cgo1.go
rename to examples/ch2.x/hello/_obj/hello.cgo1.go
diff --git a/examples/ch2-xx/hello/_obj/hello.cgo2.c b/examples/ch2.x/hello/_obj/hello.cgo2.c
similarity index 100%
rename from examples/ch2-xx/hello/_obj/hello.cgo2.c
rename to examples/ch2.x/hello/_obj/hello.cgo2.c
diff --git a/examples/ch2-xx/hello/hello.go b/examples/ch2.x/hello/hello.go
similarity index 100%
rename from examples/ch2-xx/hello/hello.go
rename to examples/ch2.x/hello/hello.go