diff --git a/handout/backmatter/versionhistory.tex b/handbook/backmatter/versionhistory.tex
similarity index 100%
rename from handout/backmatter/versionhistory.tex
rename to handbook/backmatter/versionhistory.tex
diff --git a/handout/figures/challenge1_setup.pdf b/handbook/figures/challenge1_setup.pdf
similarity index 100%
rename from handout/figures/challenge1_setup.pdf
rename to handbook/figures/challenge1_setup.pdf
diff --git a/handout/figures/challenge1_setup.tex b/handbook/figures/challenge1_setup.tex
similarity index 100%
rename from handout/figures/challenge1_setup.tex
rename to handbook/figures/challenge1_setup.tex
diff --git a/handout/figures/challenge1_setup.tikz b/handbook/figures/challenge1_setup.tikz
similarity index 100%
rename from handout/figures/challenge1_setup.tikz
rename to handbook/figures/challenge1_setup.tikz
diff --git a/handout/figures/challenge3_setup1.pdf b/handbook/figures/challenge3_setup1.pdf
similarity index 100%
rename from handout/figures/challenge3_setup1.pdf
rename to handbook/figures/challenge3_setup1.pdf
diff --git a/handout/figures/challenge3_setup1.tex b/handbook/figures/challenge3_setup1.tex
similarity index 100%
rename from handout/figures/challenge3_setup1.tex
rename to handbook/figures/challenge3_setup1.tex
diff --git a/handout/figures/challenge3_setup1.tikz b/handbook/figures/challenge3_setup1.tikz
similarity index 100%
rename from handout/figures/challenge3_setup1.tikz
rename to handbook/figures/challenge3_setup1.tikz
diff --git a/handout/figures/challenge3_setup2.pdf b/handbook/figures/challenge3_setup2.pdf
similarity index 100%
rename from handout/figures/challenge3_setup2.pdf
rename to handbook/figures/challenge3_setup2.pdf
diff --git a/handout/figures/challenge3_setup2.tex b/handbook/figures/challenge3_setup2.tex
similarity index 100%
rename from handout/figures/challenge3_setup2.tex
rename to handbook/figures/challenge3_setup2.tex
diff --git a/handout/figures/challenge3_setup2.tikz b/handbook/figures/challenge3_setup2.tikz
similarity index 100%
rename from handout/figures/challenge3_setup2.tikz
rename to handbook/figures/challenge3_setup2.tikz
diff --git a/handout/figures/challenge3_setup3.pdf b/handbook/figures/challenge3_setup3.pdf
similarity index 100%
rename from handout/figures/challenge3_setup3.pdf
rename to handbook/figures/challenge3_setup3.pdf
diff --git a/handout/figures/challenge3_setup3.tex b/handbook/figures/challenge3_setup3.tex
similarity index 100%
rename from handout/figures/challenge3_setup3.tex
rename to handbook/figures/challenge3_setup3.tex
diff --git a/handout/figures/challenge3_setup3.tikz b/handbook/figures/challenge3_setup3.tikz
similarity index 100%
rename from handout/figures/challenge3_setup3.tikz
rename to handbook/figures/challenge3_setup3.tikz
diff --git a/handout/figures/challenge4_setup.pdf b/handbook/figures/challenge4_setup.pdf
similarity index 100%
rename from handout/figures/challenge4_setup.pdf
rename to handbook/figures/challenge4_setup.pdf
diff --git a/handout/figures/challenge4_setup.tex b/handbook/figures/challenge4_setup.tex
similarity index 100%
rename from handout/figures/challenge4_setup.tex
rename to handbook/figures/challenge4_setup.tex
diff --git a/handout/figures/challenge4_setup.tikz b/handbook/figures/challenge4_setup.tikz
similarity index 100%
rename from handout/figures/challenge4_setup.tikz
rename to handbook/figures/challenge4_setup.tikz
diff --git a/handout/figures/control_lever.pdf b/handbook/figures/control_lever.pdf
similarity index 100%
rename from handout/figures/control_lever.pdf
rename to handbook/figures/control_lever.pdf
diff --git a/handout/figures/control_lever.tex b/handbook/figures/control_lever.tex
similarity index 100%
rename from handout/figures/control_lever.tex
rename to handbook/figures/control_lever.tex
diff --git a/handout/figures/control_lever.tikz b/handbook/figures/control_lever.tikz
similarity index 100%
rename from handout/figures/control_lever.tikz
rename to handbook/figures/control_lever.tikz
diff --git a/handout/figures/driving_board.pdf b/handbook/figures/driving_board.pdf
similarity index 100%
rename from handout/figures/driving_board.pdf
rename to handbook/figures/driving_board.pdf
diff --git a/handout/figures/driving_board.tex b/handbook/figures/driving_board.tex
similarity index 100%
rename from handout/figures/driving_board.tex
rename to handbook/figures/driving_board.tex
diff --git a/handout/figures/driving_board.tikz b/handbook/figures/driving_board.tikz
similarity index 100%
rename from handout/figures/driving_board.tikz
rename to handbook/figures/driving_board.tikz
diff --git a/handout/figures/initial_setup.pdf b/handbook/figures/initial_setup.pdf
similarity index 100%
rename from handout/figures/initial_setup.pdf
rename to handbook/figures/initial_setup.pdf
diff --git a/handout/figures/initial_setup.tex b/handbook/figures/initial_setup.tex
similarity index 100%
rename from handout/figures/initial_setup.tex
rename to handbook/figures/initial_setup.tex
diff --git a/handout/figures/initial_setup.tikz b/handbook/figures/initial_setup.tikz
similarity index 100%
rename from handout/figures/initial_setup.tikz
rename to handbook/figures/initial_setup.tikz
diff --git a/handout/figures/movement_example1.tikz b/handbook/figures/movement_example1.tikz
similarity index 100%
rename from handout/figures/movement_example1.tikz
rename to handbook/figures/movement_example1.tikz
diff --git a/handout/figures/movement_example2.tikz b/handbook/figures/movement_example2.tikz
similarity index 100%
rename from handout/figures/movement_example2.tikz
rename to handbook/figures/movement_example2.tikz
diff --git a/handout/figures/movement_example3.tikz b/handbook/figures/movement_example3.tikz
similarity index 100%
rename from handout/figures/movement_example3.tikz
rename to handbook/figures/movement_example3.tikz
diff --git a/handout/figures/movement_example4.tikz b/handbook/figures/movement_example4.tikz
similarity index 100%
rename from handout/figures/movement_example4.tikz
rename to handbook/figures/movement_example4.tikz
diff --git a/handout/figures/movement_example5.tikz b/handbook/figures/movement_example5.tikz
similarity index 100%
rename from handout/figures/movement_example5.tikz
rename to handbook/figures/movement_example5.tikz
diff --git a/handout/figures/route_box.pdf b/handbook/figures/route_box.pdf
similarity index 100%
rename from handout/figures/route_box.pdf
rename to handbook/figures/route_box.pdf
diff --git a/handout/figures/route_box.tex b/handbook/figures/route_box.tex
similarity index 100%
rename from handout/figures/route_box.tex
rename to handbook/figures/route_box.tex
diff --git a/handout/figures/route_box.tikz b/handbook/figures/route_box.tikz
similarity index 100%
rename from handout/figures/route_box.tikz
rename to handbook/figures/route_box.tikz
diff --git a/handout/figures/route_locking_matrix.tikz b/handbook/figures/route_locking_matrix.tikz
similarity index 100%
rename from handout/figures/route_locking_matrix.tikz
rename to handbook/figures/route_locking_matrix.tikz
diff --git a/handout/figures/signal_aspects.tikz b/handbook/figures/signal_aspects.tikz
similarity index 100%
rename from handout/figures/signal_aspects.tikz
rename to handbook/figures/signal_aspects.tikz
diff --git a/handout/figures/tutorial_followprotection_setup.pdf b/handbook/figures/tutorial_followprotection_setup.pdf
similarity index 100%
rename from handout/figures/tutorial_followprotection_setup.pdf
rename to handbook/figures/tutorial_followprotection_setup.pdf
diff --git a/handout/figures/tutorial_followprotection_setup.tex b/handbook/figures/tutorial_followprotection_setup.tex
similarity index 100%
rename from handout/figures/tutorial_followprotection_setup.tex
rename to handbook/figures/tutorial_followprotection_setup.tex
diff --git a/handout/figures/tutorial_followprotection_setup.tikz b/handbook/figures/tutorial_followprotection_setup.tikz
similarity index 100%
rename from handout/figures/tutorial_followprotection_setup.tikz
rename to handbook/figures/tutorial_followprotection_setup.tikz
diff --git a/handout/figures/tutorial_routeprotection_setup.pdf b/handbook/figures/tutorial_routeprotection_setup.pdf
similarity index 100%
rename from handout/figures/tutorial_routeprotection_setup.pdf
rename to handbook/figures/tutorial_routeprotection_setup.pdf
diff --git a/handout/figures/tutorial_routeprotection_setup.tex b/handbook/figures/tutorial_routeprotection_setup.tex
similarity index 100%
rename from handout/figures/tutorial_routeprotection_setup.tex
rename to handbook/figures/tutorial_routeprotection_setup.tex
diff --git a/handout/figures/tutorial_routeprotection_setup.tikz b/handbook/figures/tutorial_routeprotection_setup.tikz
similarity index 100%
rename from handout/figures/tutorial_routeprotection_setup.tikz
rename to handbook/figures/tutorial_routeprotection_setup.tikz
diff --git a/handout/figures/tutorial_trainrun_setup.pdf b/handbook/figures/tutorial_trainrun_setup.pdf
similarity index 100%
rename from handout/figures/tutorial_trainrun_setup.pdf
rename to handbook/figures/tutorial_trainrun_setup.pdf
diff --git a/handout/figures/tutorial_trainrun_setup.tex b/handbook/figures/tutorial_trainrun_setup.tex
similarity index 100%
rename from handout/figures/tutorial_trainrun_setup.tex
rename to handbook/figures/tutorial_trainrun_setup.tex
diff --git a/handout/figures/tutorial_trainrun_setup.tikz b/handbook/figures/tutorial_trainrun_setup.tikz
similarity index 100%
rename from handout/figures/tutorial_trainrun_setup.tikz
rename to handbook/figures/tutorial_trainrun_setup.tikz
diff --git a/handout/frontmatter/copyright.tex b/handbook/frontmatter/copyright.tex
similarity index 100%
rename from handout/frontmatter/copyright.tex
rename to handbook/frontmatter/copyright.tex
diff --git a/handout/frontmatter/titlepage.tex b/handbook/frontmatter/titlepage.tex
similarity index 100%
rename from handout/frontmatter/titlepage.tex
rename to handbook/frontmatter/titlepage.tex
diff --git a/handout/handbook.pdf b/handbook/handbook.pdf
similarity index 100%
rename from handout/handbook.pdf
rename to handbook/handbook.pdf
diff --git a/handout/handbook.sty b/handbook/handbook.sty
similarity index 100%
rename from handout/handbook.sty
rename to handbook/handbook.sty
diff --git a/handout/handbook.tex b/handbook/handbook.tex
similarity index 100%
rename from handout/handbook.tex
rename to handbook/handbook.tex
diff --git a/handout/route_locking_matrix.pdf b/handbook/route_locking_matrix.pdf
similarity index 100%
rename from handout/route_locking_matrix.pdf
rename to handbook/route_locking_matrix.pdf
diff --git a/handout/route_locking_matrix.tex b/handbook/route_locking_matrix.tex
similarity index 100%
rename from handout/route_locking_matrix.tex
rename to handbook/route_locking_matrix.tex
diff --git a/handout/tables/example_movement.tex b/handbook/tables/example_movement.tex
similarity index 100%
rename from handout/tables/example_movement.tex
rename to handbook/tables/example_movement.tex
diff --git a/handout/tables/example_protocol.tex b/handbook/tables/example_protocol.tex
similarity index 100%
rename from handout/tables/example_protocol.tex
rename to handbook/tables/example_protocol.tex
diff --git a/handout/tables/game_procedure.tex b/handbook/tables/game_procedure.tex
similarity index 100%
rename from handout/tables/game_procedure.tex
rename to handbook/tables/game_procedure.tex
diff --git a/handout/tables/protocol.tex b/handbook/tables/protocol.tex
similarity index 100%
rename from handout/tables/protocol.tex
rename to handbook/tables/protocol.tex
diff --git a/handout/tables/route_locking_matrix.tex b/handbook/tables/route_locking_matrix.tex
similarity index 100%
rename from handout/tables/route_locking_matrix.tex
rename to handbook/tables/route_locking_matrix.tex
diff --git a/handout/tables/signal_aspects.tex b/handbook/tables/signal_aspects.tex
similarity index 100%
rename from handout/tables/signal_aspects.tex
rename to handbook/tables/signal_aspects.tex
diff --git a/handout/tables/visibility_conditions.tex b/handbook/tables/visibility_conditions.tex
similarity index 100%
rename from handout/tables/visibility_conditions.tex
rename to handbook/tables/visibility_conditions.tex
diff --git a/handout/tasks/blocksection_de.tex b/handbook/tasks/blocksection_de.tex
similarity index 100%
rename from handout/tasks/blocksection_de.tex
rename to handbook/tasks/blocksection_de.tex
diff --git a/handout/tasks/network_de.tex b/handbook/tasks/network_de.tex
similarity index 100%
rename from handout/tasks/network_de.tex
rename to handbook/tasks/network_de.tex
diff --git a/handout/tasks/overlap_de.tex b/handbook/tasks/overlap_de.tex
similarity index 100%
rename from handout/tasks/overlap_de.tex
rename to handbook/tasks/overlap_de.tex
diff --git a/handout/tasks/routes_de.tex b/handbook/tasks/routes_de.tex
similarity index 100%
rename from handout/tasks/routes_de.tex
rename to handbook/tasks/routes_de.tex
diff --git a/handout/tasks/runningtime_de.tex b/handbook/tasks/runningtime_de.tex
similarity index 100%
rename from handout/tasks/runningtime_de.tex
rename to handbook/tasks/runningtime_de.tex
diff --git a/handout/tasks/selectiveprotectivepoints_de.tex b/handbook/tasks/selectiveprotectivepoints_de.tex
similarity index 100%
rename from handout/tasks/selectiveprotectivepoints_de.tex
rename to handbook/tasks/selectiveprotectivepoints_de.tex
diff --git a/handout/tasks/trafficflow_de.tex b/handbook/tasks/trafficflow_de.tex
similarity index 100%
rename from handout/tasks/trafficflow_de.tex
rename to handbook/tasks/trafficflow_de.tex
diff --git a/handout/tasks/viewpoint_de.tex b/handbook/tasks/viewpoint_de.tex
similarity index 100%
rename from handout/tasks/viewpoint_de.tex
rename to handbook/tasks/viewpoint_de.tex
diff --git a/handout/tutorial/aim.tex b/handbook/tutorial/aim.tex
similarity index 100%
rename from handout/tutorial/aim.tex
rename to handbook/tutorial/aim.tex
diff --git a/handout/tutorial/followprotection_de.tex b/handbook/tutorial/followprotection_de.tex
similarity index 100%
rename from handout/tutorial/followprotection_de.tex
rename to handbook/tutorial/followprotection_de.tex
diff --git a/handout/tutorial/routeprotection_de.tex b/handbook/tutorial/routeprotection_de.tex
similarity index 100%
rename from handout/tutorial/routeprotection_de.tex
rename to handbook/tutorial/routeprotection_de.tex
diff --git a/handout/tutorial/trainrun_de.tex b/handbook/tutorial/trainrun_de.tex
similarity index 100%
rename from handout/tutorial/trainrun_de.tex
rename to handbook/tutorial/trainrun_de.tex