diff --git a/cryptoparty/begruessung/background-print.png b/lectures/cryptoparty/begruessung/background-print.png
similarity index 100%
rename from cryptoparty/begruessung/background-print.png
rename to lectures/cryptoparty/begruessung/background-print.png
diff --git a/cryptoparty/begruessung/background.png b/lectures/cryptoparty/begruessung/background.png
similarity index 100%
rename from cryptoparty/begruessung/background.png
rename to lectures/cryptoparty/begruessung/background.png
diff --git a/cryptoparty/begruessung/beamerfsmpi.cls b/lectures/cryptoparty/begruessung/beamerfsmpi.cls
similarity index 100%
rename from cryptoparty/begruessung/beamerfsmpi.cls
rename to lectures/cryptoparty/begruessung/beamerfsmpi.cls
diff --git a/cryptoparty/begruessung/beamerouterthemefsmpi.sty b/lectures/cryptoparty/begruessung/beamerouterthemefsmpi.sty
similarity index 100%
rename from cryptoparty/begruessung/beamerouterthemefsmpi.sty
rename to lectures/cryptoparty/begruessung/beamerouterthemefsmpi.sty
diff --git a/cryptoparty/begruessung/folien.pdf b/lectures/cryptoparty/begruessung/folien.pdf
similarity index 100%
rename from cryptoparty/begruessung/folien.pdf
rename to lectures/cryptoparty/begruessung/folien.pdf
diff --git a/cryptoparty/begruessung/folien.tex b/lectures/cryptoparty/begruessung/folien.tex
similarity index 100%
rename from cryptoparty/begruessung/folien.tex
rename to lectures/cryptoparty/begruessung/folien.tex
diff --git a/cryptoparty/danke/background-print.png b/lectures/cryptoparty/danke/background-print.png
similarity index 100%
rename from cryptoparty/danke/background-print.png
rename to lectures/cryptoparty/danke/background-print.png
diff --git a/cryptoparty/danke/background.png b/lectures/cryptoparty/danke/background.png
similarity index 100%
rename from cryptoparty/danke/background.png
rename to lectures/cryptoparty/danke/background.png
diff --git a/cryptoparty/danke/beamerfsmpi.cls b/lectures/cryptoparty/danke/beamerfsmpi.cls
similarity index 100%
rename from cryptoparty/danke/beamerfsmpi.cls
rename to lectures/cryptoparty/danke/beamerfsmpi.cls
diff --git a/cryptoparty/danke/beamerouterthemefsmpi.sty b/lectures/cryptoparty/danke/beamerouterthemefsmpi.sty
similarity index 100%
rename from cryptoparty/danke/beamerouterthemefsmpi.sty
rename to lectures/cryptoparty/danke/beamerouterthemefsmpi.sty
diff --git a/cryptoparty/danke/comsys.png b/lectures/cryptoparty/danke/comsys.png
similarity index 100%
rename from cryptoparty/danke/comsys.png
rename to lectures/cryptoparty/danke/comsys.png
diff --git a/cryptoparty/danke/folien.pdf b/lectures/cryptoparty/danke/folien.pdf
similarity index 100%
rename from cryptoparty/danke/folien.pdf
rename to lectures/cryptoparty/danke/folien.pdf
diff --git a/cryptoparty/danke/folien.tex b/lectures/cryptoparty/danke/folien.tex
similarity index 100%
rename from cryptoparty/danke/folien.tex
rename to lectures/cryptoparty/danke/folien.tex
diff --git a/cryptoparty/danke/rbi.png b/lectures/cryptoparty/danke/rbi.png
similarity index 100%
rename from cryptoparty/danke/rbi.png
rename to lectures/cryptoparty/danke/rbi.png
diff --git a/cryptoparty/danke/redteam.png b/lectures/cryptoparty/danke/redteam.png
similarity index 100%
rename from cryptoparty/danke/redteam.png
rename to lectures/cryptoparty/danke/redteam.png
diff --git a/cryptoparty/slides/00-Begruessung.pdf b/lectures/cryptoparty/slides/00-Begruessung.pdf
similarity index 100%
rename from cryptoparty/slides/00-Begruessung.pdf
rename to lectures/cryptoparty/slides/00-Begruessung.pdf
diff --git a/cryptoparty/slides/01-Bitcoins.pdf b/lectures/cryptoparty/slides/01-Bitcoins.pdf
similarity index 100%
rename from cryptoparty/slides/01-Bitcoins.pdf
rename to lectures/cryptoparty/slides/01-Bitcoins.pdf
diff --git a/cryptoparty/slides/02-Browser-Security.pdf b/lectures/cryptoparty/slides/02-Browser-Security.pdf
similarity index 100%
rename from cryptoparty/slides/02-Browser-Security.pdf
rename to lectures/cryptoparty/slides/02-Browser-Security.pdf
diff --git a/cryptoparty/slides/03-passwordmanager.pdf b/lectures/cryptoparty/slides/03-passwordmanager.pdf
similarity index 100%
rename from cryptoparty/slides/03-passwordmanager.pdf
rename to lectures/cryptoparty/slides/03-passwordmanager.pdf
diff --git a/cryptoparty/slides/04-Kryptographie_in_der_Praxis.pdf b/lectures/cryptoparty/slides/04-Kryptographie_in_der_Praxis.pdf
similarity index 100%
rename from cryptoparty/slides/04-Kryptographie_in_der_Praxis.pdf
rename to lectures/cryptoparty/slides/04-Kryptographie_in_der_Praxis.pdf
diff --git a/cryptoparty/slides/05-Public-Key-Intro.pdf b/lectures/cryptoparty/slides/05-Public-Key-Intro.pdf
similarity index 100%
rename from cryptoparty/slides/05-Public-Key-Intro.pdf
rename to lectures/cryptoparty/slides/05-Public-Key-Intro.pdf
diff --git a/cryptoparty/slides/06-gpg.pdf b/lectures/cryptoparty/slides/06-gpg.pdf
similarity index 100%
rename from cryptoparty/slides/06-gpg.pdf
rename to lectures/cryptoparty/slides/06-gpg.pdf
diff --git a/cryptoparty/slides/07-Cacert.pdf b/lectures/cryptoparty/slides/07-Cacert.pdf
similarity index 100%
rename from cryptoparty/slides/07-Cacert.pdf
rename to lectures/cryptoparty/slides/07-Cacert.pdf
diff --git a/cryptoparty/slides/08-steganographie.pdf b/lectures/cryptoparty/slides/08-steganographie.pdf
similarity index 100%
rename from cryptoparty/slides/08-steganographie.pdf
rename to lectures/cryptoparty/slides/08-steganographie.pdf
diff --git a/cryptoparty/slides/09-OTR.pdf b/lectures/cryptoparty/slides/09-OTR.pdf
similarity index 100%
rename from cryptoparty/slides/09-OTR.pdf
rename to lectures/cryptoparty/slides/09-OTR.pdf
diff --git a/cryptoparty/slides/10-se-linux.pdf b/lectures/cryptoparty/slides/10-se-linux.pdf
similarity index 100%
rename from cryptoparty/slides/10-se-linux.pdf
rename to lectures/cryptoparty/slides/10-se-linux.pdf
diff --git a/cryptoparty/slides/11-TrueCrypt and Friends.pdf b/lectures/cryptoparty/slides/11-TrueCrypt and Friends.pdf
similarity index 100%
rename from cryptoparty/slides/11-TrueCrypt and Friends.pdf
rename to lectures/cryptoparty/slides/11-TrueCrypt and Friends.pdf
diff --git a/cryptoparty/slides/12-luks.pdf b/lectures/cryptoparty/slides/12-luks.pdf
similarity index 100%
rename from cryptoparty/slides/12-luks.pdf
rename to lectures/cryptoparty/slides/12-luks.pdf
diff --git a/cryptoparty/slides/13-Unusability.pdf b/lectures/cryptoparty/slides/13-Unusability.pdf
similarity index 100%
rename from cryptoparty/slides/13-Unusability.pdf
rename to lectures/cryptoparty/slides/13-Unusability.pdf
diff --git a/cryptoparty/slides/99-danke.pdf b/lectures/cryptoparty/slides/99-danke.pdf
similarity index 100%
rename from cryptoparty/slides/99-danke.pdf
rename to lectures/cryptoparty/slides/99-danke.pdf
diff --git a/installparty/folien-buildhauen/beamerthemeOSAK.sty b/lectures/folien-buildhauen/beamerthemeOSAK.sty
similarity index 100%
rename from installparty/folien-buildhauen/beamerthemeOSAK.sty
rename to lectures/folien-buildhauen/beamerthemeOSAK.sty
diff --git a/installparty/folien-buildhauen/osak-logo.pdf b/lectures/folien-buildhauen/osak-logo.pdf
similarity index 100%
rename from installparty/folien-buildhauen/osak-logo.pdf
rename to lectures/folien-buildhauen/osak-logo.pdf
diff --git a/installparty/folien-buildhauen/slides.pdf b/lectures/folien-buildhauen/slides.pdf
similarity index 100%
rename from installparty/folien-buildhauen/slides.pdf
rename to lectures/folien-buildhauen/slides.pdf
diff --git a/installparty/folien-buildhauen/slides.tex b/lectures/folien-buildhauen/slides.tex
similarity index 100%
rename from installparty/folien-buildhauen/slides.tex
rename to lectures/folien-buildhauen/slides.tex
diff --git a/kiss/lectures/jabber/handout.pdf b/lectures/kiss/jabber/handout.pdf
similarity index 100%
rename from kiss/lectures/jabber/handout.pdf
rename to lectures/kiss/jabber/handout.pdf
diff --git a/kiss/lectures/jabber/jabber.pdf b/lectures/kiss/jabber/jabber.pdf
similarity index 100%
rename from kiss/lectures/jabber/jabber.pdf
rename to lectures/kiss/jabber/jabber.pdf
diff --git a/kiss/lectures/jabber/slides.pdf b/lectures/kiss/jabber/slides.pdf
similarity index 100%
rename from kiss/lectures/jabber/slides.pdf
rename to lectures/kiss/jabber/slides.pdf
diff --git a/kiss/lectures/.keep b/lectures/kiss/lectures/.keep
similarity index 100%
rename from kiss/lectures/.keep
rename to lectures/kiss/lectures/.keep
diff --git a/kiss/lectures/rahmenprogramm/handout.pdf b/lectures/kiss/rahmenprogramm/handout.pdf
similarity index 100%
rename from kiss/lectures/rahmenprogramm/handout.pdf
rename to lectures/kiss/rahmenprogramm/handout.pdf
diff --git a/kiss/lectures/rahmenprogramm/handout.tex b/lectures/kiss/rahmenprogramm/handout.tex
similarity index 100%
rename from kiss/lectures/rahmenprogramm/handout.tex
rename to lectures/kiss/rahmenprogramm/handout.tex
diff --git a/kiss/lectures/rahmenprogramm/osak-logo.pdf b/lectures/kiss/rahmenprogramm/osak-logo.pdf
similarity index 100%
rename from kiss/lectures/rahmenprogramm/osak-logo.pdf
rename to lectures/kiss/rahmenprogramm/osak-logo.pdf
diff --git a/kiss/lectures/rahmenprogramm/rahmenporgramm-ws14.pdf b/lectures/kiss/rahmenprogramm/rahmenporgramm-ws14.pdf
similarity index 100%
rename from kiss/lectures/rahmenprogramm/rahmenporgramm-ws14.pdf
rename to lectures/kiss/rahmenprogramm/rahmenporgramm-ws14.pdf
diff --git a/kiss/lectures/rahmenprogramm/rahmenporgramm-ws14.tex b/lectures/kiss/rahmenprogramm/rahmenporgramm-ws14.tex
similarity index 100%
rename from kiss/lectures/rahmenprogramm/rahmenporgramm-ws14.tex
rename to lectures/kiss/rahmenprogramm/rahmenporgramm-ws14.tex
diff --git a/kiss/lectures/thunderbird/.gitignore b/lectures/kiss/thunderbird/.gitignore
similarity index 100%
rename from kiss/lectures/thunderbird/.gitignore
rename to lectures/kiss/thunderbird/.gitignore
diff --git a/kiss/lectures/thunderbird/email_mit_thunderbird.pdf b/lectures/kiss/thunderbird/email_mit_thunderbird.pdf
similarity index 100%
rename from kiss/lectures/thunderbird/email_mit_thunderbird.pdf
rename to lectures/kiss/thunderbird/email_mit_thunderbird.pdf
diff --git a/kiss/lectures/thunderbird/email_mit_thunderbird.tex b/lectures/kiss/thunderbird/email_mit_thunderbird.tex
similarity index 100%
rename from kiss/lectures/thunderbird/email_mit_thunderbird.tex
rename to lectures/kiss/thunderbird/email_mit_thunderbird.tex
diff --git a/kiss/lectures/walter/folien-1.pdf b/lectures/kiss/walter/folien-1.pdf
similarity index 100%
rename from kiss/lectures/walter/folien-1.pdf
rename to lectures/kiss/walter/folien-1.pdf
diff --git a/cryptoparty/gpg/Orange_blue_digital_signature_de.pdf b/workshops/cryptoparty/gpg/Orange_blue_digital_signature_de.pdf
similarity index 100%
rename from cryptoparty/gpg/Orange_blue_digital_signature_de.pdf
rename to workshops/cryptoparty/gpg/Orange_blue_digital_signature_de.pdf
diff --git a/cryptoparty/gpg/Orange_blue_digital_signature_de.svg b/workshops/cryptoparty/gpg/Orange_blue_digital_signature_de.svg
similarity index 100%
rename from cryptoparty/gpg/Orange_blue_digital_signature_de.svg
rename to workshops/cryptoparty/gpg/Orange_blue_digital_signature_de.svg
diff --git a/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.pdf b/workshops/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.pdf
similarity index 100%
rename from cryptoparty/gpg/Orange_blue_public_key_cryptography_de.pdf
rename to workshops/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.pdf
diff --git a/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.svg b/workshops/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.svg
similarity index 100%
rename from cryptoparty/gpg/Orange_blue_public_key_cryptography_de.svg
rename to workshops/cryptoparty/gpg/Orange_blue_public_key_cryptography_de.svg
diff --git a/cryptoparty/gpg/Public_key_signing.pdf b/workshops/cryptoparty/gpg/Public_key_signing.pdf
similarity index 100%
rename from cryptoparty/gpg/Public_key_signing.pdf
rename to workshops/cryptoparty/gpg/Public_key_signing.pdf
diff --git a/cryptoparty/gpg/gpg.pdf b/workshops/cryptoparty/gpg/gpg.pdf
similarity index 100%
rename from cryptoparty/gpg/gpg.pdf
rename to workshops/cryptoparty/gpg/gpg.pdf
diff --git a/cryptoparty/gpg/gpg.tex b/workshops/cryptoparty/gpg/gpg.tex
similarity index 100%
rename from cryptoparty/gpg/gpg.tex
rename to workshops/cryptoparty/gpg/gpg.tex
diff --git a/cryptoparty/gpg/handout.pdf b/workshops/cryptoparty/gpg/handout.pdf
similarity index 100%
rename from cryptoparty/gpg/handout.pdf
rename to workshops/cryptoparty/gpg/handout.pdf
diff --git a/cryptoparty/gpg/handout.tex b/workshops/cryptoparty/gpg/handout.tex
similarity index 100%
rename from cryptoparty/gpg/handout.tex
rename to workshops/cryptoparty/gpg/handout.tex
diff --git a/cryptoparty/keepass/handout.pdf b/workshops/cryptoparty/keepass/handout.pdf
similarity index 100%
rename from cryptoparty/keepass/handout.pdf
rename to workshops/cryptoparty/keepass/handout.pdf
diff --git a/cryptoparty/otr/macros.tex b/workshops/cryptoparty/otr/macros.tex
similarity index 100%
rename from cryptoparty/otr/macros.tex
rename to workshops/cryptoparty/otr/macros.tex
diff --git a/cryptoparty/otr/main.pdf b/workshops/cryptoparty/otr/main.pdf
similarity index 100%
rename from cryptoparty/otr/main.pdf
rename to workshops/cryptoparty/otr/main.pdf
diff --git a/cryptoparty/otr/main.tex b/workshops/cryptoparty/otr/main.tex
similarity index 100%
rename from cryptoparty/otr/main.tex
rename to workshops/cryptoparty/otr/main.tex
diff --git a/cryptoparty/otr/preamble.tex b/workshops/cryptoparty/otr/preamble.tex
similarity index 100%
rename from cryptoparty/otr/preamble.tex
rename to workshops/cryptoparty/otr/preamble.tex
diff --git a/kiss/workshops/Sicheres_Browsen/Handout.tex b/workshops/kiss/Sicheres_Browsen/Handout.tex
similarity index 100%
rename from kiss/workshops/Sicheres_Browsen/Handout.tex
rename to workshops/kiss/Sicheres_Browsen/Handout.tex
diff --git a/kiss/workshops/beamer/handout.pdf b/workshops/kiss/beamer/handout.pdf
similarity index 100%
rename from kiss/workshops/beamer/handout.pdf
rename to workshops/kiss/beamer/handout.pdf
diff --git a/kiss/workshops/emacs/shortcard.pdf b/workshops/kiss/emacs/shortcard.pdf
similarity index 100%
rename from kiss/workshops/emacs/shortcard.pdf
rename to workshops/kiss/emacs/shortcard.pdf
diff --git a/kiss/workshops/emailvpn/handout_email_und_vpn.pdf b/workshops/kiss/emailvpn/handout_email_und_vpn.pdf
similarity index 100%
rename from kiss/workshops/emailvpn/handout_email_und_vpn.pdf
rename to workshops/kiss/emailvpn/handout_email_und_vpn.pdf
diff --git a/kiss/workshops/emailvpn/handout_email_und_vpn.tex b/workshops/kiss/emailvpn/handout_email_und_vpn.tex
similarity index 100%
rename from kiss/workshops/emailvpn/handout_email_und_vpn.tex
rename to workshops/kiss/emailvpn/handout_email_und_vpn.tex
diff --git a/kiss/workshops/emailvpn/handout_email_und_vpn_en.pdf b/workshops/kiss/emailvpn/handout_email_und_vpn_en.pdf
similarity index 100%
rename from kiss/workshops/emailvpn/handout_email_und_vpn_en.pdf
rename to workshops/kiss/emailvpn/handout_email_und_vpn_en.pdf
diff --git a/kiss/workshops/emailvpn/handout_email_und_vpn_en.tex b/workshops/kiss/emailvpn/handout_email_und_vpn_en.tex
similarity index 100%
rename from kiss/workshops/emailvpn/handout_email_und_vpn_en.tex
rename to workshops/kiss/emailvpn/handout_email_und_vpn_en.tex
diff --git a/kiss/workshops/freedom/freedomslides.org b/workshops/kiss/freedom/freedomslides.org
similarity index 100%
rename from kiss/workshops/freedom/freedomslides.org
rename to workshops/kiss/freedom/freedomslides.org
diff --git a/kiss/workshops/freedom/freedomslides.pdf b/workshops/kiss/freedom/freedomslides.pdf
similarity index 100%
rename from kiss/workshops/freedom/freedomslides.pdf
rename to workshops/kiss/freedom/freedomslides.pdf
diff --git a/kiss/workshops/freedom/freedomslides.tex b/workshops/kiss/freedom/freedomslides.tex
similarity index 100%
rename from kiss/workshops/freedom/freedomslides.tex
rename to workshops/kiss/freedom/freedomslides.tex
diff --git a/kiss/workshops/freedom/notes.org b/workshops/kiss/freedom/notes.org
similarity index 100%
rename from kiss/workshops/freedom/notes.org
rename to workshops/kiss/freedom/notes.org
diff --git a/kiss/workshops/gaming/.gitignore b/workshops/kiss/gaming/.gitignore
similarity index 100%
rename from kiss/workshops/gaming/.gitignore
rename to workshops/kiss/gaming/.gitignore
diff --git a/kiss/workshops/gaming/Handout.pdf b/workshops/kiss/gaming/Handout.pdf
similarity index 100%
rename from kiss/workshops/gaming/Handout.pdf
rename to workshops/kiss/gaming/Handout.pdf
diff --git a/kiss/workshops/gaming/Handout.tex b/workshops/kiss/gaming/Handout.tex
similarity index 100%
rename from kiss/workshops/gaming/Handout.tex
rename to workshops/kiss/gaming/Handout.tex
diff --git a/kiss/workshops/gaming/Spielen_unter_Linux.pdf b/workshops/kiss/gaming/Spielen_unter_Linux.pdf
similarity index 100%
rename from kiss/workshops/gaming/Spielen_unter_Linux.pdf
rename to workshops/kiss/gaming/Spielen_unter_Linux.pdf
diff --git a/kiss/workshops/gaming/Spielen_unter_Linux.tex b/workshops/kiss/gaming/Spielen_unter_Linux.tex
similarity index 100%
rename from kiss/workshops/gaming/Spielen_unter_Linux.tex
rename to workshops/kiss/gaming/Spielen_unter_Linux.tex
diff --git a/kiss/workshops/git-old/git.tex b/workshops/kiss/git-old/git.tex
similarity index 100%
rename from kiss/workshops/git-old/git.tex
rename to workshops/kiss/git-old/git.tex
diff --git a/kiss/workshops/git-old/github.png b/workshops/kiss/git-old/github.png
similarity index 100%
rename from kiss/workshops/git-old/github.png
rename to workshops/kiss/git-old/github.png
diff --git a/kiss/workshops/git/handout.pdf b/workshops/kiss/git/handout.pdf
similarity index 100%
rename from kiss/workshops/git/handout.pdf
rename to workshops/kiss/git/handout.pdf
diff --git a/kiss/workshops/git/handout.tex b/workshops/kiss/git/handout.tex
similarity index 100%
rename from kiss/workshops/git/handout.tex
rename to workshops/kiss/git/handout.tex
diff --git a/kiss/workshops/gnucash/gnucash Handout.pdf b/workshops/kiss/gnucash/gnucash Handout.pdf
similarity index 100%
rename from kiss/workshops/gnucash/gnucash Handout.pdf
rename to workshops/kiss/gnucash/gnucash Handout.pdf
diff --git a/kiss/workshops/gpg/handout.pdf b/workshops/kiss/gpg/handout.pdf
similarity index 100%
rename from kiss/workshops/gpg/handout.pdf
rename to workshops/kiss/gpg/handout.pdf
diff --git a/kiss/workshops/gpg/handout.tex b/workshops/kiss/gpg/handout.tex
similarity index 100%
rename from kiss/workshops/gpg/handout.tex
rename to workshops/kiss/gpg/handout.tex
diff --git a/kiss/workshops/latex/latex.pdf b/workshops/kiss/latex/latex.pdf
similarity index 100%
rename from kiss/workshops/latex/latex.pdf
rename to workshops/kiss/latex/latex.pdf
diff --git a/kiss/workshops/latex/latex.tex b/workshops/kiss/latex/latex.tex
similarity index 100%
rename from kiss/workshops/latex/latex.tex
rename to workshops/kiss/latex/latex.tex
diff --git a/kiss/workshops/linux-audio/audio-alsa_basic_structure.jpg b/workshops/kiss/linux-audio/audio-alsa_basic_structure.jpg
similarity index 100%
rename from kiss/workshops/linux-audio/audio-alsa_basic_structure.jpg
rename to workshops/kiss/linux-audio/audio-alsa_basic_structure.jpg
diff --git a/kiss/workshops/linux-audio/audio-alsamixer.png b/workshops/kiss/linux-audio/audio-alsamixer.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-alsamixer.png
rename to workshops/kiss/linux-audio/audio-alsamixer.png
diff --git a/kiss/workshops/linux-audio/audio-ardour2-workbench.png b/workshops/kiss/linux-audio/audio-ardour2-workbench.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-ardour2-workbench.png
rename to workshops/kiss/linux-audio/audio-ardour2-workbench.png
diff --git a/kiss/workshops/linux-audio/audio-audacity-record-edit-stereo.png b/workshops/kiss/linux-audio/audio-audacity-record-edit-stereo.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-audacity-record-edit-stereo.png
rename to workshops/kiss/linux-audio/audio-audacity-record-edit-stereo.png
diff --git a/kiss/workshops/linux-audio/audio-hydrogen-drummachine.png b/workshops/kiss/linux-audio/audio-hydrogen-drummachine.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-hydrogen-drummachine.png
rename to workshops/kiss/linux-audio/audio-hydrogen-drummachine.png
diff --git a/kiss/workshops/linux-audio/audio-linux-mess.png b/workshops/kiss/linux-audio/audio-linux-mess.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-linux-mess.png
rename to workshops/kiss/linux-audio/audio-linux-mess.png
diff --git a/kiss/workshops/linux-audio/audio-paprefs.png b/workshops/kiss/linux-audio/audio-paprefs.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-paprefs.png
rename to workshops/kiss/linux-audio/audio-paprefs.png
diff --git a/kiss/workshops/linux-audio/audio-patchage-less-messy.png b/workshops/kiss/linux-audio/audio-patchage-less-messy.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-patchage-less-messy.png
rename to workshops/kiss/linux-audio/audio-patchage-less-messy.png
diff --git a/kiss/workshops/linux-audio/audio-simplejack-default-settings.png b/workshops/kiss/linux-audio/audio-simplejack-default-settings.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-simplejack-default-settings.png
rename to workshops/kiss/linux-audio/audio-simplejack-default-settings.png
diff --git a/kiss/workshops/linux-audio/audio-vulkan-layers.png b/workshops/kiss/linux-audio/audio-vulkan-layers.png
similarity index 100%
rename from kiss/workshops/linux-audio/audio-vulkan-layers.png
rename to workshops/kiss/linux-audio/audio-vulkan-layers.png
diff --git a/kiss/workshops/net-datacopy/Net-Datacopy.pdf b/workshops/kiss/net-datacopy/Net-Datacopy.pdf
similarity index 100%
rename from kiss/workshops/net-datacopy/Net-Datacopy.pdf
rename to workshops/kiss/net-datacopy/Net-Datacopy.pdf
diff --git a/kiss/workshops/net-datacopy/Net-Datacopy.tex b/workshops/kiss/net-datacopy/Net-Datacopy.tex
similarity index 100%
rename from kiss/workshops/net-datacopy/Net-Datacopy.tex
rename to workshops/kiss/net-datacopy/Net-Datacopy.tex
diff --git a/kiss/workshops/python/handout.pdf b/workshops/kiss/python/handout.pdf
similarity index 100%
rename from kiss/workshops/python/handout.pdf
rename to workshops/kiss/python/handout.pdf
diff --git a/kiss/workshops/python/handout.tex b/workshops/kiss/python/handout.tex
similarity index 100%
rename from kiss/workshops/python/handout.tex
rename to workshops/kiss/python/handout.tex
diff --git a/kiss/workshops/sage/cantor.png b/workshops/kiss/sage/cantor.png
similarity index 100%
rename from kiss/workshops/sage/cantor.png
rename to workshops/kiss/sage/cantor.png
diff --git a/kiss/workshops/sage/sage.pdf b/workshops/kiss/sage/sage.pdf
similarity index 100%
rename from kiss/workshops/sage/sage.pdf
rename to workshops/kiss/sage/sage.pdf
diff --git a/kiss/workshops/sage/sage.tex b/workshops/kiss/sage/sage.tex
similarity index 100%
rename from kiss/workshops/sage/sage.tex
rename to workshops/kiss/sage/sage.tex
diff --git a/kiss/workshops/shell/Shell_Safari_Daten.zip b/workshops/kiss/shell/Shell_Safari_Daten.zip
similarity index 100%
rename from kiss/workshops/shell/Shell_Safari_Daten.zip
rename to workshops/kiss/shell/Shell_Safari_Daten.zip
diff --git a/kiss/workshops/shell/shell_safari.pdf b/workshops/kiss/shell/shell_safari.pdf
similarity index 100%
rename from kiss/workshops/shell/shell_safari.pdf
rename to workshops/kiss/shell/shell_safari.pdf
diff --git a/kiss/workshops/shell/shell_safari_aufgaben.pdf b/workshops/kiss/shell/shell_safari_aufgaben.pdf
similarity index 100%
rename from kiss/workshops/shell/shell_safari_aufgaben.pdf
rename to workshops/kiss/shell/shell_safari_aufgaben.pdf
diff --git a/kiss/workshops/ssh/Handout-SSH.pdf b/workshops/kiss/ssh/Handout-SSH.pdf
similarity index 100%
rename from kiss/workshops/ssh/Handout-SSH.pdf
rename to workshops/kiss/ssh/Handout-SSH.pdf
diff --git a/kiss/workshops/veracrypt/handout/Handout.pdf b/workshops/kiss/veracrypt/handout/Handout.pdf
similarity index 100%
rename from kiss/workshops/veracrypt/handout/Handout.pdf
rename to workshops/kiss/veracrypt/handout/Handout.pdf
diff --git a/kiss/workshops/veracrypt/handout/Handout.tex b/workshops/kiss/veracrypt/handout/Handout.tex
similarity index 100%
rename from kiss/workshops/veracrypt/handout/Handout.tex
rename to workshops/kiss/veracrypt/handout/Handout.tex
diff --git a/kiss/workshops/veracrypt/screenshots/create-1.png b/workshops/kiss/veracrypt/screenshots/create-1.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-1.png
rename to workshops/kiss/veracrypt/screenshots/create-1.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-2.png b/workshops/kiss/veracrypt/screenshots/create-2.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-2.png
rename to workshops/kiss/veracrypt/screenshots/create-2.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-3.png b/workshops/kiss/veracrypt/screenshots/create-3.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-3.png
rename to workshops/kiss/veracrypt/screenshots/create-3.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-4.png b/workshops/kiss/veracrypt/screenshots/create-4.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-4.png
rename to workshops/kiss/veracrypt/screenshots/create-4.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-5.png b/workshops/kiss/veracrypt/screenshots/create-5.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-5.png
rename to workshops/kiss/veracrypt/screenshots/create-5.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-6.png b/workshops/kiss/veracrypt/screenshots/create-6.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-6.png
rename to workshops/kiss/veracrypt/screenshots/create-6.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-7.png b/workshops/kiss/veracrypt/screenshots/create-7.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-7.png
rename to workshops/kiss/veracrypt/screenshots/create-7.png
diff --git a/kiss/workshops/veracrypt/screenshots/create-8.png b/workshops/kiss/veracrypt/screenshots/create-8.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/create-8.png
rename to workshops/kiss/veracrypt/screenshots/create-8.png
diff --git a/kiss/workshops/veracrypt/screenshots/keyfile.png b/workshops/kiss/veracrypt/screenshots/keyfile.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/keyfile.png
rename to workshops/kiss/veracrypt/screenshots/keyfile.png
diff --git a/kiss/workshops/veracrypt/screenshots/mainscreen.png b/workshops/kiss/veracrypt/screenshots/mainscreen.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/mainscreen.png
rename to workshops/kiss/veracrypt/screenshots/mainscreen.png
diff --git a/kiss/workshops/veracrypt/screenshots/mount.png b/workshops/kiss/veracrypt/screenshots/mount.png
similarity index 100%
rename from kiss/workshops/veracrypt/screenshots/mount.png
rename to workshops/kiss/veracrypt/screenshots/mount.png
diff --git a/kiss/workshops/vim/vimqrc-ge.pdf b/workshops/kiss/vim/vimqrc-ge.pdf
similarity index 100%
rename from kiss/workshops/vim/vimqrc-ge.pdf
rename to workshops/kiss/vim/vimqrc-ge.pdf