diff --git a/templates/cel-klausur.cls b/cel-thesis/cel-klausur.cls
similarity index 100%
rename from templates/cel-klausur.cls
rename to cel-thesis/cel-klausur.cls
diff --git a/templates/cel-thesis.cls b/cel-thesis/cel-thesis.cls
similarity index 94%
rename from templates/cel-thesis.cls
rename to cel-thesis/cel-thesis.cls
index 75502db..b64daaa 100644
--- a/templates/cel-thesis.cls
+++ b/cel-thesis/cel-thesis.cls
@@ -3,7 +3,7 @@
 % texlive-science
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{templates/cel-thesis}
+\ProvidesClass{cel-thesis/cel-thesis}
 \LoadClass[11pt,	% 11pt
 	    BCOR8mm, 		% Bindekorrektur
 	    DIV12,		% Satzspiegel
@@ -40,6 +40,9 @@
 \thesisSignatureDate{dd.mm.yyyy}
 \thesisLanguage{english}
 
+\def\dictThesisLanguageGerman{ngerman}
+\def\dictThesisLanguageEnglish{english}
+
 % Gerneral %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage[T1]{fontenc}  % encoding for target files.
 \usepackage[utf8]{inputenc} % UTF-8 encoding for source files
@@ -154,7 +157,7 @@
 % Titel
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newcommand{\header}{%
-    \includegraphics[width=40mm,valign=c]{templates/logos/kitlogo_de_rgb}%
+    \includegraphics[width=40mm,valign=c]{cel-thesis/logos/kitlogo_de_rgb}%
     \hfill%
     \begin{minipage}{8.26cm}\centering%
         \textbf{Karlsruhe Institute of Technology}\\
@@ -162,7 +165,7 @@
         \theThesisAdvisor%
     \end{minipage}%
     \hfill%
-    \includegraphics[width=25mm,valign=c]{templates/logos/cel_logo}%
+    \includegraphics[width=25mm,valign=c]{cel-thesis/logos/cel_logo}%
 }
 \newcommand{\ssection}[1]{\vspace*{0.8em}{\textbf{#1}}\\}
 
@@ -170,7 +173,7 @@
 \def\maketitle{
     \hypersetup{
         pdfauthor = \theThesisAuthor,
-        pdftitle = {\theThesisType{ }\theThesisTitle{ }\theThesisEndDate},
+        pdftitle = {\theThesisType{ }\theThesisTitle{ } \theThesisAuthor},
         pdfsubject = {Institut für Nachrichtentechnik (CEL)},
         pdfcreator = {PDFLaTeX with hyperref package},
         pdfproducer = {PDFLaTeX}
@@ -184,16 +187,23 @@
         {\large \theThesisType} \\[2.5cm]
         {\textbf{\theThesisAuthor}}\\[2.5cm]
         \begin{tabular}{lll}
+        \ifx\theThesisLanguage\dictThesisLanguageEnglish  % default is german. But one may use english.
+	  Advisor 	& : & \theThesisAdvisor \\
+	  Supervisor 	& : & \theThesisSupervisor\\[2cm]
+	  Start date 	& : & \theThesisStartDate \\
+	  End date  	& : & \theThesisEndDate \\
+	\else
 	  Hauptreferent & : & \theThesisAdvisor \\
 	  Betreuer      & : & \theThesisSupervisor\\[2cm]
 	  Beginn        & : & \theThesisStartDate \\
 	  Abgabe        & : & \theThesisEndDate \\
+	\fi
 	\end{tabular}
         
     \end{center}
     \hspace*{\fill}
     \newpage
-    \include{templates/eidesstattliche_erklaerung}
+    \include{cel-thesis/eidesstattliche_erklaerung}
 }
 
 
diff --git a/templates/eidesstattliche_erklaerung.tex b/cel-thesis/eidesstattliche_erklaerung.tex
similarity index 100%
rename from templates/eidesstattliche_erklaerung.tex
rename to cel-thesis/eidesstattliche_erklaerung.tex
diff --git a/templates/logos/cel_logo.pdf b/cel-thesis/logos/cel_logo.pdf
similarity index 100%
rename from templates/logos/cel_logo.pdf
rename to cel-thesis/logos/cel_logo.pdf
diff --git a/templates/logos/kitlogo_de_rgb.pdf b/cel-thesis/logos/kitlogo_de_rgb.pdf
similarity index 100%
rename from templates/logos/kitlogo_de_rgb.pdf
rename to cel-thesis/logos/kitlogo_de_rgb.pdf
diff --git a/templates/nt1-klausur.cls b/cel-thesis/nt1-klausur.cls
similarity index 100%
rename from templates/nt1-klausur.cls
rename to cel-thesis/nt1-klausur.cls
diff --git a/templates/nt2-klausur.cls b/cel-thesis/nt2-klausur.cls
similarity index 100%
rename from templates/nt2-klausur.cls
rename to cel-thesis/nt2-klausur.cls
diff --git a/templates/title.exam.tex b/cel-thesis/title.exam.tex
similarity index 100%
rename from templates/title.exam.tex
rename to cel-thesis/title.exam.tex
diff --git a/templates/title.review.tex b/cel-thesis/title.review.tex
similarity index 100%
rename from templates/title.review.tex
rename to cel-thesis/title.review.tex
diff --git a/templates/wt-klausur.cls b/cel-thesis/wt-klausur.cls
similarity index 100%
rename from templates/wt-klausur.cls
rename to cel-thesis/wt-klausur.cls
diff --git a/thesis-master.pdf b/thesis-master.pdf
index cd9e618..1891727 100644
Binary files a/thesis-master.pdf and b/thesis-master.pdf differ
diff --git a/thesis-master.tex b/thesis-master.tex
index 490f8d9..c7d6e07 100644
--- a/thesis-master.tex
+++ b/thesis-master.tex
@@ -1,5 +1,5 @@
 % Document class provides standardized title page + needed extras.
-\documentclass{templates/cel-thesis}
+\documentclass{cel-thesis/cel-thesis}
 \thesisTitle{This is the TITLE}
 \thesisType{This is a Type (masterthesis?)}
 \thesisAuthor{Foo B. Ar}