diff --git a/day5/examples/addables.cc b/chapter_03/examples/addables.cc
similarity index 100%
rename from day5/examples/addables.cc
rename to chapter_03/examples/addables.cc
diff --git a/day3/examples/ipsum.txt b/chapter_06/examples/ipsum.txt
similarity index 100%
rename from day3/examples/ipsum.txt
rename to chapter_06/examples/ipsum.txt
diff --git a/day5/examples/ranges/ranges0.cc b/chapter_06/examples/ranges0.cc
similarity index 100%
rename from day5/examples/ranges/ranges0.cc
rename to chapter_06/examples/ranges0.cc
diff --git a/day3/examples/strtrans.cc b/chapter_06/examples/strtrans.cc
similarity index 100%
rename from day3/examples/strtrans.cc
rename to chapter_06/examples/strtrans.cc
diff --git a/day5/examples/TE/PolyVal.cc b/chapter_07/PolyVal.cc
similarity index 100%
rename from day5/examples/TE/PolyVal.cc
rename to chapter_07/PolyVal.cc
diff --git a/chapter_06/examples/polymorphic/1_virtual/CMakeLists.txt b/chapter_07/examples/polymorphic/1_virtual/CMakeLists.txt
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/CMakeLists.txt
rename to chapter_07/examples/polymorphic/1_virtual/CMakeLists.txt
diff --git a/chapter_06/examples/polymorphic/1_virtual/Circle.cc b/chapter_07/examples/polymorphic/1_virtual/Circle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Circle.cc
rename to chapter_07/examples/polymorphic/1_virtual/Circle.cc
diff --git a/chapter_06/examples/polymorphic/1_virtual/Circle.hh b/chapter_07/examples/polymorphic/1_virtual/Circle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Circle.hh
rename to chapter_07/examples/polymorphic/1_virtual/Circle.hh
diff --git a/chapter_06/examples/polymorphic/1_virtual/Point.cc b/chapter_07/examples/polymorphic/1_virtual/Point.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Point.cc
rename to chapter_07/examples/polymorphic/1_virtual/Point.cc
diff --git a/chapter_06/examples/polymorphic/1_virtual/Point.hh b/chapter_07/examples/polymorphic/1_virtual/Point.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Point.hh
rename to chapter_07/examples/polymorphic/1_virtual/Point.hh
diff --git a/chapter_06/examples/polymorphic/1_virtual/Polygon.hh b/chapter_07/examples/polymorphic/1_virtual/Polygon.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Polygon.hh
rename to chapter_07/examples/polymorphic/1_virtual/Polygon.hh
diff --git a/chapter_06/examples/polymorphic/1_virtual/Shape.hh b/chapter_07/examples/polymorphic/1_virtual/Shape.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Shape.hh
rename to chapter_07/examples/polymorphic/1_virtual/Shape.hh
diff --git a/chapter_06/examples/polymorphic/1_virtual/Triangle.cc b/chapter_07/examples/polymorphic/1_virtual/Triangle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Triangle.cc
rename to chapter_07/examples/polymorphic/1_virtual/Triangle.cc
diff --git a/chapter_06/examples/polymorphic/1_virtual/Triangle.hh b/chapter_07/examples/polymorphic/1_virtual/Triangle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/Triangle.hh
rename to chapter_07/examples/polymorphic/1_virtual/Triangle.hh
diff --git a/chapter_06/examples/polymorphic/1_virtual/main.cc b/chapter_07/examples/polymorphic/1_virtual/main.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/1_virtual/main.cc
rename to chapter_07/examples/polymorphic/1_virtual/main.cc
diff --git a/chapter_06/examples/polymorphic/2_any/CMakeLists.txt b/chapter_07/examples/polymorphic/2_any/CMakeLists.txt
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/CMakeLists.txt
rename to chapter_07/examples/polymorphic/2_any/CMakeLists.txt
diff --git a/chapter_06/examples/polymorphic/2_any/Circle.cc b/chapter_07/examples/polymorphic/2_any/Circle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Circle.cc
rename to chapter_07/examples/polymorphic/2_any/Circle.cc
diff --git a/chapter_06/examples/polymorphic/2_any/Circle.hh b/chapter_07/examples/polymorphic/2_any/Circle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Circle.hh
rename to chapter_07/examples/polymorphic/2_any/Circle.hh
diff --git a/chapter_06/examples/polymorphic/2_any/Point.cc b/chapter_07/examples/polymorphic/2_any/Point.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Point.cc
rename to chapter_07/examples/polymorphic/2_any/Point.cc
diff --git a/chapter_06/examples/polymorphic/2_any/Point.hh b/chapter_07/examples/polymorphic/2_any/Point.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Point.hh
rename to chapter_07/examples/polymorphic/2_any/Point.hh
diff --git a/chapter_06/examples/polymorphic/2_any/Polygon.hh b/chapter_07/examples/polymorphic/2_any/Polygon.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Polygon.hh
rename to chapter_07/examples/polymorphic/2_any/Polygon.hh
diff --git a/chapter_06/examples/polymorphic/2_any/Triangle.cc b/chapter_07/examples/polymorphic/2_any/Triangle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Triangle.cc
rename to chapter_07/examples/polymorphic/2_any/Triangle.cc
diff --git a/chapter_06/examples/polymorphic/2_any/Triangle.hh b/chapter_07/examples/polymorphic/2_any/Triangle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/Triangle.hh
rename to chapter_07/examples/polymorphic/2_any/Triangle.hh
diff --git a/chapter_06/examples/polymorphic/2_any/main.cc b/chapter_07/examples/polymorphic/2_any/main.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/2_any/main.cc
rename to chapter_07/examples/polymorphic/2_any/main.cc
diff --git a/chapter_06/examples/polymorphic/3_variant/CMakeLists.txt b/chapter_07/examples/polymorphic/3_variant/CMakeLists.txt
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/CMakeLists.txt
rename to chapter_07/examples/polymorphic/3_variant/CMakeLists.txt
diff --git a/chapter_06/examples/polymorphic/3_variant/Circle.cc b/chapter_07/examples/polymorphic/3_variant/Circle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Circle.cc
rename to chapter_07/examples/polymorphic/3_variant/Circle.cc
diff --git a/chapter_06/examples/polymorphic/3_variant/Circle.hh b/chapter_07/examples/polymorphic/3_variant/Circle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Circle.hh
rename to chapter_07/examples/polymorphic/3_variant/Circle.hh
diff --git a/chapter_06/examples/polymorphic/3_variant/Point.cc b/chapter_07/examples/polymorphic/3_variant/Point.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Point.cc
rename to chapter_07/examples/polymorphic/3_variant/Point.cc
diff --git a/chapter_06/examples/polymorphic/3_variant/Point.hh b/chapter_07/examples/polymorphic/3_variant/Point.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Point.hh
rename to chapter_07/examples/polymorphic/3_variant/Point.hh
diff --git a/chapter_06/examples/polymorphic/3_variant/Polygon.hh b/chapter_07/examples/polymorphic/3_variant/Polygon.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Polygon.hh
rename to chapter_07/examples/polymorphic/3_variant/Polygon.hh
diff --git a/chapter_06/examples/polymorphic/3_variant/Triangle.cc b/chapter_07/examples/polymorphic/3_variant/Triangle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Triangle.cc
rename to chapter_07/examples/polymorphic/3_variant/Triangle.cc
diff --git a/chapter_06/examples/polymorphic/3_variant/Triangle.hh b/chapter_07/examples/polymorphic/3_variant/Triangle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/Triangle.hh
rename to chapter_07/examples/polymorphic/3_variant/Triangle.hh
diff --git a/chapter_06/examples/polymorphic/3_variant/main.cc b/chapter_07/examples/polymorphic/3_variant/main.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/3_variant/main.cc
rename to chapter_07/examples/polymorphic/3_variant/main.cc
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/CMakeLists.txt b/chapter_07/examples/polymorphic/4_type_erasure/CMakeLists.txt
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/CMakeLists.txt
rename to chapter_07/examples/polymorphic/4_type_erasure/CMakeLists.txt
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Circle.cc b/chapter_07/examples/polymorphic/4_type_erasure/Circle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Circle.cc
rename to chapter_07/examples/polymorphic/4_type_erasure/Circle.cc
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Circle.hh b/chapter_07/examples/polymorphic/4_type_erasure/Circle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Circle.hh
rename to chapter_07/examples/polymorphic/4_type_erasure/Circle.hh
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Point.cc b/chapter_07/examples/polymorphic/4_type_erasure/Point.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Point.cc
rename to chapter_07/examples/polymorphic/4_type_erasure/Point.cc
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Point.hh b/chapter_07/examples/polymorphic/4_type_erasure/Point.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Point.hh
rename to chapter_07/examples/polymorphic/4_type_erasure/Point.hh
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Polygon.hh b/chapter_07/examples/polymorphic/4_type_erasure/Polygon.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Polygon.hh
rename to chapter_07/examples/polymorphic/4_type_erasure/Polygon.hh
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Triangle.cc b/chapter_07/examples/polymorphic/4_type_erasure/Triangle.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Triangle.cc
rename to chapter_07/examples/polymorphic/4_type_erasure/Triangle.cc
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/Triangle.hh b/chapter_07/examples/polymorphic/4_type_erasure/Triangle.hh
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/Triangle.hh
rename to chapter_07/examples/polymorphic/4_type_erasure/Triangle.hh
diff --git a/chapter_06/examples/polymorphic/4_type_erasure/main.cc b/chapter_07/examples/polymorphic/4_type_erasure/main.cc
similarity index 100%
rename from chapter_06/examples/polymorphic/4_type_erasure/main.cc
rename to chapter_07/examples/polymorphic/4_type_erasure/main.cc
diff --git a/day5/examples/modules/2_any/with_header_files/CMakeLists.txt b/chapter_08/examples/2_any/with_header_files/CMakeLists.txt
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/CMakeLists.txt
rename to chapter_08/examples/2_any/with_header_files/CMakeLists.txt
diff --git a/day5/examples/modules/2_any/with_header_files/Circle.cc b/chapter_08/examples/2_any/with_header_files/Circle.cc
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Circle.cc
rename to chapter_08/examples/2_any/with_header_files/Circle.cc
diff --git a/day5/examples/modules/2_any/with_header_files/Circle.hh b/chapter_08/examples/2_any/with_header_files/Circle.hh
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Circle.hh
rename to chapter_08/examples/2_any/with_header_files/Circle.hh
diff --git a/day5/examples/modules/2_any/with_header_files/Point.cc b/chapter_08/examples/2_any/with_header_files/Point.cc
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Point.cc
rename to chapter_08/examples/2_any/with_header_files/Point.cc
diff --git a/day5/examples/modules/2_any/with_header_files/Point.hh b/chapter_08/examples/2_any/with_header_files/Point.hh
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Point.hh
rename to chapter_08/examples/2_any/with_header_files/Point.hh
diff --git a/day5/examples/modules/2_any/with_header_files/Polygon.hh b/chapter_08/examples/2_any/with_header_files/Polygon.hh
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Polygon.hh
rename to chapter_08/examples/2_any/with_header_files/Polygon.hh
diff --git a/day5/examples/modules/2_any/with_header_files/Triangle.cc b/chapter_08/examples/2_any/with_header_files/Triangle.cc
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Triangle.cc
rename to chapter_08/examples/2_any/with_header_files/Triangle.cc
diff --git a/day5/examples/modules/2_any/with_header_files/Triangle.hh b/chapter_08/examples/2_any/with_header_files/Triangle.hh
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/Triangle.hh
rename to chapter_08/examples/2_any/with_header_files/Triangle.hh
diff --git a/day5/examples/modules/2_any/with_header_files/main.cc b/chapter_08/examples/2_any/with_header_files/main.cc
similarity index 100%
rename from day5/examples/modules/2_any/with_header_files/main.cc
rename to chapter_08/examples/2_any/with_header_files/main.cc
diff --git a/day5/examples/modules/2_any/with_modules/CMakeLists.txt b/chapter_08/examples/2_any/with_modules/CMakeLists.txt
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/CMakeLists.txt
rename to chapter_08/examples/2_any/with_modules/CMakeLists.txt
diff --git a/day5/examples/modules/2_any/with_modules/Circle.ixx b/chapter_08/examples/2_any/with_modules/Circle.ixx
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/Circle.ixx
rename to chapter_08/examples/2_any/with_modules/Circle.ixx
diff --git a/day5/examples/modules/2_any/with_modules/Point.ixx b/chapter_08/examples/2_any/with_modules/Point.ixx
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/Point.ixx
rename to chapter_08/examples/2_any/with_modules/Point.ixx
diff --git a/day5/examples/modules/2_any/with_modules/Polygon.ixx b/chapter_08/examples/2_any/with_modules/Polygon.ixx
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/Polygon.ixx
rename to chapter_08/examples/2_any/with_modules/Polygon.ixx
diff --git a/day5/examples/modules/2_any/with_modules/Triangle.ixx b/chapter_08/examples/2_any/with_modules/Triangle.ixx
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/Triangle.ixx
rename to chapter_08/examples/2_any/with_modules/Triangle.ixx
diff --git a/day5/examples/modules/2_any/with_modules/build_with_clang.sh b/chapter_08/examples/2_any/with_modules/build_with_clang.sh
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/build_with_clang.sh
rename to chapter_08/examples/2_any/with_modules/build_with_clang.sh
diff --git a/day5/examples/modules/2_any/with_modules/build_with_gcc.sh b/chapter_08/examples/2_any/with_modules/build_with_gcc.sh
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/build_with_gcc.sh
rename to chapter_08/examples/2_any/with_modules/build_with_gcc.sh
diff --git a/day5/examples/modules/2_any/with_modules/clean.sh b/chapter_08/examples/2_any/with_modules/clean.sh
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/clean.sh
rename to chapter_08/examples/2_any/with_modules/clean.sh
diff --git a/day5/examples/modules/2_any/with_modules/main.cc b/chapter_08/examples/2_any/with_modules/main.cc
similarity index 100%
rename from day5/examples/modules/2_any/with_modules/main.cc
rename to chapter_08/examples/2_any/with_modules/main.cc
diff --git a/day5/examples/modules/advent.cc b/chapter_08/examples/advent.cc
similarity index 100%
rename from day5/examples/modules/advent.cc
rename to chapter_08/examples/advent.cc
diff --git a/day5/examples/modules/darray_module/README.md b/chapter_08/examples/darray_module/README.md
similarity index 100%
rename from day5/examples/modules/darray_module/README.md
rename to chapter_08/examples/darray_module/README.md
diff --git a/day5/examples/modules/darray_module/main.cc b/chapter_08/examples/darray_module/main.cc
similarity index 100%
rename from day5/examples/modules/darray_module/main.cc
rename to chapter_08/examples/darray_module/main.cc
diff --git a/day5/examples/modules/darray_module/mymodule.ixx b/chapter_08/examples/darray_module/mymodule.ixx
similarity index 100%
rename from day5/examples/modules/darray_module/mymodule.ixx
rename to chapter_08/examples/darray_module/mymodule.ixx
diff --git a/day5/examples/modules/feb.cc b/chapter_08/examples/feb.cc
similarity index 100%
rename from day5/examples/modules/feb.cc
rename to chapter_08/examples/feb.cc
diff --git a/day5/examples/modules/hello_m.cc b/chapter_08/examples/hello_m.cc
similarity index 100%
rename from day5/examples/modules/hello_m.cc
rename to chapter_08/examples/hello_m.cc
diff --git a/day5/examples/modules/saxpy/with_header_files/README.md b/chapter_08/examples/saxpy/with_header_files/README.md
similarity index 100%
rename from day5/examples/modules/saxpy/with_header_files/README.md
rename to chapter_08/examples/saxpy/with_header_files/README.md
diff --git a/day5/examples/modules/saxpy/with_header_files/saxpy.hh b/chapter_08/examples/saxpy/with_header_files/saxpy.hh
similarity index 100%
rename from day5/examples/modules/saxpy/with_header_files/saxpy.hh
rename to chapter_08/examples/saxpy/with_header_files/saxpy.hh
diff --git a/day5/examples/modules/saxpy/with_header_files/usesaxpy.cc b/chapter_08/examples/saxpy/with_header_files/usesaxpy.cc
similarity index 100%
rename from day5/examples/modules/saxpy/with_header_files/usesaxpy.cc
rename to chapter_08/examples/saxpy/with_header_files/usesaxpy.cc
diff --git a/day5/examples/modules/saxpy/with_modules/CMakeLists.txt b/chapter_08/examples/saxpy/with_modules/CMakeLists.txt
similarity index 100%
rename from day5/examples/modules/saxpy/with_modules/CMakeLists.txt
rename to chapter_08/examples/saxpy/with_modules/CMakeLists.txt
diff --git a/day5/examples/modules/saxpy/with_modules/README.md b/chapter_08/examples/saxpy/with_modules/README.md
similarity index 100%
rename from day5/examples/modules/saxpy/with_modules/README.md
rename to chapter_08/examples/saxpy/with_modules/README.md
diff --git a/day5/examples/modules/saxpy/with_modules/cleanup.sh b/chapter_08/examples/saxpy/with_modules/cleanup.sh
similarity index 100%
rename from day5/examples/modules/saxpy/with_modules/cleanup.sh
rename to chapter_08/examples/saxpy/with_modules/cleanup.sh
diff --git a/day5/examples/modules/saxpy/with_modules/saxpy.ixx b/chapter_08/examples/saxpy/with_modules/saxpy.ixx
similarity index 100%
rename from day5/examples/modules/saxpy/with_modules/saxpy.ixx
rename to chapter_08/examples/saxpy/with_modules/saxpy.ixx
diff --git a/day5/examples/modules/saxpy/with_modules/usesaxpy.cc b/chapter_08/examples/saxpy/with_modules/usesaxpy.cc
similarity index 100%
rename from day5/examples/modules/saxpy/with_modules/usesaxpy.cc
rename to chapter_08/examples/saxpy/with_modules/usesaxpy.cc