diff --git a/material/content/ccc/ccc_bundesweit.tex b/content/ccc/ccc_bundesweit.tex
similarity index 100%
rename from material/content/ccc/ccc_bundesweit.tex
rename to content/ccc/ccc_bundesweit.tex
diff --git a/material/content/ccc/ccc_lokal.tex b/content/ccc/ccc_lokal.tex
similarity index 100%
rename from material/content/ccc/ccc_lokal.tex
rename to content/ccc/ccc_lokal.tex
diff --git a/material/content/geraetesicherheit/app_permissions.tex b/content/geraetesicherheit/app_permissions.tex
similarity index 100%
rename from material/content/geraetesicherheit/app_permissions.tex
rename to content/geraetesicherheit/app_permissions.tex
diff --git a/material/content/geraetesicherheit/foss_programme_apps.tex b/content/geraetesicherheit/foss_programme_apps.tex
similarity index 100%
rename from material/content/geraetesicherheit/foss_programme_apps.tex
rename to content/geraetesicherheit/foss_programme_apps.tex
diff --git a/material/content/geraetesicherheit/schutzmoeglichkeiten.tex b/content/geraetesicherheit/schutzmoeglichkeiten.tex
similarity index 100%
rename from material/content/geraetesicherheit/schutzmoeglichkeiten.tex
rename to content/geraetesicherheit/schutzmoeglichkeiten.tex
diff --git a/material/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex b/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex
similarity index 100%
rename from material/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex
rename to content/geraetesicherheit/unerwuenschte_funktionalitaet.tex
diff --git a/material/content/internet/kommunikationsmodelle.tex b/content/internet/kommunikationsmodelle.tex
similarity index 100%
rename from material/content/internet/kommunikationsmodelle.tex
rename to content/internet/kommunikationsmodelle.tex
diff --git a/material/content/internet/server_kabel_router.tex b/content/internet/server_kabel_router.tex
similarity index 100%
rename from material/content/internet/server_kabel_router.tex
rename to content/internet/server_kabel_router.tex
diff --git a/material/content/metadaten/alternative_dienste.tex b/content/metadaten/alternative_dienste.tex
similarity index 100%
rename from material/content/metadaten/alternative_dienste.tex
rename to content/metadaten/alternative_dienste.tex
diff --git a/material/content/metadaten/antitracking.tex b/content/metadaten/antitracking.tex
similarity index 100%
rename from material/content/metadaten/antitracking.tex
rename to content/metadaten/antitracking.tex
diff --git a/material/content/metadaten/location_heatmap.tex b/content/metadaten/location_heatmap.tex
similarity index 100%
rename from material/content/metadaten/location_heatmap.tex
rename to content/metadaten/location_heatmap.tex
diff --git a/material/content/metadaten/nextcloud.tex b/content/metadaten/nextcloud.tex
similarity index 100%
rename from material/content/metadaten/nextcloud.tex
rename to content/metadaten/nextcloud.tex
diff --git a/material/content/metadaten/tracking.tex b/content/metadaten/tracking.tex
similarity index 100%
rename from material/content/metadaten/tracking.tex
rename to content/metadaten/tracking.tex
diff --git a/material/content/metadaten/vds.tex b/content/metadaten/vds.tex
similarity index 100%
rename from material/content/metadaten/vds.tex
rename to content/metadaten/vds.tex
diff --git a/material/content/metadaten/zeitstempel.tex b/content/metadaten/zeitstempel.tex
similarity index 100%
rename from material/content/metadaten/zeitstempel.tex
rename to content/metadaten/zeitstempel.tex
diff --git a/material/content/motivation/stasi_vs_nsa.tex b/content/motivation/stasi_vs_nsa.tex
similarity index 100%
rename from material/content/motivation/stasi_vs_nsa.tex
rename to content/motivation/stasi_vs_nsa.tex
diff --git a/material/content/soziale_netzwerke/geschaeftsmodelleraten.tex b/content/soziale_netzwerke/geschaeftsmodelleraten.tex
similarity index 100%
rename from material/content/soziale_netzwerke/geschaeftsmodelleraten.tex
rename to content/soziale_netzwerke/geschaeftsmodelleraten.tex
diff --git a/material/content/soziale_netzwerke/umfrage.tex b/content/soziale_netzwerke/umfrage.tex
similarity index 100%
rename from material/content/soziale_netzwerke/umfrage.tex
rename to content/soziale_netzwerke/umfrage.tex
diff --git a/material/content/soziale_netzwerke/umgangsformen.tex b/content/soziale_netzwerke/umgangsformen.tex
similarity index 100%
rename from material/content/soziale_netzwerke/umgangsformen.tex
rename to content/soziale_netzwerke/umgangsformen.tex
diff --git a/material/content/verhalten/datensparsamkeit.tex b/content/verhalten/datensparsamkeit.tex
similarity index 100%
rename from material/content/verhalten/datensparsamkeit.tex
rename to content/verhalten/datensparsamkeit.tex
diff --git a/material/content/verhalten/passworter.tex b/content/verhalten/passworter.tex
similarity index 100%
rename from material/content/verhalten/passworter.tex
rename to content/verhalten/passworter.tex
diff --git a/material/content/verschluesselung/e2e.tex b/content/verschluesselung/e2e.tex
similarity index 100%
rename from material/content/verschluesselung/e2e.tex
rename to content/verschluesselung/e2e.tex
diff --git a/material/content/verschluesselung/https_everywhere.tex b/content/verschluesselung/https_everywhere.tex
similarity index 100%
rename from material/content/verschluesselung/https_everywhere.tex
rename to content/verschluesselung/https_everywhere.tex
diff --git a/material/content/verschluesselung/messenger_vergleich.tex b/content/verschluesselung/messenger_vergleich.tex
similarity index 100%
rename from material/content/verschluesselung/messenger_vergleich.tex
rename to content/verschluesselung/messenger_vergleich.tex
diff --git a/material/content/verschluesselung/ssl.tex b/content/verschluesselung/ssl.tex
similarity index 100%
rename from material/content/verschluesselung/ssl.tex
rename to content/verschluesselung/ssl.tex
diff --git a/material/img/502400-64.png b/img/502400-64.png
similarity index 100%
rename from material/img/502400-64.png
rename to img/502400-64.png
diff --git a/material/img/Beta-badge.pdf b/img/Beta-badge.pdf
similarity index 100%
rename from material/img/Beta-badge.pdf
rename to img/Beta-badge.pdf
diff --git a/material/img/Beta-badge.svg b/img/Beta-badge.svg
similarity index 100%
rename from material/img/Beta-badge.svg
rename to img/Beta-badge.svg
diff --git a/material/img/F-Droid_Logo_2.pdf b/img/F-Droid_Logo_2.pdf
similarity index 100%
rename from material/img/F-Droid_Logo_2.pdf
rename to img/F-Droid_Logo_2.pdf
diff --git a/material/img/Gnupg_logo.pdf b/img/Gnupg_logo.pdf
similarity index 100%
rename from material/img/Gnupg_logo.pdf
rename to img/Gnupg_logo.pdf
diff --git a/material/img/Gnupg_logo.svg b/img/Gnupg_logo.svg
similarity index 100%
rename from material/img/Gnupg_logo.svg
rename to img/Gnupg_logo.svg
diff --git a/material/img/Internet_map_1024.jpg b/img/Internet_map_1024.jpg
similarity index 100%
rename from material/img/Internet_map_1024.jpg
rename to img/Internet_map_1024.jpg
diff --git a/material/img/LibreOffice.pdf b/img/LibreOffice.pdf
similarity index 100%
rename from material/img/LibreOffice.pdf
rename to img/LibreOffice.pdf
diff --git a/material/img/Mozilla_Thunderbird_3.png b/img/Mozilla_Thunderbird_3.png
similarity index 100%
rename from material/img/Mozilla_Thunderbird_3.png
rename to img/Mozilla_Thunderbird_3.png
diff --git a/material/img/Replicant_logo_alpha.pdf b/img/Replicant_logo_alpha.pdf
similarity index 100%
rename from material/img/Replicant_logo_alpha.pdf
rename to img/Replicant_logo_alpha.pdf
diff --git a/material/img/TextSecure_Icon.png b/img/TextSecure_Icon.png
similarity index 100%
rename from material/img/TextSecure_Icon.png
rename to img/TextSecure_Icon.png
diff --git a/material/img/Tux.pdf b/img/Tux.pdf
similarity index 100%
rename from material/img/Tux.pdf
rename to img/Tux.pdf
diff --git a/material/img/akten1.png b/img/akten1.png
similarity index 100%
rename from material/img/akten1.png
rename to img/akten1.png
diff --git a/material/img/akten2.png b/img/akten2.png
similarity index 100%
rename from material/img/akten2.png
rename to img/akten2.png
diff --git a/material/img/anonymous.jpg b/img/anonymous.jpg
similarity index 100%
rename from material/img/anonymous.jpg
rename to img/anonymous.jpg
diff --git a/material/img/asym_encryption.png b/img/asym_encryption.png
similarity index 100%
rename from material/img/asym_encryption.png
rename to img/asym_encryption.png
diff --git a/material/img/auth.png b/img/auth.png
similarity index 100%
rename from material/img/auth.png
rename to img/auth.png
diff --git a/material/img/backdoor-android.png b/img/backdoor-android.png
similarity index 100%
rename from material/img/backdoor-android.png
rename to img/backdoor-android.png
diff --git a/material/img/backdoor-apps.png b/img/backdoor-apps.png
similarity index 100%
rename from material/img/backdoor-apps.png
rename to img/backdoor-apps.png
diff --git a/material/img/backdoor-av.png b/img/backdoor-av.png
similarity index 100%
rename from material/img/backdoor-av.png
rename to img/backdoor-av.png
diff --git a/material/img/backdoor-flashlight.png b/img/backdoor-flashlight.png
similarity index 100%
rename from material/img/backdoor-flashlight.png
rename to img/backdoor-flashlight.png
diff --git a/material/img/backdoor-ios.png b/img/backdoor-ios.png
similarity index 100%
rename from material/img/backdoor-ios.png
rename to img/backdoor-ios.png
diff --git a/material/img/backdoor-samsung.png b/img/backdoor-samsung.png
similarity index 100%
rename from material/img/backdoor-samsung.png
rename to img/backdoor-samsung.png
diff --git a/material/img/backdoor-samsung2.png b/img/backdoor-samsung2.png
similarity index 100%
rename from material/img/backdoor-samsung2.png
rename to img/backdoor-samsung2.png
diff --git a/material/img/backdoor-windows.png b/img/backdoor-windows.png
similarity index 100%
rename from material/img/backdoor-windows.png
rename to img/backdoor-windows.png
diff --git a/material/img/backdoor-windows2.png b/img/backdoor-windows2.png
similarity index 100%
rename from material/img/backdoor-windows2.png
rename to img/backdoor-windows2.png
diff --git a/material/img/backdoor_gb.png b/img/backdoor_gb.png
similarity index 100%
rename from material/img/backdoor_gb.png
rename to img/backdoor_gb.png
diff --git a/material/img/bitmessagelogo.png b/img/bitmessagelogo.png
similarity index 100%
rename from material/img/bitmessagelogo.png
rename to img/bitmessagelogo.png
diff --git a/material/img/bote.jpg b/img/bote.jpg
similarity index 100%
rename from material/img/bote.jpg
rename to img/bote.jpg
diff --git a/material/img/bridge1.png b/img/bridge1.png
similarity index 100%
rename from material/img/bridge1.png
rename to img/bridge1.png
diff --git a/material/img/bridge2.png b/img/bridge2.png
similarity index 100%
rename from material/img/bridge2.png
rename to img/bridge2.png
diff --git a/material/img/business_pigs.jpg b/img/business_pigs.jpg
similarity index 100%
rename from material/img/business_pigs.jpg
rename to img/business_pigs.jpg
diff --git a/material/img/by-nc-nd.png b/img/by-nc-nd.png
similarity index 100%
rename from material/img/by-nc-nd.png
rename to img/by-nc-nd.png
diff --git a/material/img/by-nc-sa.png b/img/by-nc-sa.png
similarity index 100%
rename from material/img/by-nc-sa.png
rename to img/by-nc-sa.png
diff --git a/material/img/by-sa.png b/img/by-sa.png
similarity index 100%
rename from material/img/by-sa.png
rename to img/by-sa.png
diff --git a/material/img/by.png b/img/by.png
similarity index 100%
rename from material/img/by.png
rename to img/by.png
diff --git a/material/img/c-s.png b/img/c-s.png
similarity index 100%
rename from material/img/c-s.png
rename to img/c-s.png
diff --git a/material/img/c3d2.pdf b/img/c3d2.pdf
similarity index 100%
rename from material/img/c3d2.pdf
rename to img/c3d2.pdf
diff --git a/material/img/c3d2.svg b/img/c3d2.svg
similarity index 100%
rename from material/img/c3d2.svg
rename to img/c3d2.svg
diff --git a/material/img/c3d2_logo.png b/img/c3d2_logo.png
similarity index 100%
rename from material/img/c3d2_logo.png
rename to img/c3d2_logo.png
diff --git a/material/img/certificate.png b/img/certificate.png
similarity index 100%
rename from material/img/certificate.png
rename to img/certificate.png
diff --git a/material/img/chaosknoten.png b/img/chaosknoten.png
similarity index 100%
rename from material/img/chaosknoten.png
rename to img/chaosknoten.png
diff --git a/material/img/chatsecure.png b/img/chatsecure.png
similarity index 100%
rename from material/img/chatsecure.png
rename to img/chatsecure.png
diff --git a/material/img/client-server-graph.png b/img/client-server-graph.png
similarity index 100%
rename from material/img/client-server-graph.png
rename to img/client-server-graph.png
diff --git a/material/img/cms.png b/img/cms.png
similarity index 100%
rename from material/img/cms.png
rename to img/cms.png
diff --git a/material/img/compilation-process.png b/img/compilation-process.png
similarity index 100%
rename from material/img/compilation-process.png
rename to img/compilation-process.png
diff --git a/material/img/conversations.png b/img/conversations.png
similarity index 100%
rename from material/img/conversations.png
rename to img/conversations.png
diff --git a/material/img/data_center.jpg b/img/data_center.jpg
similarity index 100%
rename from material/img/data_center.jpg
rename to img/data_center.jpg
diff --git a/material/img/daten.png b/img/daten.png
similarity index 100%
rename from material/img/daten.png
rename to img/daten.png
diff --git a/material/img/de_cix.jpg b/img/de_cix.jpg
similarity index 100%
rename from material/img/de_cix.jpg
rename to img/de_cix.jpg
diff --git a/material/img/digitale_selbstverteidigung.png b/img/digitale_selbstverteidigung.png
similarity index 100%
rename from material/img/digitale_selbstverteidigung.png
rename to img/digitale_selbstverteidigung.png
diff --git a/material/img/direkt.png b/img/direkt.png
similarity index 100%
rename from material/img/direkt.png
rename to img/direkt.png
diff --git a/material/img/disconnect.png b/img/disconnect.png
similarity index 100%
rename from material/img/disconnect.png
rename to img/disconnect.png
diff --git a/material/img/disconnectme.jpg b/img/disconnectme.jpg
similarity index 100%
rename from material/img/disconnectme.jpg
rename to img/disconnectme.jpg
diff --git a/material/img/duckduckgo.pdf b/img/duckduckgo.pdf
similarity index 100%
rename from material/img/duckduckgo.pdf
rename to img/duckduckgo.pdf
diff --git a/material/img/duckduckgo.svg b/img/duckduckgo.svg
similarity index 100%
rename from material/img/duckduckgo.svg
rename to img/duckduckgo.svg
diff --git a/material/img/emailselfdefense.png b/img/emailselfdefense.png
similarity index 100%
rename from material/img/emailselfdefense.png
rename to img/emailselfdefense.png
diff --git a/material/img/enc-e2e.png b/img/enc-e2e.png
similarity index 100%
rename from material/img/enc-e2e.png
rename to img/enc-e2e.png
diff --git a/material/img/enc-transport.png b/img/enc-transport.png
similarity index 100%
rename from material/img/enc-transport.png
rename to img/enc-transport.png
diff --git a/material/img/facebook_whatsapp.png b/img/facebook_whatsapp.png
similarity index 100%
rename from material/img/facebook_whatsapp.png
rename to img/facebook_whatsapp.png
diff --git a/material/img/fed-all.png b/img/fed-all.png
similarity index 100%
rename from material/img/fed-all.png
rename to img/fed-all.png
diff --git a/material/img/fed-bad-guy.png b/img/fed-bad-guy.png
similarity index 100%
rename from material/img/fed-bad-guy.png
rename to img/fed-bad-guy.png
diff --git a/material/img/fed-clients-comm.png b/img/fed-clients-comm.png
similarity index 100%
rename from material/img/fed-clients-comm.png
rename to img/fed-clients-comm.png
diff --git a/material/img/fed-clients.png b/img/fed-clients.png
similarity index 100%
rename from material/img/fed-clients.png
rename to img/fed-clients.png
diff --git a/material/img/fed-end-to-end.png b/img/fed-end-to-end.png
similarity index 100%
rename from material/img/fed-end-to-end.png
rename to img/fed-end-to-end.png
diff --git a/material/img/fed-none.png b/img/fed-none.png
similarity index 100%
rename from material/img/fed-none.png
rename to img/fed-none.png
diff --git a/material/img/fed-social.png b/img/fed-social.png
similarity index 100%
rename from material/img/fed-social.png
rename to img/fed-social.png
diff --git a/material/img/fed.png b/img/fed.png
similarity index 100%
rename from material/img/fed.png
rename to img/fed.png
diff --git a/material/img/ff_antitrack.png b/img/ff_antitrack.png
similarity index 100%
rename from material/img/ff_antitrack.png
rename to img/ff_antitrack.png
diff --git a/material/img/fingerabdruck.jpg b/img/fingerabdruck.jpg
similarity index 100%
rename from material/img/fingerabdruck.jpg
rename to img/fingerabdruck.jpg
diff --git a/material/img/firefox.png b/img/firefox.png
similarity index 100%
rename from material/img/firefox.png
rename to img/firefox.png
diff --git a/material/img/formatstring.png b/img/formatstring.png
similarity index 100%
rename from material/img/formatstring.png
rename to img/formatstring.png
diff --git a/material/img/gnome.png b/img/gnome.png
similarity index 100%
rename from material/img/gnome.png
rename to img/gnome.png
diff --git a/material/img/google-adid.png b/img/google-adid.png
similarity index 100%
rename from material/img/google-adid.png
rename to img/google-adid.png
diff --git a/material/img/google_heat_1.png b/img/google_heat_1.png
similarity index 100%
rename from material/img/google_heat_1.png
rename to img/google_heat_1.png
diff --git a/material/img/google_heat_2.png b/img/google_heat_2.png
similarity index 100%
rename from material/img/google_heat_2.png
rename to img/google_heat_2.png
diff --git a/material/img/gpg.mp4 b/img/gpg.mp4
similarity index 100%
rename from material/img/gpg.mp4
rename to img/gpg.mp4
diff --git a/material/img/gpgvideo.png b/img/gpgvideo.png
similarity index 100%
rename from material/img/gpgvideo.png
rename to img/gpgvideo.png
diff --git a/material/img/heise-merkel.png b/img/heise-merkel.png
similarity index 100%
rename from material/img/heise-merkel.png
rename to img/heise-merkel.png
diff --git a/material/img/heise_lavabit.png b/img/heise_lavabit.png
similarity index 100%
rename from material/img/heise_lavabit.png
rename to img/heise_lavabit.png
diff --git a/material/img/https-everywhere.png b/img/https-everywhere.png
similarity index 100%
rename from material/img/https-everywhere.png
rename to img/https-everywhere.png
diff --git a/material/img/internet_cable_map.png b/img/internet_cable_map.png
similarity index 100%
rename from material/img/internet_cable_map.png
rename to img/internet_cable_map.png
diff --git a/material/img/internet_dog.jpg b/img/internet_dog.jpg
similarity index 100%
rename from material/img/internet_dog.jpg
rename to img/internet_dog.jpg
diff --git a/material/img/internetmap-abhoeren-prism-ssl.pdf b/img/internetmap-abhoeren-prism-ssl.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-prism-ssl.pdf
rename to img/internetmap-abhoeren-prism-ssl.pdf
diff --git a/material/img/internetmap-abhoeren-prism-ssl.svg b/img/internetmap-abhoeren-prism-ssl.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-prism-ssl.svg
rename to img/internetmap-abhoeren-prism-ssl.svg
diff --git a/material/img/internetmap-abhoeren-prism.pdf b/img/internetmap-abhoeren-prism.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-prism.pdf
rename to img/internetmap-abhoeren-prism.pdf
diff --git a/material/img/internetmap-abhoeren-prism.svg b/img/internetmap-abhoeren-prism.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-prism.svg
rename to img/internetmap-abhoeren-prism.svg
diff --git a/material/img/internetmap-abhoeren-ssl.pdf b/img/internetmap-abhoeren-ssl.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-ssl.pdf
rename to img/internetmap-abhoeren-ssl.pdf
diff --git a/material/img/internetmap-abhoeren-ssl.svg b/img/internetmap-abhoeren-ssl.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-ssl.svg
rename to img/internetmap-abhoeren-ssl.svg
diff --git a/material/img/internetmap-abhoeren-tempora-prism.pdf b/img/internetmap-abhoeren-tempora-prism.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-tempora-prism.pdf
rename to img/internetmap-abhoeren-tempora-prism.pdf
diff --git a/material/img/internetmap-abhoeren-tempora-prism.svg b/img/internetmap-abhoeren-tempora-prism.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-tempora-prism.svg
rename to img/internetmap-abhoeren-tempora-prism.svg
diff --git a/material/img/internetmap-abhoeren-tempora.pdf b/img/internetmap-abhoeren-tempora.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-tempora.pdf
rename to img/internetmap-abhoeren-tempora.pdf
diff --git a/material/img/internetmap-abhoeren-tempora.svg b/img/internetmap-abhoeren-tempora.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-tempora.svg
rename to img/internetmap-abhoeren-tempora.svg
diff --git a/material/img/internetmap-abhoeren-tor.pdf b/img/internetmap-abhoeren-tor.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren-tor.pdf
rename to img/internetmap-abhoeren-tor.pdf
diff --git a/material/img/internetmap-abhoeren-tor.svg b/img/internetmap-abhoeren-tor.svg
similarity index 100%
rename from material/img/internetmap-abhoeren-tor.svg
rename to img/internetmap-abhoeren-tor.svg
diff --git a/material/img/internetmap-abhoeren.pdf b/img/internetmap-abhoeren.pdf
similarity index 100%
rename from material/img/internetmap-abhoeren.pdf
rename to img/internetmap-abhoeren.pdf
diff --git a/material/img/internetmap-abhoeren.svg b/img/internetmap-abhoeren.svg
similarity index 100%
rename from material/img/internetmap-abhoeren.svg
rename to img/internetmap-abhoeren.svg
diff --git a/material/img/jabber.png b/img/jabber.png
similarity index 100%
rename from material/img/jabber.png
rename to img/jabber.png
diff --git a/material/img/jim_verkaufen.png b/img/jim_verkaufen.png
similarity index 100%
rename from material/img/jim_verkaufen.png
rename to img/jim_verkaufen.png
diff --git a/material/img/krypto.pdf b/img/krypto.pdf
similarity index 100%
rename from material/img/krypto.pdf
rename to img/krypto.pdf
diff --git a/material/img/krypto.svg b/img/krypto.svg
similarity index 100%
rename from material/img/krypto.svg
rename to img/krypto.svg
diff --git a/material/img/krypto_asymmetric.pdf b/img/krypto_asymmetric.pdf
similarity index 100%
rename from material/img/krypto_asymmetric.pdf
rename to img/krypto_asymmetric.pdf
diff --git a/material/img/krypto_asymmetric.svg b/img/krypto_asymmetric.svg
similarity index 100%
rename from material/img/krypto_asymmetric.svg
rename to img/krypto_asymmetric.svg
diff --git a/material/img/krypto_symmetric.pdf b/img/krypto_symmetric.pdf
similarity index 100%
rename from material/img/krypto_symmetric.pdf
rename to img/krypto_symmetric.pdf
diff --git a/material/img/krypto_symmetric.svg b/img/krypto_symmetric.svg
similarity index 100%
rename from material/img/krypto_symmetric.svg
rename to img/krypto_symmetric.svg
diff --git a/material/img/libreoffice.jpg b/img/libreoffice.jpg
similarity index 100%
rename from material/img/libreoffice.jpg
rename to img/libreoffice.jpg
diff --git a/material/img/lightbeam.jpg b/img/lightbeam.jpg
similarity index 100%
rename from material/img/lightbeam.jpg
rename to img/lightbeam.jpg
diff --git a/material/img/lightbeam.png b/img/lightbeam.png
similarity index 100%
rename from material/img/lightbeam.png
rename to img/lightbeam.png
diff --git a/material/img/lightbeam_1.png b/img/lightbeam_1.png
similarity index 100%
rename from material/img/lightbeam_1.png
rename to img/lightbeam_1.png
diff --git a/material/img/lightbeam_2.png b/img/lightbeam_2.png
similarity index 100%
rename from material/img/lightbeam_2.png
rename to img/lightbeam_2.png
diff --git a/material/img/logo-fsf.pdf b/img/logo-fsf.pdf
similarity index 100%
rename from material/img/logo-fsf.pdf
rename to img/logo-fsf.pdf
diff --git a/material/img/mail.pdf b/img/mail.pdf
similarity index 100%
rename from material/img/mail.pdf
rename to img/mail.pdf
diff --git a/material/img/mail.svg b/img/mail.svg
similarity index 100%
rename from material/img/mail.svg
rename to img/mail.svg
diff --git a/material/img/maltespitz.png b/img/maltespitz.png
similarity index 100%
rename from material/img/maltespitz.png
rename to img/maltespitz.png
diff --git a/material/img/metadaten_studie.png b/img/metadaten_studie.png
similarity index 100%
rename from material/img/metadaten_studie.png
rename to img/metadaten_studie.png
diff --git a/material/img/networkgraph.png b/img/networkgraph.png
similarity index 100%
rename from material/img/networkgraph.png
rename to img/networkgraph.png
diff --git a/material/img/netzpolitik-verizon.png b/img/netzpolitik-verizon.png
similarity index 100%
rename from material/img/netzpolitik-verizon.png
rename to img/netzpolitik-verizon.png
diff --git a/material/img/openrouteservice.png b/img/openrouteservice.png
similarity index 100%
rename from material/img/openrouteservice.png
rename to img/openrouteservice.png
diff --git a/material/img/osm.png b/img/osm.png
similarity index 100%
rename from material/img/osm.png
rename to img/osm.png
diff --git a/material/img/owncloud-calendar.png b/img/owncloud-calendar.png
similarity index 100%
rename from material/img/owncloud-calendar.png
rename to img/owncloud-calendar.png
diff --git a/material/img/owncloud-contacts.png b/img/owncloud-contacts.png
similarity index 100%
rename from material/img/owncloud-contacts.png
rename to img/owncloud-contacts.png
diff --git a/material/img/owncloud-documents.png b/img/owncloud-documents.png
similarity index 100%
rename from material/img/owncloud-documents.png
rename to img/owncloud-documents.png
diff --git a/material/img/owncloud-screenshot.jpg b/img/owncloud-screenshot.jpg
similarity index 100%
rename from material/img/owncloud-screenshot.jpg
rename to img/owncloud-screenshot.jpg
diff --git a/material/img/owncloud.png b/img/owncloud.png
similarity index 100%
rename from material/img/owncloud.png
rename to img/owncloud.png
diff --git a/material/img/palava-tv.png b/img/palava-tv.png
similarity index 100%
rename from material/img/palava-tv.png
rename to img/palava-tv.png
diff --git a/material/img/palava.png b/img/palava.png
similarity index 100%
rename from material/img/palava.png
rename to img/palava.png
diff --git a/material/img/pentabug.jpg b/img/pentabug.jpg
similarity index 100%
rename from material/img/pentabug.jpg
rename to img/pentabug.jpg
diff --git a/material/img/permissions-android.png b/img/permissions-android.png
similarity index 100%
rename from material/img/permissions-android.png
rename to img/permissions-android.png
diff --git a/material/img/prism-break1.png b/img/prism-break1.png
similarity index 100%
rename from material/img/prism-break1.png
rename to img/prism-break1.png
diff --git a/material/img/prism-break2.png b/img/prism-break2.png
similarity index 100%
rename from material/img/prism-break2.png
rename to img/prism-break2.png
diff --git a/material/img/prism.jpg b/img/prism.jpg
similarity index 100%
rename from material/img/prism.jpg
rename to img/prism.jpg
diff --git a/material/img/prism_netzpolitik.png b/img/prism_netzpolitik.png
similarity index 100%
rename from material/img/prism_netzpolitik.png
rename to img/prism_netzpolitik.png
diff --git a/material/img/punch_1.png b/img/punch_1.png
similarity index 100%
rename from material/img/punch_1.png
rename to img/punch_1.png
diff --git a/material/img/punch_2.png b/img/punch_2.png
similarity index 100%
rename from material/img/punch_2.png
rename to img/punch_2.png
diff --git a/material/img/punch_3.png b/img/punch_3.png
similarity index 100%
rename from material/img/punch_3.png
rename to img/punch_3.png
diff --git a/material/img/sandstorm.png b/img/sandstorm.png
similarity index 100%
rename from material/img/sandstorm.png
rename to img/sandstorm.png
diff --git a/material/img/signal1.png b/img/signal1.png
similarity index 100%
rename from material/img/signal1.png
rename to img/signal1.png
diff --git a/material/img/signal2.png b/img/signal2.png
similarity index 100%
rename from material/img/signal2.png
rename to img/signal2.png
diff --git a/material/img/snowden.jpg b/img/snowden.jpg
similarity index 100%
rename from material/img/snowden.jpg
rename to img/snowden.jpg
diff --git a/material/img/socialgraph.jpg b/img/socialgraph.jpg
similarity index 100%
rename from material/img/socialgraph.jpg
rename to img/socialgraph.jpg
diff --git a/material/img/spiegel-tempora.png b/img/spiegel-tempora.png
similarity index 100%
rename from material/img/spiegel-tempora.png
rename to img/spiegel-tempora.png
diff --git a/material/img/ssl_badcert.png b/img/ssl_badcert.png
similarity index 100%
rename from material/img/ssl_badcert.png
rename to img/ssl_badcert.png
diff --git a/material/img/ssl_special.png b/img/ssl_special.png
similarity index 100%
rename from material/img/ssl_special.png
rename to img/ssl_special.png
diff --git a/material/img/ssl_unverified.png b/img/ssl_unverified.png
similarity index 100%
rename from material/img/ssl_unverified.png
rename to img/ssl_unverified.png
diff --git a/material/img/ssl_verified.png b/img/ssl_verified.png
similarity index 100%
rename from material/img/ssl_verified.png
rename to img/ssl_verified.png
diff --git a/material/img/stallman.jpg b/img/stallman.jpg
similarity index 100%
rename from material/img/stallman.jpg
rename to img/stallman.jpg
diff --git a/material/img/startp_logo.png b/img/startp_logo.png
similarity index 100%
rename from material/img/startp_logo.png
rename to img/startp_logo.png
diff --git a/material/img/stille_sms.png b/img/stille_sms.png
similarity index 100%
rename from material/img/stille_sms.png
rename to img/stille_sms.png
diff --git a/material/img/tagesschau-vds.png b/img/tagesschau-vds.png
similarity index 100%
rename from material/img/tagesschau-vds.png
rename to img/tagesschau-vds.png
diff --git a/material/img/telekom_mail.png b/img/telekom_mail.png
similarity index 100%
rename from material/img/telekom_mail.png
rename to img/telekom_mail.png
diff --git a/material/img/text_data_mining.jpg b/img/text_data_mining.jpg
similarity index 100%
rename from material/img/text_data_mining.jpg
rename to img/text_data_mining.jpg
diff --git a/material/img/textsecure1.png b/img/textsecure1.png
similarity index 100%
rename from material/img/textsecure1.png
rename to img/textsecure1.png
diff --git a/material/img/textsecure2.png b/img/textsecure2.png
similarity index 100%
rename from material/img/textsecure2.png
rename to img/textsecure2.png
diff --git a/material/img/thunderbird.png b/img/thunderbird.png
similarity index 100%
rename from material/img/thunderbird.png
rename to img/thunderbird.png
diff --git a/material/img/tls.pdf b/img/tls.pdf
similarity index 100%
rename from material/img/tls.pdf
rename to img/tls.pdf
diff --git a/material/img/tls.svg b/img/tls.svg
similarity index 100%
rename from material/img/tls.svg
rename to img/tls.svg
diff --git a/material/img/tor-banner.png b/img/tor-banner.png
similarity index 100%
rename from material/img/tor-banner.png
rename to img/tor-banner.png
diff --git a/material/img/tor-tuerkei.jpg b/img/tor-tuerkei.jpg
similarity index 100%
rename from material/img/tor-tuerkei.jpg
rename to img/tor-tuerkei.jpg
diff --git a/material/img/tor1.png b/img/tor1.png
similarity index 100%
rename from material/img/tor1.png
rename to img/tor1.png
diff --git a/material/img/tor2.png b/img/tor2.png
similarity index 100%
rename from material/img/tor2.png
rename to img/tor2.png
diff --git a/material/img/tor3.png b/img/tor3.png
similarity index 100%
rename from material/img/tor3.png
rename to img/tor3.png
diff --git a/material/img/torbrowser1.png b/img/torbrowser1.png
similarity index 100%
rename from material/img/torbrowser1.png
rename to img/torbrowser1.png
diff --git a/material/img/torbrowser2.png b/img/torbrowser2.png
similarity index 100%
rename from material/img/torbrowser2.png
rename to img/torbrowser2.png
diff --git a/material/img/torgermany.jpg b/img/torgermany.jpg
similarity index 100%
rename from material/img/torgermany.jpg
rename to img/torgermany.jpg
diff --git a/material/img/torrorist.png b/img/torrorist.png
similarity index 100%
rename from material/img/torrorist.png
rename to img/torrorist.png
diff --git a/material/img/torstinks.png b/img/torstinks.png
similarity index 100%
rename from material/img/torstinks.png
rename to img/torstinks.png
diff --git a/material/img/trojaner.png b/img/trojaner.png
similarity index 100%
rename from material/img/trojaner.png
rename to img/trojaner.png
diff --git a/material/img/vidalia.png b/img/vidalia.png
similarity index 100%
rename from material/img/vidalia.png
rename to img/vidalia.png
diff --git a/material/img/vlc.png b/img/vlc.png
similarity index 100%
rename from material/img/vlc.png
rename to img/vlc.png
diff --git a/material/img/weboftrust.png b/img/weboftrust.png
similarity index 100%
rename from material/img/weboftrust.png
rename to img/weboftrust.png
diff --git a/material/img/wekillpeople.jpg b/img/wekillpeople.jpg
similarity index 100%
rename from material/img/wekillpeople.jpg
rename to img/wekillpeople.jpg
diff --git a/material/img/weknowwhatyouredoing.png b/img/weknowwhatyouredoing.png
similarity index 100%
rename from material/img/weknowwhatyouredoing.png
rename to img/weknowwhatyouredoing.png
diff --git a/material/img/windows10.png b/img/windows10.png
similarity index 100%
rename from material/img/windows10.png
rename to img/windows10.png
diff --git a/material/img/xmpp1.png b/img/xmpp1.png
similarity index 100%
rename from material/img/xmpp1.png
rename to img/xmpp1.png
diff --git a/material/img/zensur-guardian.jpg b/img/zensur-guardian.jpg
similarity index 100%
rename from material/img/zensur-guardian.jpg
rename to img/zensur-guardian.jpg
diff --git a/material/img/zensur.png b/img/zensur.png
similarity index 100%
rename from material/img/zensur.png
rename to img/zensur.png
diff --git a/material/img/zertifikate.png b/img/zertifikate.png
similarity index 100%
rename from material/img/zertifikate.png
rename to img/zertifikate.png
diff --git a/material/lectures/16-06-22.tex b/lectures/16-06-22.tex
similarity index 100%
rename from material/lectures/16-06-22.tex
rename to lectures/16-06-22.tex