diff --git a/examples/ch3-01-quick-guide/id-01/pkg.go b/examples/ch3.1/id-01/pkg.go
similarity index 100%
rename from examples/ch3-01-quick-guide/id-01/pkg.go
rename to examples/ch3.1/id-01/pkg.go
diff --git a/examples/ch3-01-quick-guide/id-01/runme.go b/examples/ch3.1/id-01/runme.go
similarity index 100%
rename from examples/ch3-01-quick-guide/id-01/runme.go
rename to examples/ch3.1/id-01/runme.go
diff --git a/examples/ch3-01-quick-guide/id-02/pkg.go b/examples/ch3.1/id-02/pkg.go
similarity index 100%
rename from examples/ch3-01-quick-guide/id-02/pkg.go
rename to examples/ch3.1/id-02/pkg.go
diff --git a/examples/ch3-01-quick-guide/id-02/pkg_amd64.s b/examples/ch3.1/id-02/pkg_amd64.s
similarity index 100%
rename from examples/ch3-01-quick-guide/id-02/pkg_amd64.s
rename to examples/ch3.1/id-02/pkg_amd64.s
diff --git a/examples/ch3-01-quick-guide/id-02/runme.go b/examples/ch3.1/id-02/runme.go
similarity index 100%
rename from examples/ch3-01-quick-guide/id-02/runme.go
rename to examples/ch3.1/id-02/runme.go
diff --git a/examples/ch3-01-quick-guide/main-01/Makefile b/examples/ch3.1/main-01/Makefile
similarity index 100%
rename from examples/ch3-01-quick-guide/main-01/Makefile
rename to examples/ch3.1/main-01/Makefile
diff --git a/examples/ch3-01-quick-guide/main-01/main.go b/examples/ch3.1/main-01/main.go
similarity index 100%
rename from examples/ch3-01-quick-guide/main-01/main.go
rename to examples/ch3.1/main-01/main.go
diff --git a/examples/ch3-01-quick-guide/main-01/main_amd64.s b/examples/ch3.1/main-01/main_amd64.s
similarity index 100%
rename from examples/ch3-01-quick-guide/main-01/main_amd64.s
rename to examples/ch3.1/main-01/main_amd64.s
diff --git a/examples/ch3-01-quick-guide/str-01/pkg.go b/examples/ch3.1/str-01/pkg.go
similarity index 100%
rename from examples/ch3-01-quick-guide/str-01/pkg.go
rename to examples/ch3.1/str-01/pkg.go
diff --git a/examples/ch3-01-quick-guide/str-02/pkg.go b/examples/ch3.1/str-02/pkg.go
similarity index 100%
rename from examples/ch3-01-quick-guide/str-02/pkg.go
rename to examples/ch3.1/str-02/pkg.go
diff --git a/examples/ch3-01-quick-guide/str-02/pkg_amd64.s b/examples/ch3.1/str-02/pkg_amd64.s
similarity index 100%
rename from examples/ch3-01-quick-guide/str-02/pkg_amd64.s
rename to examples/ch3.1/str-02/pkg_amd64.s
diff --git a/examples/ch3-01-quick-guide/str-02/runme.go b/examples/ch3.1/str-02/runme.go
similarity index 100%
rename from examples/ch3-01-quick-guide/str-02/runme.go
rename to examples/ch3.1/str-02/runme.go
diff --git a/examples/ch3-01-quick-guide/str-03/pkg.go b/examples/ch3.1/str-03/pkg.go
similarity index 100%
rename from examples/ch3-01-quick-guide/str-03/pkg.go
rename to examples/ch3.1/str-03/pkg.go
diff --git a/examples/ch3-01-quick-guide/str-03/pkg_amd64.s b/examples/ch3.1/str-03/pkg_amd64.s
similarity index 100%
rename from examples/ch3-01-quick-guide/str-03/pkg_amd64.s
rename to examples/ch3.1/str-03/pkg_amd64.s
diff --git a/examples/ch3-01-quick-guide/str-03/runme.go b/examples/ch3.1/str-03/runme.go
similarity index 100%
rename from examples/ch3-01-quick-guide/str-03/runme.go
rename to examples/ch3.1/str-03/runme.go
diff --git a/examples/ch3-06-func-again/asm-split/main.go b/examples/ch3.6/asm-split/main.go
similarity index 100%
rename from examples/ch3-06-func-again/asm-split/main.go
rename to examples/ch3.6/asm-split/main.go
diff --git a/examples/ch3-06-func-again/asm-split/main_amd64.s b/examples/ch3.6/asm-split/main_amd64.s
similarity index 100%
rename from examples/ch3-06-func-again/asm-split/main_amd64.s
rename to examples/ch3.6/asm-split/main_amd64.s
diff --git a/examples/ch3-08-debug/hello-asm/main.go b/examples/ch3.8/hello-asm/main.go
similarity index 100%
rename from examples/ch3-08-debug/hello-asm/main.go
rename to examples/ch3.8/hello-asm/main.go
diff --git a/examples/ch3-08-debug/hello-asm/main_amd64.s b/examples/ch3.8/hello-asm/main_amd64.s
similarity index 100%
rename from examples/ch3-08-debug/hello-asm/main_amd64.s
rename to examples/ch3.8/hello-asm/main_amd64.s
diff --git a/examples/ch3-08-debug/hello/main.go b/examples/ch3.8/hello/main.go
similarity index 100%
rename from examples/ch3-08-debug/hello/main.go
rename to examples/ch3.8/hello/main.go
diff --git a/examples/ch3-xx/add/add.go b/examples/ch3.x/add/add.go
similarity index 100%
rename from examples/ch3-xx/add/add.go
rename to examples/ch3.x/add/add.go
diff --git a/examples/ch3-xx/add/add_asm.go b/examples/ch3.x/add/add_asm.go
similarity index 100%
rename from examples/ch3-xx/add/add_asm.go
rename to examples/ch3.x/add/add_asm.go
diff --git a/examples/ch3-xx/add/add_asm_amd64.s b/examples/ch3.x/add/add_asm_amd64.s
similarity index 100%
rename from examples/ch3-xx/add/add_asm_amd64.s
rename to examples/ch3.x/add/add_asm_amd64.s
diff --git a/examples/ch3-xx/add/add_asm_generic.go b/examples/ch3.x/add/add_asm_generic.go
similarity index 100%
rename from examples/ch3-xx/add/add_asm_generic.go
rename to examples/ch3.x/add/add_asm_generic.go
diff --git a/examples/ch3-xx/add/add_test.go b/examples/ch3.x/add/add_test.go
similarity index 100%
rename from examples/ch3-xx/add/add_test.go
rename to examples/ch3.x/add/add_test.go
diff --git a/examples/ch3-xx/add/runme.go b/examples/ch3.x/add/runme.go
similarity index 100%
rename from examples/ch3-xx/add/runme.go
rename to examples/ch3.x/add/runme.go
diff --git a/examples/ch3-xx/binary_search/binary_search.go b/examples/ch3.x/binary_search/binary_search.go
similarity index 100%
rename from examples/ch3-xx/binary_search/binary_search.go
rename to examples/ch3.x/binary_search/binary_search.go
diff --git a/examples/ch3-xx/binary_search/binary_search_amd64.s b/examples/ch3.x/binary_search/binary_search_amd64.s
similarity index 100%
rename from examples/ch3-xx/binary_search/binary_search_amd64.s
rename to examples/ch3.x/binary_search/binary_search_amd64.s
diff --git a/examples/ch3-xx/binary_search/binary_search_test.go b/examples/ch3.x/binary_search/binary_search_test.go
similarity index 100%
rename from examples/ch3-xx/binary_search/binary_search_test.go
rename to examples/ch3.x/binary_search/binary_search_test.go
diff --git a/examples/ch3-xx/cfun/main.go b/examples/ch3.x/cfun/main.go
similarity index 100%
rename from examples/ch3-xx/cfun/main.go
rename to examples/ch3.x/cfun/main.go
diff --git a/examples/ch3-xx/cfun/vendor/asmpkg/asmpkg.go b/examples/ch3.x/cfun/vendor/asmpkg/asmpkg.go
similarity index 100%
rename from examples/ch3-xx/cfun/vendor/asmpkg/asmpkg.go
rename to examples/ch3.x/cfun/vendor/asmpkg/asmpkg.go
diff --git a/examples/ch3-xx/cfun/vendor/asmpkg/asmpkg_amd64.s b/examples/ch3.x/cfun/vendor/asmpkg/asmpkg_amd64.s
similarity index 100%
rename from examples/ch3-xx/cfun/vendor/asmpkg/asmpkg_amd64.s
rename to examples/ch3.x/cfun/vendor/asmpkg/asmpkg_amd64.s
diff --git a/examples/ch3-xx/globalvar/asm_amd64.s b/examples/ch3.x/globalvar/asm_amd64.s
similarity index 100%
rename from examples/ch3-xx/globalvar/asm_amd64.s
rename to examples/ch3.x/globalvar/asm_amd64.s
diff --git a/examples/ch3-xx/globalvar/globalvar.go b/examples/ch3.x/globalvar/globalvar.go
similarity index 100%
rename from examples/ch3-xx/globalvar/globalvar.go
rename to examples/ch3.x/globalvar/globalvar.go
diff --git a/examples/ch3-xx/globalvar/runme.go b/examples/ch3.x/globalvar/runme.go
similarity index 100%
rename from examples/ch3-xx/globalvar/runme.go
rename to examples/ch3.x/globalvar/runme.go
diff --git a/examples/ch3-xx/hello/hello.go b/examples/ch3.x/hello/hello.go
similarity index 100%
rename from examples/ch3-xx/hello/hello.go
rename to examples/ch3.x/hello/hello.go
diff --git a/examples/ch3-xx/hello/hello_amd64.s b/examples/ch3.x/hello/hello_amd64.s
similarity index 100%
rename from examples/ch3-xx/hello/hello_amd64.s
rename to examples/ch3.x/hello/hello_amd64.s
diff --git a/examples/ch3-xx/hello/runme.go b/examples/ch3.x/hello/runme.go
similarity index 100%
rename from examples/ch3-xx/hello/runme.go
rename to examples/ch3.x/hello/runme.go
diff --git a/examples/ch3-xx/ifelse/ifelse.go b/examples/ch3.x/ifelse/ifelse.go
similarity index 100%
rename from examples/ch3-xx/ifelse/ifelse.go
rename to examples/ch3.x/ifelse/ifelse.go
diff --git a/examples/ch3-xx/ifelse/ifelse_ams_amd64.s b/examples/ch3.x/ifelse/ifelse_ams_amd64.s
similarity index 100%
rename from examples/ch3-xx/ifelse/ifelse_ams_amd64.s
rename to examples/ch3.x/ifelse/ifelse_ams_amd64.s
diff --git a/examples/ch3-xx/ifelse/ifelse_test.go b/examples/ch3.x/ifelse/ifelse_test.go
similarity index 100%
rename from examples/ch3-xx/ifelse/ifelse_test.go
rename to examples/ch3.x/ifelse/ifelse_test.go
diff --git a/examples/ch3-xx/ifelse/runme.go b/examples/ch3.x/ifelse/runme.go
similarity index 100%
rename from examples/ch3-xx/ifelse/runme.go
rename to examples/ch3.x/ifelse/runme.go
diff --git a/examples/ch3-xx/instr/bench_test.go b/examples/ch3.x/instr/bench_test.go
similarity index 100%
rename from examples/ch3-xx/instr/bench_test.go
rename to examples/ch3.x/instr/bench_test.go
diff --git a/examples/ch3-xx/instr/instr.go b/examples/ch3.x/instr/instr.go
similarity index 100%
rename from examples/ch3-xx/instr/instr.go
rename to examples/ch3.x/instr/instr.go
diff --git a/examples/ch3-xx/instr/instr_amd64.s b/examples/ch3.x/instr/instr_amd64.s
similarity index 100%
rename from examples/ch3-xx/instr/instr_amd64.s
rename to examples/ch3.x/instr/instr_amd64.s
diff --git a/examples/ch3-xx/loop/loop.go b/examples/ch3.x/loop/loop.go
similarity index 100%
rename from examples/ch3-xx/loop/loop.go
rename to examples/ch3.x/loop/loop.go
diff --git a/examples/ch3-xx/loop/loop_asm_amd64.s b/examples/ch3.x/loop/loop_asm_amd64.s
similarity index 100%
rename from examples/ch3-xx/loop/loop_asm_amd64.s
rename to examples/ch3.x/loop/loop_asm_amd64.s
diff --git a/examples/ch3-xx/loop/loop_test.go b/examples/ch3.x/loop/loop_test.go
similarity index 100%
rename from examples/ch3-xx/loop/loop_test.go
rename to examples/ch3.x/loop/loop_test.go
diff --git a/examples/ch3-xx/loop/runme.go b/examples/ch3.x/loop/runme.go
similarity index 100%
rename from examples/ch3-xx/loop/runme.go
rename to examples/ch3.x/loop/runme.go
diff --git a/examples/ch3-xx/min/min.go b/examples/ch3.x/min/min.go
similarity index 100%
rename from examples/ch3-xx/min/min.go
rename to examples/ch3.x/min/min.go
diff --git a/examples/ch3-xx/min/min_asm_amd64.s b/examples/ch3.x/min/min_asm_amd64.s
similarity index 100%
rename from examples/ch3-xx/min/min_asm_amd64.s
rename to examples/ch3.x/min/min_asm_amd64.s
diff --git a/examples/ch3-xx/min/min_test.go b/examples/ch3.x/min/min_test.go
similarity index 100%
rename from examples/ch3-xx/min/min_test.go
rename to examples/ch3.x/min/min_test.go
diff --git a/examples/ch3-xx/min/runme.go b/examples/ch3.x/min/runme.go
similarity index 100%
rename from examples/ch3-xx/min/runme.go
rename to examples/ch3.x/min/runme.go
diff --git a/examples/ch3-xx/slice/runme.go b/examples/ch3.x/slice/runme.go
similarity index 100%
rename from examples/ch3-xx/slice/runme.go
rename to examples/ch3.x/slice/runme.go
diff --git a/examples/ch3-xx/slice/slice.go b/examples/ch3.x/slice/slice.go
similarity index 100%
rename from examples/ch3-xx/slice/slice.go
rename to examples/ch3.x/slice/slice.go
diff --git a/examples/ch3-xx/slice/slice_asm_amd64.s b/examples/ch3.x/slice/slice_asm_amd64.s
similarity index 100%
rename from examples/ch3-xx/slice/slice_asm_amd64.s
rename to examples/ch3.x/slice/slice_asm_amd64.s
diff --git a/examples/ch3-xx/slice/slice_test.go b/examples/ch3.x/slice/slice_test.go
similarity index 100%
rename from examples/ch3-xx/slice/slice_test.go
rename to examples/ch3.x/slice/slice_test.go
diff --git a/examples/ch3-xx/stackmap/stackmap.go b/examples/ch3.x/stackmap/stackmap.go
similarity index 100%
rename from examples/ch3-xx/stackmap/stackmap.go
rename to examples/ch3.x/stackmap/stackmap.go
diff --git a/examples/ch3-xx/stackmap/stackmap_amd64.s b/examples/ch3.x/stackmap/stackmap_amd64.s
similarity index 100%
rename from examples/ch3-xx/stackmap/stackmap_amd64.s
rename to examples/ch3.x/stackmap/stackmap_amd64.s
diff --git a/examples/ch3-xx/stackmap/stackmap_test.go b/examples/ch3.x/stackmap/stackmap_test.go
similarity index 100%
rename from examples/ch3-xx/stackmap/stackmap_test.go
rename to examples/ch3.x/stackmap/stackmap_test.go
diff --git a/examples/ch3-xx/sum/sum.go b/examples/ch3.x/sum/sum.go
similarity index 100%
rename from examples/ch3-xx/sum/sum.go
rename to examples/ch3.x/sum/sum.go
diff --git a/examples/ch3-xx/sum/sum_amd64.s b/examples/ch3.x/sum/sum_amd64.s
similarity index 100%
rename from examples/ch3-xx/sum/sum_amd64.s
rename to examples/ch3.x/sum/sum_amd64.s
diff --git a/examples/ch3-xx/sum/sum_test.go b/examples/ch3.x/sum/sum_test.go
similarity index 100%
rename from examples/ch3-xx/sum/sum_test.go
rename to examples/ch3.x/sum/sum_test.go
diff --git a/examples/ch3-xx/vector/sum_amd64.s b/examples/ch3.x/vector/sum_amd64.s
similarity index 100%
rename from examples/ch3-xx/vector/sum_amd64.s
rename to examples/ch3.x/vector/sum_amd64.s
diff --git a/examples/ch3-xx/vector/vector.go b/examples/ch3.x/vector/vector.go
similarity index 100%
rename from examples/ch3-xx/vector/vector.go
rename to examples/ch3.x/vector/vector.go
diff --git a/examples/ch3-xx/vector/vector_amd64.s b/examples/ch3.x/vector/vector_amd64.s
similarity index 100%
rename from examples/ch3-xx/vector/vector_amd64.s
rename to examples/ch3.x/vector/vector_amd64.s
diff --git a/examples/ch3-xx/vector/vector_test.go b/examples/ch3.x/vector/vector_test.go
similarity index 100%
rename from examples/ch3-xx/vector/vector_test.go
rename to examples/ch3.x/vector/vector_test.go