diff --git a/cms.cls b/cms.cls
new file mode 100644
index 0000000..b0ea4f0
--- /dev/null
+++ b/cms.cls
@@ -0,0 +1,46 @@
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesClass{cms}[2018/08/07 v1.00 Documentclass for CmS Presentations]
+
+\RequirePackage{etoolbox}
+
+\newbool{notes}
+\boolfalse{notes}
+\DeclareOption{notes}{\booltrue{notes}}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{beamer}}
+
+\ProcessOptions\relax
+
+\LoadClass[12pt,xcolor={svgnames,table}]{beamer}
+
+\RequirePackage{graphicx}
+\RequirePackage[ngerman]{babel}
+\RequirePackage[T1]{fontenc}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{tikz}
+\RequirePackage{pgfpages}
+\RequirePackage{csquotes}
+\RequirePackage{comment}
+\RequirePackage{ifthen}
+\RequirePackage{textcomp}
+\RequirePackage{hyperref}
+\RequirePackage{media9}
+
+\usetheme{Darmstadt}
+\setbeamertemplate{footline}[frame number]
+
+\pgfdeclareimage[height=.6cm]{c3d2logo}{./img/c3d2.pdf}
+
+\pgfdeclarelayer{foreground}
+\pgfsetlayers{main,foreground}
+\logo{\pgfputat{\pgfxy(-1,0)}{\pgfbox[center,base]{\pgfuseimage{c3d2logo}}}}
+
+\ifbool{notes}{
+  \setbeameroption{show notes on second screen = right}}{}
+
+\newcommand{\license}[2][]{\\#2\ifthenelse{\equal{#1}{}}{}{\\\scriptsize\url{#1}}}
+\newcommand{\cc}[1]{\includegraphics[height=4mm]{img/#1.png}\hspace{1mm}}
+
+\newcommand{\includedeck}[1]{\include{content/#1}}
+
+\AfterBeginDocument{\maketitle}
diff --git a/presentations/medinetzkongress.tex b/presentations/medinetzkongress.tex
new file mode 100644
index 0000000..6c56657
--- /dev/null
+++ b/presentations/medinetzkongress.tex
@@ -0,0 +1,43 @@
+\documentclass{cms}
+\title{Einführung in sichere Kommunikation}
+\author{Marius Melzer und Reiner Lübeck}
+\date{20.05.2017}
+
+\begin{document}
+
+\section{Einleitung}
+
+\includedeck{ccc/ccc_bundesweit}
+\includedeck{ccc/ccc_lokal}
+
+\section{Internet}
+
+\includedeck{internet/kommunikationsmodelle}
+\includedeck{internet/server_kabel_router}
+
+\section{Verschlüsselung}
+
+\includedeck{verschluesselung/tls}
+\includedeck{verschluesselung/https_everywhere}
+\includedeck{verschluesselung/e2e}
+\includedeck{verschluesselung/messenger_vergleich}
+
+\section{Metadaten}
+
+\includedeck{metadaten/location_heatmap}
+\includedeck{metadaten/zeitstempel}
+\includedeck{metadaten/contacts}
+
+\section{Dezentralisierung}
+
+\includedeck{metadaten/nextcloud}
+
+\section{Verhalten}
+
+\includedeck{verhalten/passwoerter}
+
+\section{Fazit}
+
+\includedeck{fazit/medinetzkongress}
+
+\end{document}
diff --git a/presentations/medinetzkongress.yaml b/presentations/medinetzkongress.yaml
deleted file mode 100644
index 0cffcd4..0000000
--- a/presentations/medinetzkongress.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-Einleitung:
-  - ccc/ccc_bundesweit.tex
-  - ccc/ccc_lokal.tex
-
-Internet:
-  - internet/kommunikationsmodelle.tex
-  - internet/server_kabel_router.tex
-
-Verschlüsselung:
-  - verschluesselung/tls.tex
-  - verschluesselung/https_everywhere.tex
-  - verschluesselung/e2e.tex
-  - verschluesselung/messenger_vergleich.tex
-
-Metadaten:
-  - metadaten/location_heatmap.tex
-  - metadaten/zeitstempel.tex
-  - metadaten/contacts.tex
-
-Dezentralisierung:
-  - metadaten/nextcloud.tex
-
-Verhalten:
-  - verhalten/passwoerter.tex
-
-Fazit:
-  - fazit/medinetzkongress.tex