diff --git a/examples/ch4-05-grpc-hack/rest-and-swagger/dummy.txt b/examples/ch4-05-grpc-hack/rest-and-swagger/dummy.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/ch4-07-pb/http-router/dummy.txt b/examples/ch4-07-pb/http-router/dummy.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/ch4-07-pb/pb-option/dummy.txt b/examples/ch4-07-pb/pb-option/dummy.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/ch4-07-pb/pb-web-frameswork/dummy.txt b/examples/ch4-07-pb/pb-web-frameswork/dummy.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/ch4-07-pb/plugin-framework/dummy.txt b/examples/ch4-07-pb/plugin-framework/dummy.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/ch4-01-rpc-intro/hello-client-v1/main.go b/examples/ch4.1/hello-client-v1/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-client-v1/main.go
rename to examples/ch4.1/hello-client-v1/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-server-v1/main.go b/examples/ch4.1/hello-server-v1/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-server-v1/main.go
rename to examples/ch4.1/hello-server-v1/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v2/api/hello.go b/examples/ch4.1/hello-service-v2/api/hello.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v2/api/hello.go
rename to examples/ch4.1/hello-service-v2/api/hello.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v2/client/main.go b/examples/ch4.1/hello-service-v2/client/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v2/client/main.go
rename to examples/ch4.1/hello-service-v2/client/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v2/server/main.go b/examples/ch4.1/hello-service-v2/server/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v2/server/main.go
rename to examples/ch4.1/hello-service-v2/server/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v3/client/main.go b/examples/ch4.1/hello-service-v3/client/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v3/client/main.go
rename to examples/ch4.1/hello-service-v3/client/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v3/server-on-http/main.go b/examples/ch4.1/hello-service-v3/server-on-http/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v3/server-on-http/main.go
rename to examples/ch4.1/hello-service-v3/server-on-http/main.go
diff --git a/examples/ch4-01-rpc-intro/hello-service-v3/server/main.go b/examples/ch4.1/hello-service-v3/server/main.go
similarity index 100%
rename from examples/ch4-01-rpc-intro/hello-service-v3/server/main.go
rename to examples/ch4.1/hello-service-v3/server/main.go
diff --git a/examples/ch4-02-proto/hello-server/main.go b/examples/ch4.2/hello-server/main.go
similarity index 100%
rename from examples/ch4-02-proto/hello-server/main.go
rename to examples/ch4.2/hello-server/main.go
diff --git a/examples/ch4-02-proto/hello.pb/Makefile b/examples/ch4.2/hello.pb/Makefile
similarity index 100%
rename from examples/ch4-02-proto/hello.pb/Makefile
rename to examples/ch4.2/hello.pb/Makefile
diff --git a/examples/ch4-02-proto/hello.pb/hello.pb.go b/examples/ch4.2/hello.pb/hello.pb.go
similarity index 100%
rename from examples/ch4-02-proto/hello.pb/hello.pb.go
rename to examples/ch4.2/hello.pb/hello.pb.go
diff --git a/examples/ch4-02-proto/hello.pb/hello.proto b/examples/ch4.2/hello.pb/hello.proto
similarity index 100%
rename from examples/ch4-02-proto/hello.pb/hello.proto
rename to examples/ch4.2/hello.pb/hello.proto
diff --git a/examples/ch4-02-proto/protoc-gen-go-netrpc/main.go b/examples/ch4.2/protoc-gen-go-netrpc/main.go
similarity index 100%
rename from examples/ch4-02-proto/protoc-gen-go-netrpc/main.go
rename to examples/ch4.2/protoc-gen-go-netrpc/main.go
diff --git a/examples/ch4-02-proto/protoc-gen-go-netrpc/netprpc.go b/examples/ch4.2/protoc-gen-go-netrpc/netprpc.go
similarity index 100%
rename from examples/ch4-02-proto/protoc-gen-go-netrpc/netprpc.go
rename to examples/ch4.2/protoc-gen-go-netrpc/netprpc.go
diff --git a/examples/ch4-03-rpc-hack/rpc-auth/client/main.go b/examples/ch4.3/rpc-auth/client/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-auth/client/main.go
rename to examples/ch4.3/rpc-auth/client/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-auth/main.go b/examples/ch4.3/rpc-auth/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-auth/main.go
rename to examples/ch4.3/rpc-auth/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-auth/server/main.go b/examples/ch4.3/rpc-auth/server/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-auth/server/main.go
rename to examples/ch4.3/rpc-auth/server/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-context/client/main.go b/examples/ch4.3/rpc-context/client/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-context/client/main.go
rename to examples/ch4.3/rpc-context/client/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-context/server/main.go b/examples/ch4.3/rpc-context/server/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-context/server/main.go
rename to examples/ch4.3/rpc-context/server/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-reverse/client/main.go b/examples/ch4.3/rpc-reverse/client/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-reverse/client/main.go
rename to examples/ch4.3/rpc-reverse/client/main.go
diff --git a/examples/ch4-03-rpc-hack/rpc-reverse/server/main.go b/examples/ch4.3/rpc-reverse/server/main.go
similarity index 100%
rename from examples/ch4-03-rpc-hack/rpc-reverse/server/main.go
rename to examples/ch4.3/rpc-reverse/server/main.go
diff --git a/examples/ch4.4-1/client/main.go b/examples/ch4.4/1/client/main.go
similarity index 100%
rename from examples/ch4.4-1/client/main.go
rename to examples/ch4.4/1/client/main.go
diff --git a/examples/ch4.4-1/helloservice/hello.pb.go b/examples/ch4.4/1/helloservice/hello.pb.go
similarity index 100%
rename from examples/ch4.4-1/helloservice/hello.pb.go
rename to examples/ch4.4/1/helloservice/hello.pb.go
diff --git a/examples/ch4.4-1/helloservice/hello.proto b/examples/ch4.4/1/helloservice/hello.proto
similarity index 100%
rename from examples/ch4.4-1/helloservice/hello.proto
rename to examples/ch4.4/1/helloservice/hello.proto
diff --git a/examples/ch4.4-1/server/main.go b/examples/ch4.4/1/server/main.go
similarity index 100%
rename from examples/ch4.4-1/server/main.go
rename to examples/ch4.4/1/server/main.go
diff --git a/examples/ch4.4-2/HelloService/hello.pb.go b/examples/ch4.4/2/HelloService/hello.pb.go
similarity index 100%
rename from examples/ch4.4-2/HelloService/hello.pb.go
rename to examples/ch4.4/2/HelloService/hello.pb.go
diff --git a/examples/ch4.4-2/HelloService/hello.proto b/examples/ch4.4/2/HelloService/hello.proto
similarity index 100%
rename from examples/ch4.4-2/HelloService/hello.proto
rename to examples/ch4.4/2/HelloService/hello.proto
diff --git a/examples/ch4.4-2/client/main.go b/examples/ch4.4/2/client/main.go
similarity index 100%
rename from examples/ch4.4-2/client/main.go
rename to examples/ch4.4/2/client/main.go
diff --git a/examples/ch4.4-2/server/main.go b/examples/ch4.4/2/server/main.go
similarity index 100%
rename from examples/ch4.4-2/server/main.go
rename to examples/ch4.4/2/server/main.go
diff --git a/examples/ch4.4-3/clientpub/main.go b/examples/ch4.4/3/clientpub/main.go
similarity index 100%
rename from examples/ch4.4-3/clientpub/main.go
rename to examples/ch4.4/3/clientpub/main.go
diff --git a/examples/ch4.4-3/clientsub/main.go b/examples/ch4.4/3/clientsub/main.go
similarity index 100%
rename from examples/ch4.4-3/clientsub/main.go
rename to examples/ch4.4/3/clientsub/main.go
diff --git a/examples/ch4-04-grpc/grpc-pubsub/pubsubservice/pubsubservice.pb.go b/examples/ch4.4/3/pubsubservice/pubsubservice.pb.go
similarity index 100%
rename from examples/ch4-04-grpc/grpc-pubsub/pubsubservice/pubsubservice.pb.go
rename to examples/ch4.4/3/pubsubservice/pubsubservice.pb.go
diff --git a/examples/ch4.4-3/pubsubservice/pubsubservice.proto b/examples/ch4.4/3/pubsubservice/pubsubservice.proto
similarity index 100%
rename from examples/ch4.4-3/pubsubservice/pubsubservice.proto
rename to examples/ch4.4/3/pubsubservice/pubsubservice.proto
diff --git a/examples/ch4.4-3/server/main.go b/examples/ch4.4/3/server/main.go
similarity index 100%
rename from examples/ch4.4-3/server/main.go
rename to examples/ch4.4/3/server/main.go
diff --git a/examples/ch4-04-grpc/basic/client/Makefile b/examples/ch4.4/basic/client/Makefile
similarity index 100%
rename from examples/ch4-04-grpc/basic/client/Makefile
rename to examples/ch4.4/basic/client/Makefile
diff --git a/examples/ch4-04-grpc/basic/client/hello.pb.go b/examples/ch4.4/basic/client/hello.pb.go
similarity index 100%
rename from examples/ch4-04-grpc/basic/client/hello.pb.go
rename to examples/ch4.4/basic/client/hello.pb.go
diff --git a/examples/ch4-04-grpc/basic/client/hello.proto b/examples/ch4.4/basic/client/hello.proto
similarity index 100%
rename from examples/ch4-04-grpc/basic/client/hello.proto
rename to examples/ch4.4/basic/client/hello.proto
diff --git a/examples/ch4-04-grpc/basic/client/main.go b/examples/ch4.4/basic/client/main.go
similarity index 100%
rename from examples/ch4-04-grpc/basic/client/main.go
rename to examples/ch4.4/basic/client/main.go
diff --git a/examples/ch4-04-grpc/grpc-pubsub/clientPub/clientPub.go b/examples/ch4.4/grpc-pubsub/clientPub/clientPub.go
similarity index 100%
rename from examples/ch4-04-grpc/grpc-pubsub/clientPub/clientPub.go
rename to examples/ch4.4/grpc-pubsub/clientPub/clientPub.go
diff --git a/examples/ch4-04-grpc/grpc-pubsub/clientSub/clientSub.go b/examples/ch4.4/grpc-pubsub/clientSub/clientSub.go
similarity index 100%
rename from examples/ch4-04-grpc/grpc-pubsub/clientSub/clientSub.go
rename to examples/ch4.4/grpc-pubsub/clientSub/clientSub.go
diff --git a/examples/ch4.4-3/pubsubservice/pubsubservice.pb.go b/examples/ch4.4/grpc-pubsub/pubsubservice/pubsubservice.pb.go
similarity index 100%
rename from examples/ch4.4-3/pubsubservice/pubsubservice.pb.go
rename to examples/ch4.4/grpc-pubsub/pubsubservice/pubsubservice.pb.go
diff --git a/examples/ch4-04-grpc/grpc-pubsub/pubsubservice/pubsubservice.proto b/examples/ch4.4/grpc-pubsub/pubsubservice/pubsubservice.proto
similarity index 100%
rename from examples/ch4-04-grpc/grpc-pubsub/pubsubservice/pubsubservice.proto
rename to examples/ch4.4/grpc-pubsub/pubsubservice/pubsubservice.proto
diff --git a/examples/ch4-04-grpc/grpc-pubsub/server/server.go b/examples/ch4.4/grpc-pubsub/server/server.go
similarity index 100%
rename from examples/ch4-04-grpc/grpc-pubsub/server/server.go
rename to examples/ch4.4/grpc-pubsub/server/server.go
diff --git a/examples/ch4-05-grpc-hack/on-web/Makefile b/examples/ch4.5/on-web/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/Makefile
rename to examples/ch4.5/on-web/Makefile
diff --git a/examples/ch4-05-grpc-hack/on-web/helloworld.pb.go b/examples/ch4.5/on-web/helloworld.pb.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/helloworld.pb.go
rename to examples/ch4.5/on-web/helloworld.pb.go
diff --git a/examples/ch4-05-grpc-hack/on-web/helloworld.proto b/examples/ch4.5/on-web/helloworld.proto
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/helloworld.proto
rename to examples/ch4.5/on-web/helloworld.proto
diff --git a/examples/ch4-05-grpc-hack/on-web/main.go b/examples/ch4.5/on-web/main.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/main.go
rename to examples/ch4.5/on-web/main.go
diff --git a/examples/ch4-05-grpc-hack/on-web/tls-config/Makefile b/examples/ch4.5/on-web/tls-config/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/tls-config/Makefile
rename to examples/ch4.5/on-web/tls-config/Makefile
diff --git a/examples/ch4-05-grpc-hack/on-web/tls-config/server.crt b/examples/ch4.5/on-web/tls-config/server.crt
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/tls-config/server.crt
rename to examples/ch4.5/on-web/tls-config/server.crt
diff --git a/examples/ch4-05-grpc-hack/on-web/tls-config/server.key b/examples/ch4.5/on-web/tls-config/server.key
similarity index 100%
rename from examples/ch4-05-grpc-hack/on-web/tls-config/server.key
rename to examples/ch4.5/on-web/tls-config/server.key
diff --git a/examples/ch4-05-grpc-hack/panic-and-log/Makefile b/examples/ch4.5/panic-and-log/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/panic-and-log/Makefile
rename to examples/ch4.5/panic-and-log/Makefile
diff --git a/examples/ch4-05-grpc-hack/panic-and-log/helloworld.pb.go b/examples/ch4.5/panic-and-log/helloworld.pb.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/panic-and-log/helloworld.pb.go
rename to examples/ch4.5/panic-and-log/helloworld.pb.go
diff --git a/examples/ch4-05-grpc-hack/panic-and-log/helloworld.proto b/examples/ch4.5/panic-and-log/helloworld.proto
similarity index 100%
rename from examples/ch4-05-grpc-hack/panic-and-log/helloworld.proto
rename to examples/ch4.5/panic-and-log/helloworld.proto
diff --git a/examples/ch4-05-grpc-hack/panic-and-log/main.go b/examples/ch4.5/panic-and-log/main.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/panic-and-log/main.go
rename to examples/ch4.5/panic-and-log/main.go
diff --git a/examples/ch4-04-grpc/auth/dummy.txt b/examples/ch4.5/rest-and-swagger/dummy.txt
similarity index 100%
rename from examples/ch4-04-grpc/auth/dummy.txt
rename to examples/ch4.5/rest-and-swagger/dummy.txt
diff --git a/examples/ch4-05-grpc-hack/tls/Makefile b/examples/ch4.5/tls/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/Makefile
rename to examples/ch4.5/tls/Makefile
diff --git a/examples/ch4-05-grpc-hack/tls/helloworld.pb.go b/examples/ch4.5/tls/helloworld.pb.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/helloworld.pb.go
rename to examples/ch4.5/tls/helloworld.pb.go
diff --git a/examples/ch4-05-grpc-hack/tls/helloworld.proto b/examples/ch4.5/tls/helloworld.proto
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/helloworld.proto
rename to examples/ch4.5/tls/helloworld.proto
diff --git a/examples/ch4-05-grpc-hack/tls/main.go b/examples/ch4.5/tls/main.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/main.go
rename to examples/ch4.5/tls/main.go
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/Makefile b/examples/ch4.5/tls/tls-config/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/Makefile
rename to examples/ch4.5/tls/tls-config/Makefile
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/ca.crt b/examples/ch4.5/tls/tls-config/ca.crt
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/ca.crt
rename to examples/ch4.5/tls/tls-config/ca.crt
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/ca.key b/examples/ch4.5/tls/tls-config/ca.key
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/ca.key
rename to examples/ch4.5/tls/tls-config/ca.key
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/ca.srl b/examples/ch4.5/tls/tls-config/ca.srl
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/ca.srl
rename to examples/ch4.5/tls/tls-config/ca.srl
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/client.crt b/examples/ch4.5/tls/tls-config/client.crt
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/client.crt
rename to examples/ch4.5/tls/tls-config/client.crt
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/client.csr b/examples/ch4.5/tls/tls-config/client.csr
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/client.csr
rename to examples/ch4.5/tls/tls-config/client.csr
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/client.key b/examples/ch4.5/tls/tls-config/client.key
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/client.key
rename to examples/ch4.5/tls/tls-config/client.key
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/server.crt b/examples/ch4.5/tls/tls-config/server.crt
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/server.crt
rename to examples/ch4.5/tls/tls-config/server.crt
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/server.csr b/examples/ch4.5/tls/tls-config/server.csr
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/server.csr
rename to examples/ch4.5/tls/tls-config/server.csr
diff --git a/examples/ch4-05-grpc-hack/tls/tls-config/server.key b/examples/ch4.5/tls/tls-config/server.key
similarity index 100%
rename from examples/ch4-05-grpc-hack/tls/tls-config/server.key
rename to examples/ch4.5/tls/tls-config/server.key
diff --git a/examples/ch4-05-grpc-hack/tok/Makefile b/examples/ch4.5/tok/Makefile
similarity index 100%
rename from examples/ch4-05-grpc-hack/tok/Makefile
rename to examples/ch4.5/tok/Makefile
diff --git a/examples/ch4-05-grpc-hack/tok/helloworld.pb.go b/examples/ch4.5/tok/helloworld.pb.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/tok/helloworld.pb.go
rename to examples/ch4.5/tok/helloworld.pb.go
diff --git a/examples/ch4-05-grpc-hack/tok/helloworld.proto b/examples/ch4.5/tok/helloworld.proto
similarity index 100%
rename from examples/ch4-05-grpc-hack/tok/helloworld.proto
rename to examples/ch4.5/tok/helloworld.proto
diff --git a/examples/ch4-05-grpc-hack/tok/main.go b/examples/ch4.5/tok/main.go
similarity index 100%
rename from examples/ch4-05-grpc-hack/tok/main.go
rename to examples/ch4.5/tok/main.go
diff --git a/examples/ch4-06-grpc-ext/pb2-default-value/Makefile b/examples/ch4.6/pb2-default-value/Makefile
similarity index 100%
rename from examples/ch4-06-grpc-ext/pb2-default-value/Makefile
rename to examples/ch4.6/pb2-default-value/Makefile
diff --git a/examples/ch4-06-grpc-ext/pb2-default-value/helloworld.pb.go b/examples/ch4.6/pb2-default-value/helloworld.pb.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/pb2-default-value/helloworld.pb.go
rename to examples/ch4.6/pb2-default-value/helloworld.pb.go
diff --git a/examples/ch4-06-grpc-ext/pb2-default-value/helloworld.proto b/examples/ch4.6/pb2-default-value/helloworld.proto
similarity index 100%
rename from examples/ch4-06-grpc-ext/pb2-default-value/helloworld.proto
rename to examples/ch4.6/pb2-default-value/helloworld.proto
diff --git a/examples/ch4-06-grpc-ext/rest/Makefile b/examples/ch4.6/rest/Makefile
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/Makefile
rename to examples/ch4.6/rest/Makefile
diff --git a/examples/ch4-06-grpc-ext/rest/helloworld.pb.go b/examples/ch4.6/rest/helloworld.pb.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/helloworld.pb.go
rename to examples/ch4.6/rest/helloworld.pb.go
diff --git a/examples/ch4-06-grpc-ext/rest/helloworld.pb.gw.go b/examples/ch4.6/rest/helloworld.pb.gw.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/helloworld.pb.gw.go
rename to examples/ch4.6/rest/helloworld.pb.gw.go
diff --git a/examples/ch4-06-grpc-ext/rest/helloworld.proto b/examples/ch4.6/rest/helloworld.proto
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/helloworld.proto
rename to examples/ch4.6/rest/helloworld.proto
diff --git a/examples/ch4-06-grpc-ext/rest/helloworld.swagger.json b/examples/ch4.6/rest/helloworld.swagger.json
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/helloworld.swagger.json
rename to examples/ch4.6/rest/helloworld.swagger.json
diff --git a/examples/ch4-06-grpc-ext/rest/main.go b/examples/ch4.6/rest/main.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/rest/main.go
rename to examples/ch4.6/rest/main.go
diff --git a/examples/ch4-06-grpc-ext/validators/Makefile b/examples/ch4.6/validators/Makefile
similarity index 100%
rename from examples/ch4-06-grpc-ext/validators/Makefile
rename to examples/ch4.6/validators/Makefile
diff --git a/examples/ch4-06-grpc-ext/validators/helloworld.pb.go b/examples/ch4.6/validators/helloworld.pb.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/validators/helloworld.pb.go
rename to examples/ch4.6/validators/helloworld.pb.go
diff --git a/examples/ch4-06-grpc-ext/validators/helloworld.proto b/examples/ch4.6/validators/helloworld.proto
similarity index 100%
rename from examples/ch4-06-grpc-ext/validators/helloworld.proto
rename to examples/ch4.6/validators/helloworld.proto
diff --git a/examples/ch4-06-grpc-ext/validators/helloworld.validator.pb.go b/examples/ch4.6/validators/helloworld.validator.pb.go
similarity index 100%
rename from examples/ch4-06-grpc-ext/validators/helloworld.validator.pb.go
rename to examples/ch4.6/validators/helloworld.validator.pb.go
diff --git a/examples/ch4-04-grpc/basic/dummy.txt b/examples/ch4.7/http-router/dummy.txt
similarity index 100%
rename from examples/ch4-04-grpc/basic/dummy.txt
rename to examples/ch4.7/http-router/dummy.txt
diff --git a/examples/ch4-07-pb/pb-option/Makefile b/examples/ch4.7/pb-option/Makefile
similarity index 100%
rename from examples/ch4-07-pb/pb-option/Makefile
rename to examples/ch4.7/pb-option/Makefile
diff --git a/examples/ch4-04-grpc/http-handle/dummy.txt b/examples/ch4.7/pb-option/dummy.txt
similarity index 100%
rename from examples/ch4-04-grpc/http-handle/dummy.txt
rename to examples/ch4.7/pb-option/dummy.txt
diff --git a/examples/ch4-07-pb/pb-option/helloworld.pb.go b/examples/ch4.7/pb-option/helloworld.pb.go
similarity index 100%
rename from examples/ch4-07-pb/pb-option/helloworld.pb.go
rename to examples/ch4.7/pb-option/helloworld.pb.go
diff --git a/examples/ch4-07-pb/pb-option/helloworld.proto b/examples/ch4.7/pb-option/helloworld.proto
similarity index 100%
rename from examples/ch4-07-pb/pb-option/helloworld.proto
rename to examples/ch4.7/pb-option/helloworld.proto
diff --git a/examples/ch4-07-pb/pb-option/main/helloworld.pb.go b/examples/ch4.7/pb-option/main/helloworld.pb.go
similarity index 100%
rename from examples/ch4-07-pb/pb-option/main/helloworld.pb.go
rename to examples/ch4.7/pb-option/main/helloworld.pb.go
diff --git a/examples/ch4-04-grpc/reflect/dummy.txt b/examples/ch4.7/pb-web-frameswork/dummy.txt
similarity index 100%
rename from examples/ch4-04-grpc/reflect/dummy.txt
rename to examples/ch4.7/pb-web-frameswork/dummy.txt
diff --git a/examples/ch4-04-grpc/stream/dummy.txt b/examples/ch4.7/plugin-framework/dummy.txt
similarity index 100%
rename from examples/ch4-04-grpc/stream/dummy.txt
rename to examples/ch4.7/plugin-framework/dummy.txt