diff --git a/ch-13/1-arena/arena.FCStd b/ch-13/1-arena/arena.FCStd
new file mode 100644
index 0000000..f44da18
Binary files /dev/null and b/ch-13/1-arena/arena.FCStd differ
diff --git a/ch-13/1.1-modelling-space-simple/arena.py b/ch-13/2.1-modelling-space-simple/arena.py
similarity index 100%
rename from ch-13/1.1-modelling-space-simple/arena.py
rename to ch-13/2.1-modelling-space-simple/arena.py
diff --git a/ch-13/1.1-modelling-space-simple/display_arena.py b/ch-13/2.1-modelling-space-simple/display_arena.py
similarity index 100%
rename from ch-13/1.1-modelling-space-simple/display_arena.py
rename to ch-13/2.1-modelling-space-simple/display_arena.py
diff --git a/ch-13/1.1-modelling-space-simple/poetry.lock b/ch-13/2.1-modelling-space-simple/poetry.lock
similarity index 100%
rename from ch-13/1.1-modelling-space-simple/poetry.lock
rename to ch-13/2.1-modelling-space-simple/poetry.lock
diff --git a/ch-13/1.1-modelling-space-simple/pyproject.toml b/ch-13/2.1-modelling-space-simple/pyproject.toml
similarity index 100%
rename from ch-13/1.1-modelling-space-simple/pyproject.toml
rename to ch-13/2.1-modelling-space-simple/pyproject.toml
diff --git a/ch-13/1.2-modelling-distances/arena.py b/ch-13/2.2-modelling-distances/arena.py
similarity index 100%
rename from ch-13/1.2-modelling-distances/arena.py
rename to ch-13/2.2-modelling-distances/arena.py
diff --git a/ch-13/1.2-modelling-distances/display_arena.py b/ch-13/2.2-modelling-distances/display_arena.py
similarity index 100%
rename from ch-13/1.2-modelling-distances/display_arena.py
rename to ch-13/2.2-modelling-distances/display_arena.py
diff --git a/ch-13/1.2-modelling-distances/graph_decay.py b/ch-13/2.2-modelling-distances/graph_decay.py
similarity index 100%
rename from ch-13/1.2-modelling-distances/graph_decay.py
rename to ch-13/2.2-modelling-distances/graph_decay.py
diff --git a/ch-13/1.2-modelling-distances/poetry.lock b/ch-13/2.2-modelling-distances/poetry.lock
similarity index 100%
rename from ch-13/1.2-modelling-distances/poetry.lock
rename to ch-13/2.2-modelling-distances/poetry.lock
diff --git a/ch-13/1.2-modelling-distances/pyproject.toml b/ch-13/2.2-modelling-distances/pyproject.toml
similarity index 100%
rename from ch-13/1.2-modelling-distances/pyproject.toml
rename to ch-13/2.2-modelling-distances/pyproject.toml
diff --git a/ch-13/1.3-bluetooth/display_arena.py b/ch-13/2.3-bluetooth/display_arena.py
similarity index 100%
rename from ch-13/1.3-bluetooth/display_arena.py
rename to ch-13/2.3-bluetooth/display_arena.py
diff --git a/ch-13/1.3-bluetooth/display_from_robot.py b/ch-13/2.3-bluetooth/display_from_robot.py
similarity index 100%
rename from ch-13/1.3-bluetooth/display_from_robot.py
rename to ch-13/2.3-bluetooth/display_from_robot.py
diff --git a/ch-13/1.3-bluetooth/find_devices.py b/ch-13/2.3-bluetooth/find_devices.py
similarity index 100%
rename from ch-13/1.3-bluetooth/find_devices.py
rename to ch-13/2.3-bluetooth/find_devices.py
diff --git a/ch-13/1.3-bluetooth/poetry.lock b/ch-13/2.3-bluetooth/poetry.lock
similarity index 100%
rename from ch-13/1.3-bluetooth/poetry.lock
rename to ch-13/2.3-bluetooth/poetry.lock
diff --git a/ch-13/1.3-bluetooth/pyproject.toml b/ch-13/2.3-bluetooth/pyproject.toml
similarity index 100%
rename from ch-13/1.3-bluetooth/pyproject.toml
rename to ch-13/2.3-bluetooth/pyproject.toml
diff --git a/ch-13/1.3-bluetooth/requirements.txt b/ch-13/2.3-bluetooth/requirements.txt
similarity index 100%
rename from ch-13/1.3-bluetooth/requirements.txt
rename to ch-13/2.3-bluetooth/requirements.txt
diff --git a/ch-13/1.3-bluetooth/robot/arena.py b/ch-13/2.3-bluetooth/robot/arena.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot/arena.py
rename to ch-13/2.3-bluetooth/robot/arena.py
diff --git a/ch-13/1.3-bluetooth/robot/code.py b/ch-13/2.3-bluetooth/robot/code.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot/code.py
rename to ch-13/2.3-bluetooth/robot/code.py
diff --git a/ch-13/1.3-bluetooth/robot/pid_controller.py b/ch-13/2.3-bluetooth/robot/pid_controller.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot/pid_controller.py
rename to ch-13/2.3-bluetooth/robot/pid_controller.py
diff --git a/ch-13/1.3-bluetooth/robot/pio_encoder.py b/ch-13/2.3-bluetooth/robot/pio_encoder.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot/pio_encoder.py
rename to ch-13/2.3-bluetooth/robot/pio_encoder.py
diff --git a/ch-13/1.3-bluetooth/robot/robot.py b/ch-13/2.3-bluetooth/robot/robot.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot/robot.py
rename to ch-13/2.3-bluetooth/robot/robot.py
diff --git a/ch-13/1.3-bluetooth/robot_ble_connection.py b/ch-13/2.3-bluetooth/robot_ble_connection.py
similarity index 100%
rename from ch-13/1.3-bluetooth/robot_ble_connection.py
rename to ch-13/2.3-bluetooth/robot_ble_connection.py
diff --git a/ch-13/2.1-displaying-a-pose/display_from_robot.py b/ch-13/3.1-displaying-a-pose/display_from_robot.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/display_from_robot.py
rename to ch-13/3.1-displaying-a-pose/display_from_robot.py
diff --git a/ch-13/2.1-displaying-a-pose/find_devices.py b/ch-13/3.1-displaying-a-pose/find_devices.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/find_devices.py
rename to ch-13/3.1-displaying-a-pose/find_devices.py
diff --git a/ch-13/2.1-displaying-a-pose/poetry.lock b/ch-13/3.1-displaying-a-pose/poetry.lock
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/poetry.lock
rename to ch-13/3.1-displaying-a-pose/poetry.lock
diff --git a/ch-13/2.1-displaying-a-pose/pyproject.toml b/ch-13/3.1-displaying-a-pose/pyproject.toml
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/pyproject.toml
rename to ch-13/3.1-displaying-a-pose/pyproject.toml
diff --git a/ch-13/2.1-displaying-a-pose/requirements.txt b/ch-13/3.1-displaying-a-pose/requirements.txt
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/requirements.txt
rename to ch-13/3.1-displaying-a-pose/requirements.txt
diff --git a/ch-13/2.1-displaying-a-pose/robot/arena.py b/ch-13/3.1-displaying-a-pose/robot/arena.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot/arena.py
rename to ch-13/3.1-displaying-a-pose/robot/arena.py
diff --git a/ch-13/2.1-displaying-a-pose/robot/code.py b/ch-13/3.1-displaying-a-pose/robot/code.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot/code.py
rename to ch-13/3.1-displaying-a-pose/robot/code.py
diff --git a/ch-13/2.1-displaying-a-pose/robot/pid_controller.py b/ch-13/3.1-displaying-a-pose/robot/pid_controller.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot/pid_controller.py
rename to ch-13/3.1-displaying-a-pose/robot/pid_controller.py
diff --git a/ch-13/2.1-displaying-a-pose/robot/pio_encoder.py b/ch-13/3.1-displaying-a-pose/robot/pio_encoder.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot/pio_encoder.py
rename to ch-13/3.1-displaying-a-pose/robot/pio_encoder.py
diff --git a/ch-13/2.1-displaying-a-pose/robot/robot.py b/ch-13/3.1-displaying-a-pose/robot/robot.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot/robot.py
rename to ch-13/3.1-displaying-a-pose/robot/robot.py
diff --git a/ch-13/2.1-displaying-a-pose/robot_ble_connection.py b/ch-13/3.1-displaying-a-pose/robot_ble_connection.py
similarity index 100%
rename from ch-13/2.1-displaying-a-pose/robot_ble_connection.py
rename to ch-13/3.1-displaying-a-pose/robot_ble_connection.py
diff --git a/ch-13/2.2-collision-avoidance/display_from_robot.py b/ch-13/3.2-collision-avoidance/display_from_robot.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/display_from_robot.py
rename to ch-13/3.2-collision-avoidance/display_from_robot.py
diff --git a/ch-13/2.2-collision-avoidance/find_devices.py b/ch-13/3.2-collision-avoidance/find_devices.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/find_devices.py
rename to ch-13/3.2-collision-avoidance/find_devices.py
diff --git a/ch-13/2.2-collision-avoidance/poetry.lock b/ch-13/3.2-collision-avoidance/poetry.lock
similarity index 100%
rename from ch-13/2.2-collision-avoidance/poetry.lock
rename to ch-13/3.2-collision-avoidance/poetry.lock
diff --git a/ch-13/2.2-collision-avoidance/pyproject.toml b/ch-13/3.2-collision-avoidance/pyproject.toml
similarity index 100%
rename from ch-13/2.2-collision-avoidance/pyproject.toml
rename to ch-13/3.2-collision-avoidance/pyproject.toml
diff --git a/ch-13/2.2-collision-avoidance/requirements.txt b/ch-13/3.2-collision-avoidance/requirements.txt
similarity index 100%
rename from ch-13/2.2-collision-avoidance/requirements.txt
rename to ch-13/3.2-collision-avoidance/requirements.txt
diff --git a/ch-13/2.2-collision-avoidance/robot/arena.py b/ch-13/3.2-collision-avoidance/robot/arena.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot/arena.py
rename to ch-13/3.2-collision-avoidance/robot/arena.py
diff --git a/ch-13/2.2-collision-avoidance/robot/code.py b/ch-13/3.2-collision-avoidance/robot/code.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot/code.py
rename to ch-13/3.2-collision-avoidance/robot/code.py
diff --git a/ch-13/2.2-collision-avoidance/robot/pid_controller.py b/ch-13/3.2-collision-avoidance/robot/pid_controller.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot/pid_controller.py
rename to ch-13/3.2-collision-avoidance/robot/pid_controller.py
diff --git a/ch-13/2.2-collision-avoidance/robot/pio_encoder.py b/ch-13/3.2-collision-avoidance/robot/pio_encoder.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot/pio_encoder.py
rename to ch-13/3.2-collision-avoidance/robot/pio_encoder.py
diff --git a/ch-13/2.2-collision-avoidance/robot/robot.py b/ch-13/3.2-collision-avoidance/robot/robot.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot/robot.py
rename to ch-13/3.2-collision-avoidance/robot/robot.py
diff --git a/ch-13/2.2-collision-avoidance/robot_ble_connection.py b/ch-13/3.2-collision-avoidance/robot_ble_connection.py
similarity index 100%
rename from ch-13/2.2-collision-avoidance/robot_ble_connection.py
rename to ch-13/3.2-collision-avoidance/robot_ble_connection.py
diff --git a/ch-13/2.3-moving-with-encoders/analyse_output-2022-28.ipynb b/ch-13/3.3-moving-with-encoders/analyse_output-2022-28.ipynb
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/analyse_output-2022-28.ipynb
rename to ch-13/3.3-moving-with-encoders/analyse_output-2022-28.ipynb
diff --git a/ch-13/2.3-moving-with-encoders/analyse_output.ipynb b/ch-13/3.3-moving-with-encoders/analyse_output.ipynb
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/analyse_output.ipynb
rename to ch-13/3.3-moving-with-encoders/analyse_output.ipynb
diff --git a/ch-13/2.3-moving-with-encoders/display_from_robot.py b/ch-13/3.3-moving-with-encoders/display_from_robot.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/display_from_robot.py
rename to ch-13/3.3-moving-with-encoders/display_from_robot.py
diff --git a/ch-13/2.3-moving-with-encoders/find_devices.py b/ch-13/3.3-moving-with-encoders/find_devices.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/find_devices.py
rename to ch-13/3.3-moving-with-encoders/find_devices.py
diff --git a/ch-13/2.3-moving-with-encoders/poetry.lock b/ch-13/3.3-moving-with-encoders/poetry.lock
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/poetry.lock
rename to ch-13/3.3-moving-with-encoders/poetry.lock
diff --git a/ch-13/2.3-moving-with-encoders/pyproject.toml b/ch-13/3.3-moving-with-encoders/pyproject.toml
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/pyproject.toml
rename to ch-13/3.3-moving-with-encoders/pyproject.toml
diff --git a/ch-13/2.3-moving-with-encoders/requirements.txt b/ch-13/3.3-moving-with-encoders/requirements.txt
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/requirements.txt
rename to ch-13/3.3-moving-with-encoders/requirements.txt
diff --git a/ch-13/2.3-moving-with-encoders/robot/arena.py b/ch-13/3.3-moving-with-encoders/robot/arena.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot/arena.py
rename to ch-13/3.3-moving-with-encoders/robot/arena.py
diff --git a/ch-13/2.3-moving-with-encoders/robot/code.py b/ch-13/3.3-moving-with-encoders/robot/code.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot/code.py
rename to ch-13/3.3-moving-with-encoders/robot/code.py
diff --git a/ch-13/2.3-moving-with-encoders/robot/pid_controller.py b/ch-13/3.3-moving-with-encoders/robot/pid_controller.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot/pid_controller.py
rename to ch-13/3.3-moving-with-encoders/robot/pid_controller.py
diff --git a/ch-13/2.3-moving-with-encoders/robot/pio_encoder.py b/ch-13/3.3-moving-with-encoders/robot/pio_encoder.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot/pio_encoder.py
rename to ch-13/3.3-moving-with-encoders/robot/pio_encoder.py
diff --git a/ch-13/2.3-moving-with-encoders/robot/robot.py b/ch-13/3.3-moving-with-encoders/robot/robot.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot/robot.py
rename to ch-13/3.3-moving-with-encoders/robot/robot.py
diff --git a/ch-13/2.3-moving-with-encoders/robot_ble_connection.py b/ch-13/3.3-moving-with-encoders/robot_ble_connection.py
similarity index 100%
rename from ch-13/2.3-moving-with-encoders/robot_ble_connection.py
rename to ch-13/3.3-moving-with-encoders/robot_ble_connection.py
diff --git a/ch-13/2.4-movement-uncertainty/banana_shaped.py b/ch-13/3.4-movement-uncertainty/banana_shaped.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/banana_shaped.py
rename to ch-13/3.4-movement-uncertainty/banana_shaped.py
diff --git a/ch-13/2.4-movement-uncertainty/display_from_robot.py b/ch-13/3.4-movement-uncertainty/display_from_robot.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/display_from_robot.py
rename to ch-13/3.4-movement-uncertainty/display_from_robot.py
diff --git a/ch-13/2.4-movement-uncertainty/poetry.lock b/ch-13/3.4-movement-uncertainty/poetry.lock
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/poetry.lock
rename to ch-13/3.4-movement-uncertainty/poetry.lock
diff --git a/ch-13/2.4-movement-uncertainty/pyproject.toml b/ch-13/3.4-movement-uncertainty/pyproject.toml
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/pyproject.toml
rename to ch-13/3.4-movement-uncertainty/pyproject.toml
diff --git a/ch-13/2.4-movement-uncertainty/requirements.txt b/ch-13/3.4-movement-uncertainty/requirements.txt
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/requirements.txt
rename to ch-13/3.4-movement-uncertainty/requirements.txt
diff --git a/ch-13/2.4-movement-uncertainty/robot/arena.py b/ch-13/3.4-movement-uncertainty/robot/arena.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot/arena.py
rename to ch-13/3.4-movement-uncertainty/robot/arena.py
diff --git a/ch-13/2.4-movement-uncertainty/robot/code.py b/ch-13/3.4-movement-uncertainty/robot/code.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot/code.py
rename to ch-13/3.4-movement-uncertainty/robot/code.py
diff --git a/ch-13/2.4-movement-uncertainty/robot/pid_controller.py b/ch-13/3.4-movement-uncertainty/robot/pid_controller.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot/pid_controller.py
rename to ch-13/3.4-movement-uncertainty/robot/pid_controller.py
diff --git a/ch-13/2.4-movement-uncertainty/robot/pio_encoder.py b/ch-13/3.4-movement-uncertainty/robot/pio_encoder.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot/pio_encoder.py
rename to ch-13/3.4-movement-uncertainty/robot/pio_encoder.py
diff --git a/ch-13/2.4-movement-uncertainty/robot/robot.py b/ch-13/3.4-movement-uncertainty/robot/robot.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot/robot.py
rename to ch-13/3.4-movement-uncertainty/robot/robot.py
diff --git a/ch-13/2.4-movement-uncertainty/robot_ble_connection.py b/ch-13/3.4-movement-uncertainty/robot_ble_connection.py
similarity index 100%
rename from ch-13/2.4-movement-uncertainty/robot_ble_connection.py
rename to ch-13/3.4-movement-uncertainty/robot_ble_connection.py
diff --git a/ch-13/3.1-generating-weights/analyse_output.ipynb b/ch-13/4.1-generating-weights/analyse_output.ipynb
similarity index 100%
rename from ch-13/3.1-generating-weights/analyse_output.ipynb
rename to ch-13/4.1-generating-weights/analyse_output.ipynb
diff --git a/ch-13/3.1-generating-weights/display_from_robot.py b/ch-13/4.1-generating-weights/display_from_robot.py
similarity index 100%
rename from ch-13/3.1-generating-weights/display_from_robot.py
rename to ch-13/4.1-generating-weights/display_from_robot.py
diff --git a/ch-13/3.1-generating-weights/poetry.lock b/ch-13/4.1-generating-weights/poetry.lock
similarity index 100%
rename from ch-13/3.1-generating-weights/poetry.lock
rename to ch-13/4.1-generating-weights/poetry.lock
diff --git a/ch-13/3.1-generating-weights/pyproject.toml b/ch-13/4.1-generating-weights/pyproject.toml
similarity index 100%
rename from ch-13/3.1-generating-weights/pyproject.toml
rename to ch-13/4.1-generating-weights/pyproject.toml
diff --git a/ch-13/3.1-generating-weights/requirements.txt b/ch-13/4.1-generating-weights/requirements.txt
similarity index 100%
rename from ch-13/3.1-generating-weights/requirements.txt
rename to ch-13/4.1-generating-weights/requirements.txt
diff --git a/ch-13/3.1-generating-weights/robot/arena.py b/ch-13/4.1-generating-weights/robot/arena.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot/arena.py
rename to ch-13/4.1-generating-weights/robot/arena.py
diff --git a/ch-13/3.1-generating-weights/robot/code.py b/ch-13/4.1-generating-weights/robot/code.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot/code.py
rename to ch-13/4.1-generating-weights/robot/code.py
diff --git a/ch-13/3.1-generating-weights/robot/pid_controller.py b/ch-13/4.1-generating-weights/robot/pid_controller.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot/pid_controller.py
rename to ch-13/4.1-generating-weights/robot/pid_controller.py
diff --git a/ch-13/3.1-generating-weights/robot/pio_encoder.py b/ch-13/4.1-generating-weights/robot/pio_encoder.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot/pio_encoder.py
rename to ch-13/4.1-generating-weights/robot/pio_encoder.py
diff --git a/ch-13/3.1-generating-weights/robot/robot.py b/ch-13/4.1-generating-weights/robot/robot.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot/robot.py
rename to ch-13/4.1-generating-weights/robot/robot.py
diff --git a/ch-13/3.1-generating-weights/robot_ble_connection.py b/ch-13/4.1-generating-weights/robot_ble_connection.py
similarity index 100%
rename from ch-13/3.1-generating-weights/robot_ble_connection.py
rename to ch-13/4.1-generating-weights/robot_ble_connection.py
diff --git a/ch-13/arena.FCStd b/ch-13/arena.FCStd
deleted file mode 100644
index 912fda8..0000000
Binary files a/ch-13/arena.FCStd and /dev/null differ
diff --git a/ch-13/simpler-arena.FCStd b/ch-13/simpler-arena.FCStd
deleted file mode 100644
index bf5110e..0000000
Binary files a/ch-13/simpler-arena.FCStd and /dev/null differ