diff --git a/lectures/lecture1/README.md b/lectures/chap1/README.md
similarity index 100%
rename from lectures/lecture1/README.md
rename to lectures/chap1/README.md
diff --git a/lectures/lecture1/lab/intro_til_jupyter.ipynb b/lectures/chap1/lab/intro_til_jupyter.ipynb
similarity index 100%
rename from lectures/lecture1/lab/intro_til_jupyter.ipynb
rename to lectures/chap1/lab/intro_til_jupyter.ipynb
diff --git a/lectures/lecture1/lab/lab-1.md b/lectures/chap1/lab/lab-1.md
similarity index 100%
rename from lectures/lecture1/lab/lab-1.md
rename to lectures/chap1/lab/lab-1.md
diff --git a/lectures/lecture1/lab/tall_og_typekonvertering.ipynb b/lectures/chap1/lab/tall_og_typekonvertering.ipynb
similarity index 100%
rename from lectures/lecture1/lab/tall_og_typekonvertering.ipynb
rename to lectures/chap1/lab/tall_og_typekonvertering.ipynb
diff --git a/lectures/lecture1/lab/variabler.ipynb b/lectures/chap1/lab/variabler.ipynb
similarity index 100%
rename from lectures/lecture1/lab/variabler.ipynb
rename to lectures/chap1/lab/variabler.ipynb
diff --git a/lectures/lecture1/notes/codes/intro_til_jupyter.ipynb b/lectures/chap1/notes/codes/intro_til_jupyter.ipynb
similarity index 100%
rename from lectures/lecture1/notes/codes/intro_til_jupyter.ipynb
rename to lectures/chap1/notes/codes/intro_til_jupyter.ipynb
diff --git a/lectures/lecture1/notes/codes/tall_og_typekonvertering.ipynb b/lectures/chap1/notes/codes/tall_og_typekonvertering.ipynb
similarity index 100%
rename from lectures/lecture1/notes/codes/tall_og_typekonvertering.ipynb
rename to lectures/chap1/notes/codes/tall_og_typekonvertering.ipynb
diff --git a/lectures/lecture1/notes/codes/variabler.ipynb b/lectures/chap1/notes/codes/variabler.ipynb
similarity index 100%
rename from lectures/lecture1/notes/codes/variabler.ipynb
rename to lectures/chap1/notes/codes/variabler.ipynb
diff --git a/lectures/lecture1/notes/slides/introduksjon.pdf b/lectures/chap1/notes/slides/introduksjon.pdf
similarity index 100%
rename from lectures/lecture1/notes/slides/introduksjon.pdf
rename to lectures/chap1/notes/slides/introduksjon.pdf
diff --git a/lectures/lecture2/lab/aarstider.ipynb b/lectures/chap2/lab/aarstider.ipynb
similarity index 100%
rename from lectures/lecture2/lab/aarstider.ipynb
rename to lectures/chap2/lab/aarstider.ipynb
diff --git a/lectures/lecture2/lab/funksjoner_og_kalkulasjoner.ipynb b/lectures/chap2/lab/funksjoner_og_kalkulasjoner.ipynb
similarity index 100%
rename from lectures/lecture2/lab/funksjoner_og_kalkulasjoner.ipynb
rename to lectures/chap2/lab/funksjoner_og_kalkulasjoner.ipynb
diff --git a/lectures/lecture2/lab/lab-2.md b/lectures/chap2/lab/lab-2.md
similarity index 100%
rename from lectures/lecture2/lab/lab-2.md
rename to lectures/chap2/lab/lab-2.md
diff --git a/lectures/lecture2/lab/logiske_operatorer_uttrykk.ipynb b/lectures/chap2/lab/logiske_operatorer_uttrykk.ipynb
similarity index 100%
rename from lectures/lecture2/lab/logiske_operatorer_uttrykk.ipynb
rename to lectures/chap2/lab/logiske_operatorer_uttrykk.ipynb
diff --git a/lectures/lecture2/lab/ulike_typer_if_setninger.ipynb b/lectures/chap2/lab/ulike_typer_if_setninger.ipynb
similarity index 100%
rename from lectures/lecture2/lab/ulike_typer_if_setninger.ipynb
rename to lectures/chap2/lab/ulike_typer_if_setninger.ipynb
diff --git a/lectures/lecture2/notes/codes/funksjoner_og_kalkulasjoner.ipynb b/lectures/chap2/notes/codes/funksjoner_og_kalkulasjoner.ipynb
similarity index 100%
rename from lectures/lecture2/notes/codes/funksjoner_og_kalkulasjoner.ipynb
rename to lectures/chap2/notes/codes/funksjoner_og_kalkulasjoner.ipynb
diff --git a/lectures/lecture2/notes/codes/logiske_operatorer_uttrykk.ipynb b/lectures/chap2/notes/codes/logiske_operatorer_uttrykk.ipynb
similarity index 100%
rename from lectures/lecture2/notes/codes/logiske_operatorer_uttrykk.ipynb
rename to lectures/chap2/notes/codes/logiske_operatorer_uttrykk.ipynb
diff --git a/lectures/lecture2/notes/codes/moduler_og_pakker.ipynb b/lectures/chap2/notes/codes/moduler_og_pakker.ipynb
similarity index 100%
rename from lectures/lecture2/notes/codes/moduler_og_pakker.ipynb
rename to lectures/chap2/notes/codes/moduler_og_pakker.ipynb
diff --git a/lectures/lecture2/notes/codes/ulike_typer_if_setninger.ipynb b/lectures/chap2/notes/codes/ulike_typer_if_setninger.ipynb
similarity index 100%
rename from lectures/lecture2/notes/codes/ulike_typer_if_setninger.ipynb
rename to lectures/chap2/notes/codes/ulike_typer_if_setninger.ipynb
diff --git a/lectures/lecture2/notes/slides/lecture-2.md b/lectures/chap2/notes/slides/lecture-2.md
similarity index 100%
rename from lectures/lecture2/notes/slides/lecture-2.md
rename to lectures/chap2/notes/slides/lecture-2.md
diff --git a/lectures/lecture2/notes/slides/lecture-2.pdf b/lectures/chap2/notes/slides/lecture-2.pdf
similarity index 100%
rename from lectures/lecture2/notes/slides/lecture-2.pdf
rename to lectures/chap2/notes/slides/lecture-2.pdf
diff --git a/lectures/lecture3/lab/gjett_tallet.ipynb b/lectures/chap3/lab/gjett_tallet.ipynb
similarity index 100%
rename from lectures/lecture3/lab/gjett_tallet.ipynb
rename to lectures/chap3/lab/gjett_tallet.ipynb
diff --git a/lectures/lecture3/lab/intro_til_lokker.ipynb b/lectures/chap3/lab/intro_til_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/lab/intro_til_lokker.ipynb
rename to lectures/chap3/lab/intro_til_lokker.ipynb
diff --git a/lectures/lecture3/lab/lab-3.md b/lectures/chap3/lab/lab-3.md
similarity index 100%
rename from lectures/lecture3/lab/lab-3.md
rename to lectures/chap3/lab/lab-3.md
diff --git a/lectures/lecture3/lab/mer_om_lokker.ipynb b/lectures/chap3/lab/mer_om_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/lab/mer_om_lokker.ipynb
rename to lectures/chap3/lab/mer_om_lokker.ipynb
diff --git a/lectures/lecture3/lab/nostede_lokker.ipynb b/lectures/chap3/lab/nostede_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/lab/nostede_lokker.ipynb
rename to lectures/chap3/lab/nostede_lokker.ipynb
diff --git a/lectures/lecture3/lab/sammenligning_av_strenger.ipynb b/lectures/chap3/lab/sammenligning_av_strenger.ipynb
similarity index 100%
rename from lectures/lecture3/lab/sammenligning_av_strenger.ipynb
rename to lectures/chap3/lab/sammenligning_av_strenger.ipynb
diff --git a/lectures/lecture3/notes/codes/intro_til_lokker.ipynb b/lectures/chap3/notes/codes/intro_til_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/notes/codes/intro_til_lokker.ipynb
rename to lectures/chap3/notes/codes/intro_til_lokker.ipynb
diff --git a/lectures/lecture3/notes/codes/mer_om_lokker.ipynb b/lectures/chap3/notes/codes/mer_om_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/notes/codes/mer_om_lokker.ipynb
rename to lectures/chap3/notes/codes/mer_om_lokker.ipynb
diff --git a/lectures/lecture3/notes/codes/nostede_lokker.ipynb b/lectures/chap3/notes/codes/nostede_lokker.ipynb
similarity index 100%
rename from lectures/lecture3/notes/codes/nostede_lokker.ipynb
rename to lectures/chap3/notes/codes/nostede_lokker.ipynb
diff --git a/lectures/lecture3/notes/codes/sammenligning_av_strenger.ipynb b/lectures/chap3/notes/codes/sammenligning_av_strenger.ipynb
similarity index 100%
rename from lectures/lecture3/notes/codes/sammenligning_av_strenger.ipynb
rename to lectures/chap3/notes/codes/sammenligning_av_strenger.ipynb
diff --git a/lectures/lecture3/notes/slides/lecture-3.md b/lectures/chap3/notes/slides/lecture-3.md
similarity index 100%
rename from lectures/lecture3/notes/slides/lecture-3.md
rename to lectures/chap3/notes/slides/lecture-3.md
diff --git a/lectures/lecture3/notes/slides/lecture-3.pdf b/lectures/chap3/notes/slides/lecture-3.pdf
similarity index 100%
rename from lectures/lecture3/notes/slides/lecture-3.pdf
rename to lectures/chap3/notes/slides/lecture-3.pdf
diff --git a/lectures/lecture4/images/set_eksempel.png b/lectures/chap4/images/set_eksempel.png
similarity index 100%
rename from lectures/lecture4/images/set_eksempel.png
rename to lectures/chap4/images/set_eksempel.png
diff --git a/lectures/lecture4/lab/generelt_om_lister.ipynb b/lectures/chap4/lab/generelt_om_lister.ipynb
similarity index 100%
rename from lectures/lecture4/lab/generelt_om_lister.ipynb
rename to lectures/chap4/lab/generelt_om_lister.ipynb
diff --git a/lectures/lecture4/lab/generelt_om_sets.ipynb b/lectures/chap4/lab/generelt_om_sets.ipynb
similarity index 100%
rename from lectures/lecture4/lab/generelt_om_sets.ipynb
rename to lectures/chap4/lab/generelt_om_sets.ipynb
diff --git a/lectures/lecture4/lab/lab-4.md b/lectures/chap4/lab/lab-4.md
similarity index 100%
rename from lectures/lecture4/lab/lab-4.md
rename to lectures/chap4/lab/lab-4.md
diff --git a/lectures/lecture4/lab/lister_og_lokker.ipynb b/lectures/chap4/lab/lister_og_lokker.ipynb
similarity index 100%
rename from lectures/lecture4/lab/lister_og_lokker.ipynb
rename to lectures/chap4/lab/lister_og_lokker.ipynb
diff --git a/lectures/lecture4/lab/lister_og_tupler.ipynb b/lectures/chap4/lab/lister_og_tupler.ipynb
similarity index 100%
rename from lectures/lecture4/lab/lister_og_tupler.ipynb
rename to lectures/chap4/lab/lister_og_tupler.ipynb
diff --git a/lectures/lecture4/notes/codes/generelt_om_filbehandling.ipynb b/lectures/chap4/notes/codes/generelt_om_filbehandling.ipynb
similarity index 100%
rename from lectures/lecture4/notes/codes/generelt_om_filbehandling.ipynb
rename to lectures/chap4/notes/codes/generelt_om_filbehandling.ipynb
diff --git a/lectures/lecture4/notes/codes/generelt_om_lister.ipynb b/lectures/chap4/notes/codes/generelt_om_lister.ipynb
similarity index 100%
rename from lectures/lecture4/notes/codes/generelt_om_lister.ipynb
rename to lectures/chap4/notes/codes/generelt_om_lister.ipynb
diff --git a/lectures/lecture4/notes/codes/lister_og_lokker.ipynb b/lectures/chap4/notes/codes/lister_og_lokker.ipynb
similarity index 100%
rename from lectures/lecture4/notes/codes/lister_og_lokker.ipynb
rename to lectures/chap4/notes/codes/lister_og_lokker.ipynb
diff --git a/lectures/lecture4/notes/codes/lister_og_set.ipynb b/lectures/chap4/notes/codes/lister_og_set.ipynb
similarity index 100%
rename from lectures/lecture4/notes/codes/lister_og_set.ipynb
rename to lectures/chap4/notes/codes/lister_og_set.ipynb
diff --git a/lectures/lecture4/notes/codes/lister_og_tupler.ipynb b/lectures/chap4/notes/codes/lister_og_tupler.ipynb
similarity index 100%
rename from lectures/lecture4/notes/codes/lister_og_tupler.ipynb
rename to lectures/chap4/notes/codes/lister_og_tupler.ipynb
diff --git a/lectures/lecture4/notes/slides/lecture-4.md b/lectures/chap4/notes/slides/lecture-4.md
similarity index 100%
rename from lectures/lecture4/notes/slides/lecture-4.md
rename to lectures/chap4/notes/slides/lecture-4.md
diff --git a/lectures/lecture4/notes/slides/lecture-4.pdf b/lectures/chap4/notes/slides/lecture-4.pdf
similarity index 100%
rename from lectures/lecture4/notes/slides/lecture-4.pdf
rename to lectures/chap4/notes/slides/lecture-4.pdf
diff --git a/lectures/lecture5/lab/databaser.ipynb b/lectures/chap5/lab/databaser.ipynb
similarity index 100%
rename from lectures/lecture5/lab/databaser.ipynb
rename to lectures/chap5/lab/databaser.ipynb
diff --git a/lectures/lecture5/lab/generelt_om_filbehandling.ipynb b/lectures/chap5/lab/generelt_om_filbehandling.ipynb
similarity index 100%
rename from lectures/lecture5/lab/generelt_om_filbehandling.ipynb
rename to lectures/chap5/lab/generelt_om_filbehandling.ipynb
diff --git a/lectures/lecture5/lab/lab-5.md b/lectures/chap5/lab/lab-5.md
similarity index 100%
rename from lectures/lecture5/lab/lab-5.md
rename to lectures/chap5/lab/lab-5.md
diff --git a/lectures/lecture5/notes/codes/databaser.ipynb b/lectures/chap5/notes/codes/databaser.ipynb
similarity index 100%
rename from lectures/lecture5/notes/codes/databaser.ipynb
rename to lectures/chap5/notes/codes/databaser.ipynb
diff --git a/lectures/lecture5/notes/slides/lecture-5.md b/lectures/chap5/notes/slides/lecture-5.md
similarity index 100%
rename from lectures/lecture5/notes/slides/lecture-5.md
rename to lectures/chap5/notes/slides/lecture-5.md
diff --git a/lectures/lecture6/notes/slides/lecture-6.md b/lectures/chap6/notes/slides/lecture-6.md
similarity index 100%
rename from lectures/lecture6/notes/slides/lecture-6.md
rename to lectures/chap6/notes/slides/lecture-6.md
diff --git a/lectures/lectures.ipynb b/lectures/lectures.ipynb
index 56ce23a375313bd6f401e6d8c3d687f53b612090..4ad284cef7fc64840f4f5406c770001030020ead 100644
--- a/lectures/lectures.ipynb
+++ b/lectures/lectures.ipynb
@@ -10,116 +10,116 @@
"text/markdown": [
"<details><summary style=\"font-size:200%;cursor: pointer;\">LBAS2002 Informatikk: Programmering</summary>\n",
"<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\"> <a target=\"_blank\" href=https://www.ntnu.no/studier/emner/LBAS2002>Faginnhold og læringsutbytte beskrivelser</a></blockquote>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\">Leksjoner</summary>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 1: Introduksjon, Variabler og Datatyper</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\">Innhold</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 1: Introduksjon, Variabler og Datatyper</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Introduksjon</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Motivasjon (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture1/notes/slides/introduksjon.pdf>Introduksjon</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap1/notes/slides/introduksjon.pdf>Introduksjon</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Kilder og referanser</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture1/README.md>Readme</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap1/README.md>Readme</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Utviklingsmiljø</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture1/notes/codes/intro_til_jupyter.ipynb>Komme i gang med Jupyter Notebook</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap1/notes/codes/intro_til_jupyter.ipynb>Komme i gang med Jupyter Notebook</a></blockquote>\n",
"</details>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Variabler og datatyper</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Variabler</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture1/notes/codes/variabler.ipynb>Enkle datatyper</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap1/notes/codes/variabler.ipynb>Enkle datatyper</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Datatyper</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture1/notes/codes/tall_og_typekonvertering.ipynb>Tall og type konvertering</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap1/notes/codes/tall_og_typekonvertering.ipynb>Tall og type konvertering</a></blockquote>\n",
"</details>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Lab 1</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture1/lab/lab-1.md>Lab-1</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap1/lab/lab-1.md>Lab-1</a></blockquote>\n",
"</details>\n",
"</details>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 2: Funksjoner og pakker, logiske uttrykk, valg</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 2: Funksjoner og pakker, logiske uttrykk, valg</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Introduksjon (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/slides/lecture-2.pdf>Introduksjon</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/slides/chap-2.pdf>Introduksjon</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Funksjoner</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/funksjoner_og_kalkulasjoner.ipynb>Funksjoner og kalkulasjoner</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/funksjoner_og_kalkulasjoner.ipynb>Funksjoner og kalkulasjoner</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Pakker</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/pakker.ipynb>Pakker og moduler</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/pakker.ipynb>Pakker og moduler</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Logiske uttrykk</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/logiske_operatorer_uttrykk.ipynb>Logiske operasjoner</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/logiske_operatorer_uttrykk.ipynb>Logiske operasjoner</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Ulike typer if-setninger</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/ulike_typer_if_setninger.ipynb>Ulike typr if-setninger</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/ulike_typer_if_setninger.ipynb>Ulike typr if-setninger</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Lab 2</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/lab/lab-2.md>Lab-2</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/lab/lab-2.md>Lab-2</a></blockquote>\n",
"</details>\n",
"</details>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 3: Mer om valg, løkker</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 3: Mer om valg, løkker</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Introduksjon (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture3/notes/slides/lecture-3.pdf>Introduksjon</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap3/notes/slides/chap-3.pdf>Introduksjon</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Valg</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/ulike_typer_if_setninger.ipynb>if-setninger</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/ulike_typer_if_setninger.ipynb>if-setninger</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Sammenligning</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture2/notes/codes/sammenligning_av_strenger.ipynb>Sammenligning av strenger</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap2/notes/codes/sammenligning_av_strenger.ipynb>Sammenligning av strenger</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Løkker</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Introduksjon til løkker</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    lecture3/notes/codes/intro_til_lokker.ipynb</blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    chap3/notes/codes/intro_til_lokker.ipynb</blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Mer om løkker</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    lecture3/notes/codes/mer_om_lokker.ipynb</blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    chap3/notes/codes/mer_om_lokker.ipynb</blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Nøstede løkker</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    lecture3/notes/codes/nostede_lokker.ipynb</blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    chap3/notes/codes/nostede_lokker.ipynb</blockquote>\n",
"</details>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Lab 3</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture3/lab/lab-3.md>Lab-3</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap3/lab/lab-3.md>Lab-3</a></blockquote>\n",
"</details>\n",
"</details>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 4: Sammensatte datatyper, Lesing og skriving til filer</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 4: Sammensatte datatyper, Lesing og skriving til filer</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Introduksjon (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture4/notes/slides/lecture-4.pdf>Introduksjon</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap4/notes/slides/chap-4.pdf>Introduksjon</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Sammensatte datatyper</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Lister</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture4/notes/codes/generelt_om_lister.ipynb>Generelt om lister</a></blockquote>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture4/notes/codes/lister_og_lokker.ipynb>Lister og løkker</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap4/notes/codes/generelt_om_lister.ipynb>Generelt om lister</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap4/notes/codes/lister_og_lokker.ipynb>Lister og løkker</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Tupler</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture4/notes/codes/lister_og_tupler.ipynb>Generelt om tupler</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap4/notes/codes/lister_og_tupler.ipynb>Generelt om tupler</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Set</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture4/notes/codes/lister_og_set.ipynb>Generelt om set</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap4/notes/codes/lister_og_set.ipynb>Generelt om set</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">   Filbehandling</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=lecture5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">    <a target=\"_blank\" href=chap5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>\n",
"</details>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Lab 4</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture4/lab/lab-4.md>Lab-4</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap4/lab/lab-4.md>Lab-4</a></blockquote>\n",
"</details>\n",
"</details>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 5: Programmering mot databaser, into til OOP</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 5: Programmering mot databaser, into til OOP</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Introduksjon (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture5/notes/slides/lecture-5.pdf>Introduksjon</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap5/notes/slides/chap-5.pdf>Introduksjon</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Programmering mot databaser</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture5/notes/codes/databaser.ipynb>Lesing og skriving til database</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap5/notes/codes/databaser.ipynb>Lesing og skriving til database</a></blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Object Orientert Programmering</summary>\n",
"<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   Introduksjon</blockquote>\n",
"</details>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Lab 5</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture5/lab/lab-5.md>Lab-5</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap5/lab/lab-5.md>Lab-5</a></blockquote>\n",
"</details>\n",
"</details>\n",
- "<details><summary style=\"font-size:200%;cursor: pointer;\"> Leksjon 6: Oppsummering</summary>\n",
+ "<details><summary style=\"font-size:200%;cursor: pointer;\"> Kapittel 6: Oppsummering</summary>\n",
"<details><summary style=\"font-size:200%;cursor: pointer;\">  Oppsummering (slides)</summary>\n",
- "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=lecture5/notes/slides/lecture-5.pdf>Oppsummering</a></blockquote>\n",
+ "<blockquote style=\"font-size:200%;cursor: pointer;padding: 10px;\">   <a target=\"_blank\" href=chap6/notes/slides/chap-6.pdf>Oppsummering</a></blockquote>\n",
"</details>\n",
"</details>\n"
],
@@ -154,7 +154,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.10.6"
+ "version": "3.11.2"
},
"orig_nbformat": 4
},
diff --git a/lectures/lectures.json b/lectures/lectures.json
index b4e0af3a2b04977e73ebfda65e3ed872a79bcd41..8a7e6a88c01370302de65a876e2b2a26d5c83662 100644
--- a/lectures/lectures.json
+++ b/lectures/lectures.json
@@ -1,74 +1,74 @@
{
"LBAS2002 Informatikk: Programmering": {"Faginnhold og læringsutbytte beskrivelser":"https://www.ntnu.no/studier/emner/LBAS2002"},
- "Leksjoner": [
+ "Innhold": [
{
- "Leksjon 1: Introduksjon, Variabler og Datatyper": [
+ "Kapittel 1: Introduksjon, Variabler og Datatyper": [
{
"Introduksjon": [
- {"Motivasjon (slides)":{"Introduksjon":"lecture1/notes/slides/introduksjon.pdf"}}
- ,{"Kilder og referanser": {"Readme":"lecture1/README.md"}}
- ,{"Utviklingsmiljø": {"Komme i gang med Jupyter Notebook": "lecture1/notes/codes/intro_til_jupyter.ipynb"}}
+ {"Motivasjon (slides)":{"Introduksjon":"chap1/notes/slides/introduksjon.pdf"}}
+ ,{"Kilder og referanser": {"Readme":"chap1/README.md"}}
+ ,{"Utviklingsmiljø": {"Komme i gang med Jupyter Notebook": "chap1/notes/codes/intro_til_jupyter.ipynb"}}
]
}
,{
"Variabler og datatyper": [
- {"Variabler":{"Enkle datatyper":"lecture1/notes/codes/variabler.ipynb"}}
- ,{"Datatyper":{"Tall og type konvertering":"lecture1/notes/codes/tall_og_typekonvertering.ipynb"}}
+ {"Variabler":{"Enkle datatyper":"chap1/notes/codes/variabler.ipynb"}}
+ ,{"Datatyper":{"Tall og type konvertering":"chap1/notes/codes/tall_og_typekonvertering.ipynb"}}
]
}
- ,{"Lab 1": {"Lab-1":"lecture1/lab/lab-1.md"}}
+ ,{"Lab 1": {"Lab-1":"chap1/lab/lab-1.md"}}
]
}
,{
- "Leksjon 2: Funksjoner og pakker, logiske uttrykk, valg": [
- {"Introduksjon (slides)": {"Introduksjon":"lecture2/notes/slides/lecture-2.pdf"}}
- ,{"Funksjoner": {"Funksjoner og kalkulasjoner":"lecture2/notes/codes/funksjoner_og_kalkulasjoner.ipynb"}}
- ,{"Pakker": {"Pakker og moduler":"lecture2/notes/codes/pakker.ipynb"}}
- ,{"Logiske uttrykk": {"Logiske operasjoner":"lecture2/notes/codes/logiske_operatorer_uttrykk.ipynb"}}
- ,{"Ulike typer if-setninger": {"Ulike typr if-setninger":"lecture2/notes/codes/ulike_typer_if_setninger.ipynb"}}
- ,{"Lab 2": {"Lab-2":"lecture2/lab/lab-2.md"}}
+ "Kapittel 2: Funksjoner og pakker, logiske uttrykk, valg": [
+ {"Introduksjon (slides)": {"Introduksjon":"chap2/notes/slides/chap-2.pdf"}}
+ ,{"Funksjoner": {"Funksjoner og kalkulasjoner":"chap2/notes/codes/funksjoner_og_kalkulasjoner.ipynb"}}
+ ,{"Pakker": {"Pakker og moduler":"chap2/notes/codes/pakker.ipynb"}}
+ ,{"Logiske uttrykk": {"Logiske operasjoner":"chap2/notes/codes/logiske_operatorer_uttrykk.ipynb"}}
+ ,{"Ulike typer if-setninger": {"Ulike typr if-setninger":"chap2/notes/codes/ulike_typer_if_setninger.ipynb"}}
+ ,{"Lab 2": {"Lab-2":"chap2/lab/lab-2.md"}}
]
}
,{
- "Leksjon 3: Mer om valg, løkker": [
- {"Introduksjon (slides)": {"Introduksjon":"lecture3/notes/slides/lecture-3.pdf"}}
- ,{"Valg": {"if-setninger":"lecture2/notes/codes/ulike_typer_if_setninger.ipynb"}}
- ,{"Sammenligning": {"Sammenligning av strenger":"lecture2/notes/codes/sammenligning_av_strenger.ipynb"}}
+ "Kapittel 3: Mer om valg, løkker": [
+ {"Introduksjon (slides)": {"Introduksjon":"chap3/notes/slides/chap-3.pdf"}}
+ ,{"Valg": {"if-setninger":"chap2/notes/codes/ulike_typer_if_setninger.ipynb"}}
+ ,{"Sammenligning": {"Sammenligning av strenger":"chap2/notes/codes/sammenligning_av_strenger.ipynb"}}
,{
"Løkker": [
- {"Introduksjon til løkker":"lecture3/notes/codes/intro_til_lokker.ipynb"}
- ,{"Mer om løkker":"lecture3/notes/codes/mer_om_lokker.ipynb"}
- ,{"Nøstede løkker":"lecture3/notes/codes/nostede_lokker.ipynb"}
+ {"Introduksjon til løkker":"chap3/notes/codes/intro_til_lokker.ipynb"}
+ ,{"Mer om løkker":"chap3/notes/codes/mer_om_lokker.ipynb"}
+ ,{"Nøstede løkker":"chap3/notes/codes/nostede_lokker.ipynb"}
]
}
- ,{"Lab 3": {"Lab-3":"lecture3/lab/lab-3.md"}}
+ ,{"Lab 3": {"Lab-3":"chap3/lab/lab-3.md"}}
]
}
,{
- "Leksjon 4: Sammensatte datatyper, Lesing og skriving til filer": [
- {"Introduksjon (slides)": {"Introduksjon":"lecture4/notes/slides/lecture-4.pdf"}}
+ "Kapittel 4: Sammensatte datatyper, Lesing og skriving til filer": [
+ {"Introduksjon (slides)": {"Introduksjon":"chap4/notes/slides/chap-4.pdf"}}
,{
"Sammensatte datatyper": [
- {"Lister": {"Generelt om lister": "lecture4/notes/codes/generelt_om_lister.ipynb", "Lister og løkker": "lecture4/notes/codes/lister_og_lokker.ipynb"}}
- ,{"Tupler":{"Generelt om tupler": "lecture4/notes/codes/lister_og_tupler.ipynb"}}
- ,{"Set": {"Generelt om set": "lecture4/notes/codes/lister_og_set.ipynb"}}
- ,{"Filbehandling": {"Generelt om filbehandling":"lecture5/notes/codes/generelt_om_filbehandling.ipynb"}}
+ {"Lister": {"Generelt om lister": "chap4/notes/codes/generelt_om_lister.ipynb", "Lister og løkker": "chap4/notes/codes/lister_og_lokker.ipynb"}}
+ ,{"Tupler":{"Generelt om tupler": "chap4/notes/codes/lister_og_tupler.ipynb"}}
+ ,{"Set": {"Generelt om set": "chap4/notes/codes/lister_og_set.ipynb"}}
+ ,{"Filbehandling": {"Generelt om filbehandling":"chap5/notes/codes/generelt_om_filbehandling.ipynb"}}
]
}
- ,{"Lab 4": {"Lab-4":"lecture4/lab/lab-4.md"}}
+ ,{"Lab 4": {"Lab-4":"chap4/lab/lab-4.md"}}
]
}
,{
- "Leksjon 5: Programmering mot databaser, into til OOP": [
- {"Introduksjon (slides)": {"Introduksjon":"lecture5/notes/slides/lecture-5.pdf"}}
- ,{"Programmering mot databaser":{"Lesing og skriving til database": "lecture5/notes/codes/databaser.ipynb"}}
+ "Kapittel 5: Programmering mot databaser, into til OOP": [
+ {"Introduksjon (slides)": {"Introduksjon":"chap5/notes/slides/chap-5.pdf"}}
+ ,{"Programmering mot databaser":{"Lesing og skriving til database": "chap5/notes/codes/databaser.ipynb"}}
,{"Object Orientert Programmering": "Introduksjon"}
- ,{"Lab 5": {"Lab-5":"lecture5/lab/lab-5.md"}}
+ ,{"Lab 5": {"Lab-5":"chap5/lab/lab-5.md"}}
]
}
,{
- "Leksjon 6: Oppsummering": [
- {"Oppsummering (slides)": {"Oppsummering":"lecture6/notes/slides/lecture-6.pdf"}}
+ "Kapittel 6: Oppsummering": [
+ {"Oppsummering (slides)": {"Oppsummering":"chap6/notes/slides/chap-6.pdf"}}
]
}
]
diff --git a/lectures/lectures.md b/lectures/lectures.md
index 2b86f09a614c0f54795cc13d0916d531d9d177b8..c377d663e10b87e7986c215b7f0154f074584052 100644
--- a/lectures/lectures.md
+++ b/lectures/lectures.md
@@ -1,114 +1,114 @@
<details><summary style="font-size:200%;cursor: pointer;">LBAS2002 Informatikk: Programmering</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;"> <a target="_blank" href=https://www.ntnu.no/studier/emner/LBAS2002>Faginnhold og læringsutbytte beskrivelser</a></blockquote>
-<details><summary style="font-size:200%;cursor: pointer;">Leksjoner</summary>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 1: Introduksjon, Variabler og Datatyper</summary>
+<details><summary style="font-size:200%;cursor: pointer;">Innhold</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 1: Introduksjon, Variabler og Datatyper</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon</summary>
<details><summary style="font-size:200%;cursor: pointer;">   Motivasjon (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture1/notes/slides/introduksjon.pdf>Introduksjon</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap1/notes/slides/introduksjon.pdf>Introduksjon</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Kilder og referanser</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture1/README.md>Readme</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap1/README.md>Readme</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Utviklingsmiljø</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture1/notes/codes/intro_til_jupyter.ipynb>Komme i gang med Jupyter Notebook</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap1/notes/codes/intro_til_jupyter.ipynb>Komme i gang med Jupyter Notebook</a></blockquote>
</details>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Variabler og datatyper</summary>
<details><summary style="font-size:200%;cursor: pointer;">   Variabler</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture1/notes/codes/variabler.ipynb>Enkle datatyper</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap1/notes/codes/variabler.ipynb>Enkle datatyper</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Datatyper</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture1/notes/codes/tall_og_typekonvertering.ipynb>Tall og type konvertering</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap1/notes/codes/tall_og_typekonvertering.ipynb>Tall og type konvertering</a></blockquote>
</details>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 1</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture1/lab/lab-1.md>Lab-1</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap1/lab/lab-1.md>Lab-1</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 2: Funksjoner og pakker, logiske uttrykk, valg</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 2: Funksjoner og pakker, logiske uttrykk, valg</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/slides/lecture-2.pdf>Introduksjon</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/slides/chap-2.pdf>Introduksjon</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Funksjoner</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/funksjoner_og_kalkulasjoner.ipynb>Funksjoner og kalkulasjoner</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/funksjoner_og_kalkulasjoner.ipynb>Funksjoner og kalkulasjoner</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Pakker</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/pakker.ipynb>Pakker og moduler</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/pakker.ipynb>Pakker og moduler</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Logiske uttrykk</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/logiske_operatorer_uttrykk.ipynb>Logiske operasjoner</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/logiske_operatorer_uttrykk.ipynb>Logiske operasjoner</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Ulike typer if-setninger</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/ulike_typer_if_setninger.ipynb>Ulike typr if-setninger</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/ulike_typer_if_setninger.ipynb>Ulike typr if-setninger</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 2</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/lab/lab-2.md>Lab-2</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/lab/lab-2.md>Lab-2</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 3: Mer om valg, løkker</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 3: Mer om valg, løkker</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture3/notes/slides/lecture-3.pdf>Introduksjon</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap3/notes/slides/chap-3.pdf>Introduksjon</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Valg</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/ulike_typer_if_setninger.ipynb>if-setninger</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/ulike_typer_if_setninger.ipynb>if-setninger</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Sammenligning</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture2/notes/codes/sammenligning_av_strenger.ipynb>Sammenligning av strenger</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap2/notes/codes/sammenligning_av_strenger.ipynb>Sammenligning av strenger</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Løkker</summary>
<details><summary style="font-size:200%;cursor: pointer;">   Introduksjon til løkker</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    lecture3/notes/codes/intro_til_lokker.ipynb</blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    chap3/notes/codes/intro_til_lokker.ipynb</blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Mer om løkker</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    lecture3/notes/codes/mer_om_lokker.ipynb</blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    chap3/notes/codes/mer_om_lokker.ipynb</blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Nøstede løkker</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    lecture3/notes/codes/nostede_lokker.ipynb</blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    chap3/notes/codes/nostede_lokker.ipynb</blockquote>
</details>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 3</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture3/lab/lab-3.md>Lab-3</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap3/lab/lab-3.md>Lab-3</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 4: Sammensatte datatyper, Lesing og skriving til filer</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 4: Sammensatte datatyper, Lesing og skriving til filer</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture4/notes/slides/lecture-4.pdf>Introduksjon</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap4/notes/slides/chap-4.pdf>Introduksjon</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Sammensatte datatyper</summary>
<details><summary style="font-size:200%;cursor: pointer;">   Lister</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture4/notes/codes/generelt_om_lister.ipynb>Generelt om lister</a></blockquote>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture4/notes/codes/lister_og_lokker.ipynb>Lister og løkker</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap4/notes/codes/generelt_om_lister.ipynb>Generelt om lister</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap4/notes/codes/lister_og_lokker.ipynb>Lister og løkker</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Tupler</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture4/notes/codes/lister_og_tupler.ipynb>Generelt om tupler</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap4/notes/codes/lister_og_tupler.ipynb>Generelt om tupler</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Set</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture4/notes/codes/lister_og_set.ipynb>Generelt om set</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap4/notes/codes/lister_og_set.ipynb>Generelt om set</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">   Filbehandling</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=chap5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>
</details>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 4</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture4/lab/lab-4.md>Lab-4</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap4/lab/lab-4.md>Lab-4</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 5: Programmering mot databaser, into til OOP</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 5: Programmering mot databaser, into til OOP</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/slides/lecture-5.pdf>Introduksjon</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap5/notes/slides/chap-5.pdf>Introduksjon</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Programmering mot databaser</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/codes/databaser.ipynb>Lesing og skriving til database</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap5/notes/codes/databaser.ipynb>Lesing og skriving til database</a></blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Object Orientert Programmering</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   Introduksjon</blockquote>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 5</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/lab/lab-5.md>Lab-5</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap5/lab/lab-5.md>Lab-5</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 6: Oppsummering</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Kapittel 6: Oppsummering</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Oppsummering (slides)</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/slides/lecture-5.pdf>Oppsummering</a></blockquote>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=chap6/notes/slides/chap-6.pdf>Oppsummering</a></blockquote>
</details>
</details>