diff --git a/_quarto.yml b/_quarto.yml
index 0ed7770ebba494c1c173a33c533a4229b720a7e1..4fc4489f8e4f4389964262128172e42f1f7be7d7 100644
--- a/_quarto.yml
+++ b/_quarto.yml
@@ -4,10 +4,10 @@ project:
   post-render: scripts/md2ical.py
   output-dir: public
   resources:
-    - "lectures/git2/code/*"
+    - lectures/git2/code/*
 
 website:
-  title: "Generic Software Skills"
+  title: Generic Software Skills
   navbar:
     left:
       - href: index.qmd
@@ -24,44 +24,52 @@ website:
   sidebar:
     search: true
     contents:
-      - section: "Lectures"
+      - section: Lectures
         contents:
-          # - "lectures/example-lecture/slides.qmd"
-          - "lectures/intro/slides.qmd"
-          - "lectures/command-line/slides.qmd"
-          - "lectures/git/slides.qmd"
-          - "lectures/programming-paradigms/slides.qmd"
-          - "lectures/data-structures/slides.qmd"
-          - "lectures/complexity/slides.qmd"
-          - "lectures/debugging-strategies/slides.qmd"
-          - "lectures/user-experience/slides.qmd"
-          - "lectures/testing/slides.qmd"
-          - "lectures/git2/slides.qmd"
-          - "lectures/parallelism/slides.qmd"
-          - "lectures/hardware/slides.qmd"
-          - "lectures/file-and-data-systems/slides.qmd"
-          - "lectures/memory-hierarchies/slides.qmd"
-          - "lectures/good-practice/slides.qmd"
-          # - "lectures/student-talks/slides.qmd"
-      - section: "Exercises"
+          # - lectures/example-lecture/slides.qmd
+          - lectures/intro/slides.qmd
+          - lectures/command-line/slides.qmd
+          - lectures/git/slides.qmd
+          - lectures/coding-environment-reproducibility/slides.qmd
+          - lectures/tooling-ci/slides.qmd
+          - lectures/testing/slides.qmd
+          - lectures/refactoring/slides.qmd
+          - lectures/debugging-strategies/slides.qmd
+          - lectures/user-experience/slides.qmd
+          - lectures/error-handling-observability/slides.qmd
+          - lectures/data-structures/slides.qmd
+          - lectures/complexity/slides.qmd
+          - lectures/programming-paradigms/slides.qmd
+          - lectures/git2/slides.qmd
+          - lectures/good-practice/slides.qmd
+          # - lectures/student-talks/slides.qmd
+      - section: Exercises
         contents:
-          - "exercises/git.qmd"
-          - "exercises/programming_paradigms.qmd"
-          - "exercises/data_structures.qmd"
-          - "exercises/complexity.qmd"
-          - "exercises/debugging-strategies.qmd"
-          - "exercises/user-experience.qmd"
-          - "exercises/testing.qmd"
-          - "exercises/git2/exercise.qmd"
-          - "exercises/parallelism/parallelism.qmd"
-          - "exercises/hardware/hardware.qmd"
-          - "exercises/file-and-data-systems.qmd"
-          - "exercises/memory-hierarchies.qmd"
-          # - "exercises/student_talks.qmd"
+          - exercises/git.qmd
+          - exercises/programming_paradigms.qmd
+          - exercises/data_structures.qmd
+          - exercises/complexity.qmd
+          - exercises/debugging-strategies.qmd
+          - exercises/user-experience.qmd
+          - exercises/testing.qmd
+          - exercises/git2/exercise.qmd
+          - exercises/parallelism/parallelism.qmd
+          - exercises/hardware/hardware.qmd
+          - exercises/file-and-data-systems.qmd
+          - exercises/memory-hierarchies.qmd
+          # - exercises/student_talks.qmd
+
+      - section: Old lectures
+        contents:
+          - old_lectures/parallelism/slides.qmd
+          - old_lectures/hardware/slides.qmd
+          - old_lectures/file-and-data-systems/slides.qmd
+          - old_lectures/memory-hierarchies/slides.qmd
+
 
 format:
   html:
     theme: cosmo
     css: styles.css
     toc: true
-    license: "CC BY"
+    license: CC BY
diff --git a/index.qmd b/index.qmd
index 5dcd65f008de796bab9cafae63eb3238501b43cb..efc567454a29faa98243f3e69e1c35162430ece8 100644
--- a/index.qmd
+++ b/index.qmd
@@ -2,27 +2,27 @@
 title: "Generic Software Skills"
 ---
 
-The course will take place during Summer Semester 2024, **Tuesdays** at **13:00** to **15:00** in **room 1536a** in Bundesstraße 55.
+The course will take place during Summer Semester 2025, **Tuesdays** at **13:00** to **15:00** in **room 1536a** in Bundesstraße 55.
 If you have a portable computer at hand, please bring it to the lecture.
 If not, don't worry, the lecture will be in a computer room.
 
 ## Lectures
 | Date | Title | Lecturers |
 | --- | --- | --- |
-| 2024-04-02 | The command line | Lukas, Flo |
-| 2024-04-09 | GIT | Georgiana, Lukas |
-| 2024-04-16 | Programming paradigms | Claudia, Georgiana |
-| 2024-04-23 | Data structures | Kalle, Dominik |
-| 2024-04-30 | Complexity | Tobi, Dominik |
-| 2024-05-07 | Debugging Strategies| Dominik, Rene |
-| 2024-05-14 | User experience design | Theresa, Flo |
-| [2024-05-21]{.inactive} | (Pentecost break) | - |
-| 2024-05-28 | Testing | Nils, René |
-| 2024-06-04 | Git advanced | Tobi, Nils |
-| 2024-06-11 | Parallelism | Georgiana, Claudia, JFE |
-| 2024-06-18 | Computing devices (hardware) | JFE, Claudia, Georgiana |
-| 2024-06-25 | File & Data systems | Flo, Kalle |
-| 2024-07-02 | Memory hierarchies | Domink, JFE |
-| 2024-07-09 | Good scientific & coding practice / Students talk for improving grades | Bjorn, Theresa |
+| 2025-04-08 | The command line | Lukas |
+| 2025-04-15 | Git | Lukas |
+| 2025-04-22 | coding environment & reproducibility | Lukas |
+| 2025-04-29 | Tooling & CI | Manuel |
+| 2025-05-06 | Testing |  Flo |
+| 2025-05-13 | Refactoring & legacy code, facade pattern | Manuel |
+| 2025-05-20 | Debugging (Strategies) | Manuel |
+| [2025-05-27]{.inactive} | (Pentecost break) | - |
+| 2025-06-03 | User experience design | Lukas |
+| 2025-06-10 | error handling & observability (& logging) | Flo|
+| 2025-06-17 | Data structures | Tobi |
+| 2025-06-24 | Complexity | Tobi |
+| 2025-07-01 | Programming paradigms | Tobi |
+| 2025-07-08 | Git advanced | Tobi |
+| 2025-07-15 | Open Development, Licenses, Code of Conduct, Contributing etc... | Lukas |
 
 Subscribe to [iCal]({{< env ICAL_URL >}})
diff --git a/lectures/coding-environment-reproducibility/slides.qmd b/lectures/coding-environment-reproducibility/slides.qmd
new file mode 100644
index 0000000000000000000000000000000000000000..343c062cae557f8fc2024ea3354e9becadbe457b
--- /dev/null
+++ b/lectures/coding-environment-reproducibility/slides.qmd
@@ -0,0 +1,5 @@
+---
+title: "Coding environment and reproducibility"
+subtitle: ""
+author: "Lukas Kluft"
+---
diff --git a/lectures/error-handling-observability/slides.qmd b/lectures/error-handling-observability/slides.qmd
new file mode 100644
index 0000000000000000000000000000000000000000..cdbde4b42902393d690e863c439148c89ddc4502
--- /dev/null
+++ b/lectures/error-handling-observability/slides.qmd
@@ -0,0 +1,5 @@
+---
+title: "Error handling and observability"
+subtitle: ""
+author: "Florian Ziemen, Tobias Kölling"
+---
diff --git a/lectures/refactoring/slides.qmd b/lectures/refactoring/slides.qmd
new file mode 100644
index 0000000000000000000000000000000000000000..ad68ae09561c5ee0cdd349cad6040c45b63158b6
--- /dev/null
+++ b/lectures/refactoring/slides.qmd
@@ -0,0 +1,5 @@
+---
+title: "Refactoring and legacy code"
+subtitle: ""
+author: "Florian Ziemen"
+---
diff --git a/lectures/tooling-ci/slides.qmd b/lectures/tooling-ci/slides.qmd
new file mode 100644
index 0000000000000000000000000000000000000000..7f32d23773dfbc327bc062e8ceab83a42fb787b1
--- /dev/null
+++ b/lectures/tooling-ci/slides.qmd
@@ -0,0 +1,5 @@
+---
+title: "Tooling and Continuous Integration"
+subtitle: ""
+author: "Lukas Kluft, Tobias Kölling, (Flo)"
+---
diff --git a/lectures/file-and-data-systems/slides.qmd b/old_lectures/file-and-data-systems/slides.qmd
similarity index 100%
rename from lectures/file-and-data-systems/slides.qmd
rename to old_lectures/file-and-data-systems/slides.qmd
diff --git a/lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.pdf b/old_lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.pdf
similarity index 100%
rename from lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.pdf
rename to old_lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.pdf
diff --git a/lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.png b/old_lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.png
similarity index 100%
rename from lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.png
rename to old_lectures/file-and-data-systems/static/gmd-13-3607-2020-f05-high-res.png
diff --git a/lectures/file-and-data-systems/static/network-overview.png b/old_lectures/file-and-data-systems/static/network-overview.png
similarity index 100%
rename from lectures/file-and-data-systems/static/network-overview.png
rename to old_lectures/file-and-data-systems/static/network-overview.png
diff --git a/lectures/file-and-data-systems/static/storage-media.jpg b/old_lectures/file-and-data-systems/static/storage-media.jpg
similarity index 100%
rename from lectures/file-and-data-systems/static/storage-media.jpg
rename to old_lectures/file-and-data-systems/static/storage-media.jpg
diff --git a/lectures/file-and-data-systems/timer.ipynb b/old_lectures/file-and-data-systems/timer.ipynb
similarity index 100%
rename from lectures/file-and-data-systems/timer.ipynb
rename to old_lectures/file-and-data-systems/timer.ipynb
diff --git a/lectures/hardware/slides.qmd b/old_lectures/hardware/slides.qmd
similarity index 100%
rename from lectures/hardware/slides.qmd
rename to old_lectures/hardware/slides.qmd
diff --git a/lectures/hardware/static/HPC_schematic2.png b/old_lectures/hardware/static/HPC_schematic2.png
similarity index 100%
rename from lectures/hardware/static/HPC_schematic2.png
rename to old_lectures/hardware/static/HPC_schematic2.png
diff --git a/lectures/hardware/static/HPC_schematic_1.png b/old_lectures/hardware/static/HPC_schematic_1.png
similarity index 100%
rename from lectures/hardware/static/HPC_schematic_1.png
rename to old_lectures/hardware/static/HPC_schematic_1.png
diff --git a/lectures/hardware/static/a100.png b/old_lectures/hardware/static/a100.png
similarity index 100%
rename from lectures/hardware/static/a100.png
rename to old_lectures/hardware/static/a100.png
diff --git a/lectures/hardware/static/amd-milan.png b/old_lectures/hardware/static/amd-milan.png
similarity index 100%
rename from lectures/hardware/static/amd-milan.png
rename to old_lectures/hardware/static/amd-milan.png
diff --git a/lectures/hardware/static/history.svg b/old_lectures/hardware/static/history.svg
similarity index 100%
rename from lectures/hardware/static/history.svg
rename to old_lectures/hardware/static/history.svg
diff --git a/lectures/hardware/static/node_schematic.png b/old_lectures/hardware/static/node_schematic.png
similarity index 100%
rename from lectures/hardware/static/node_schematic.png
rename to old_lectures/hardware/static/node_schematic.png
diff --git a/lectures/hardware/static/reduce.svg b/old_lectures/hardware/static/reduce.svg
similarity index 100%
rename from lectures/hardware/static/reduce.svg
rename to old_lectures/hardware/static/reduce.svg
diff --git a/lectures/hardware/static/stencil_operations_1.jpg b/old_lectures/hardware/static/stencil_operations_1.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_1.jpg
rename to old_lectures/hardware/static/stencil_operations_1.jpg
diff --git a/lectures/hardware/static/stencil_operations_2.jpg b/old_lectures/hardware/static/stencil_operations_2.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_2.jpg
rename to old_lectures/hardware/static/stencil_operations_2.jpg
diff --git a/lectures/hardware/static/stencil_operations_3.jpg b/old_lectures/hardware/static/stencil_operations_3.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_3.jpg
rename to old_lectures/hardware/static/stencil_operations_3.jpg
diff --git a/lectures/hardware/static/stencil_operations_4.jpg b/old_lectures/hardware/static/stencil_operations_4.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_4.jpg
rename to old_lectures/hardware/static/stencil_operations_4.jpg
diff --git a/lectures/hardware/static/stencil_operations_5.jpg b/old_lectures/hardware/static/stencil_operations_5.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_5.jpg
rename to old_lectures/hardware/static/stencil_operations_5.jpg
diff --git a/lectures/hardware/static/stencil_operations_6.jpg b/old_lectures/hardware/static/stencil_operations_6.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_6.jpg
rename to old_lectures/hardware/static/stencil_operations_6.jpg
diff --git a/lectures/hardware/static/stencil_operations_7.jpg b/old_lectures/hardware/static/stencil_operations_7.jpg
similarity index 100%
rename from lectures/hardware/static/stencil_operations_7.jpg
rename to old_lectures/hardware/static/stencil_operations_7.jpg
diff --git a/lectures/hardware/static/threads.jpg b/old_lectures/hardware/static/threads.jpg
similarity index 100%
rename from lectures/hardware/static/threads.jpg
rename to old_lectures/hardware/static/threads.jpg
diff --git a/lectures/hardware/static/top500.svg b/old_lectures/hardware/static/top500.svg
similarity index 100%
rename from lectures/hardware/static/top500.svg
rename to old_lectures/hardware/static/top500.svg
diff --git a/lectures/memory-hierarchies/slides.qmd b/old_lectures/memory-hierarchies/slides.qmd
similarity index 100%
rename from lectures/memory-hierarchies/slides.qmd
rename to old_lectures/memory-hierarchies/slides.qmd
diff --git a/lectures/memory-hierarchies/static/concepts_model01.png b/old_lectures/memory-hierarchies/static/concepts_model01.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model01.png
rename to old_lectures/memory-hierarchies/static/concepts_model01.png
diff --git a/lectures/memory-hierarchies/static/concepts_model02.png b/old_lectures/memory-hierarchies/static/concepts_model02.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model02.png
rename to old_lectures/memory-hierarchies/static/concepts_model02.png
diff --git a/lectures/memory-hierarchies/static/concepts_model03.png b/old_lectures/memory-hierarchies/static/concepts_model03.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model03.png
rename to old_lectures/memory-hierarchies/static/concepts_model03.png
diff --git a/lectures/memory-hierarchies/static/concepts_model04.png b/old_lectures/memory-hierarchies/static/concepts_model04.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model04.png
rename to old_lectures/memory-hierarchies/static/concepts_model04.png
diff --git a/lectures/memory-hierarchies/static/concepts_model05.png b/old_lectures/memory-hierarchies/static/concepts_model05.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model05.png
rename to old_lectures/memory-hierarchies/static/concepts_model05.png
diff --git a/lectures/memory-hierarchies/static/concepts_model06.png b/old_lectures/memory-hierarchies/static/concepts_model06.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model06.png
rename to old_lectures/memory-hierarchies/static/concepts_model06.png
diff --git a/lectures/memory-hierarchies/static/concepts_model07.png b/old_lectures/memory-hierarchies/static/concepts_model07.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model07.png
rename to old_lectures/memory-hierarchies/static/concepts_model07.png
diff --git a/lectures/memory-hierarchies/static/concepts_model08.png b/old_lectures/memory-hierarchies/static/concepts_model08.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model08.png
rename to old_lectures/memory-hierarchies/static/concepts_model08.png
diff --git a/lectures/memory-hierarchies/static/concepts_model09.png b/old_lectures/memory-hierarchies/static/concepts_model09.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model09.png
rename to old_lectures/memory-hierarchies/static/concepts_model09.png
diff --git a/lectures/memory-hierarchies/static/concepts_model10.png b/old_lectures/memory-hierarchies/static/concepts_model10.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model10.png
rename to old_lectures/memory-hierarchies/static/concepts_model10.png
diff --git a/lectures/memory-hierarchies/static/concepts_model11.png b/old_lectures/memory-hierarchies/static/concepts_model11.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model11.png
rename to old_lectures/memory-hierarchies/static/concepts_model11.png
diff --git a/lectures/memory-hierarchies/static/concepts_model12.png b/old_lectures/memory-hierarchies/static/concepts_model12.png
similarity index 100%
rename from lectures/memory-hierarchies/static/concepts_model12.png
rename to old_lectures/memory-hierarchies/static/concepts_model12.png
diff --git a/lectures/memory-hierarchies/static/loops.f90 b/old_lectures/memory-hierarchies/static/loops.f90
similarity index 100%
rename from lectures/memory-hierarchies/static/loops.f90
rename to old_lectures/memory-hierarchies/static/loops.f90
diff --git a/lectures/memory-hierarchies/static/memory_mountain.png b/old_lectures/memory-hierarchies/static/memory_mountain.png
similarity index 100%
rename from lectures/memory-hierarchies/static/memory_mountain.png
rename to old_lectures/memory-hierarchies/static/memory_mountain.png
diff --git a/lectures/memory-hierarchies/static/pyramid01.png b/old_lectures/memory-hierarchies/static/pyramid01.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid01.png
rename to old_lectures/memory-hierarchies/static/pyramid01.png
diff --git a/lectures/memory-hierarchies/static/pyramid02.png b/old_lectures/memory-hierarchies/static/pyramid02.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid02.png
rename to old_lectures/memory-hierarchies/static/pyramid02.png
diff --git a/lectures/memory-hierarchies/static/pyramid03.png b/old_lectures/memory-hierarchies/static/pyramid03.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid03.png
rename to old_lectures/memory-hierarchies/static/pyramid03.png
diff --git a/lectures/memory-hierarchies/static/pyramid04.png b/old_lectures/memory-hierarchies/static/pyramid04.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid04.png
rename to old_lectures/memory-hierarchies/static/pyramid04.png
diff --git a/lectures/memory-hierarchies/static/pyramid05.png b/old_lectures/memory-hierarchies/static/pyramid05.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid05.png
rename to old_lectures/memory-hierarchies/static/pyramid05.png
diff --git a/lectures/memory-hierarchies/static/pyramid06.png b/old_lectures/memory-hierarchies/static/pyramid06.png
similarity index 100%
rename from lectures/memory-hierarchies/static/pyramid06.png
rename to old_lectures/memory-hierarchies/static/pyramid06.png
diff --git a/lectures/memory-hierarchies/static/speed.png b/old_lectures/memory-hierarchies/static/speed.png
similarity index 100%
rename from lectures/memory-hierarchies/static/speed.png
rename to old_lectures/memory-hierarchies/static/speed.png
diff --git a/lectures/parallelism/slides.qmd b/old_lectures/parallelism/slides.qmd
similarity index 100%
rename from lectures/parallelism/slides.qmd
rename to old_lectures/parallelism/slides.qmd
diff --git a/lectures/parallelism/static/csm_icon_grid_16198badca.jpg b/old_lectures/parallelism/static/csm_icon_grid_16198badca.jpg
similarity index 100%
rename from lectures/parallelism/static/csm_icon_grid_16198badca.jpg
rename to old_lectures/parallelism/static/csm_icon_grid_16198badca.jpg
diff --git a/lectures/parallelism/static/csm_icon_grid_single_noborder_decomp.png b/old_lectures/parallelism/static/csm_icon_grid_single_noborder_decomp.png
similarity index 100%
rename from lectures/parallelism/static/csm_icon_grid_single_noborder_decomp.png
rename to old_lectures/parallelism/static/csm_icon_grid_single_noborder_decomp.png
diff --git a/lectures/parallelism/static/four_pancakes.png b/old_lectures/parallelism/static/four_pancakes.png
similarity index 100%
rename from lectures/parallelism/static/four_pancakes.png
rename to old_lectures/parallelism/static/four_pancakes.png
diff --git a/lectures/parallelism/static/four_pans_cake.png b/old_lectures/parallelism/static/four_pans_cake.png
similarity index 100%
rename from lectures/parallelism/static/four_pans_cake.png
rename to old_lectures/parallelism/static/four_pans_cake.png
diff --git a/lectures/parallelism/static/one_pancake.png b/old_lectures/parallelism/static/one_pancake.png
similarity index 100%
rename from lectures/parallelism/static/one_pancake.png
rename to old_lectures/parallelism/static/one_pancake.png
diff --git a/lectures/parallelism/static/pancakes_stack.png b/old_lectures/parallelism/static/pancakes_stack.png
similarity index 100%
rename from lectures/parallelism/static/pancakes_stack.png
rename to old_lectures/parallelism/static/pancakes_stack.png
diff --git a/lectures/parallelism/static/parallel_lecture_domain.png b/old_lectures/parallelism/static/parallel_lecture_domain.png
similarity index 100%
rename from lectures/parallelism/static/parallel_lecture_domain.png
rename to old_lectures/parallelism/static/parallel_lecture_domain.png
diff --git a/lectures/parallelism/static/parallel_lecture_domain_2.png b/old_lectures/parallelism/static/parallel_lecture_domain_2.png
similarity index 100%
rename from lectures/parallelism/static/parallel_lecture_domain_2.png
rename to old_lectures/parallelism/static/parallel_lecture_domain_2.png
diff --git a/lectures/parallelism/static/threads.jpg b/old_lectures/parallelism/static/threads.jpg
similarity index 100%
rename from lectures/parallelism/static/threads.jpg
rename to old_lectures/parallelism/static/threads.jpg