diff --git a/documentation/thesis/00_abstract.tex b/documentation/thesis/content/00_abstract.tex
similarity index 100%
rename from documentation/thesis/00_abstract.tex
rename to documentation/thesis/content/00_abstract.tex
diff --git a/documentation/thesis/content/01_introduction.tex b/documentation/thesis/content/01_introduction.tex
new file mode 100644
index 0000000..a81b272
--- /dev/null
+++ b/documentation/thesis/content/01_introduction.tex
@@ -0,0 +1,2 @@
+\chapter{Introduction}
+
diff --git a/documentation/thesis/content/02_preliminaries.tex b/documentation/thesis/content/02_preliminaries.tex
new file mode 100644
index 0000000..ffb7d67
--- /dev/null
+++ b/documentation/thesis/content/02_preliminaries.tex
@@ -0,0 +1 @@
+\chapter{Preliminaries}
diff --git a/documentation/thesis/content/03_use_cases_personas.tex b/documentation/thesis/content/03_use_cases_personas.tex
new file mode 100644
index 0000000..4636edf
--- /dev/null
+++ b/documentation/thesis/content/03_use_cases_personas.tex
@@ -0,0 +1 @@
+\chapter{Use Cases / Personas}
diff --git a/documentation/thesis/content/04_requirements.tex b/documentation/thesis/content/04_requirements.tex
new file mode 100644
index 0000000..9ac6061
--- /dev/null
+++ b/documentation/thesis/content/04_requirements.tex
@@ -0,0 +1 @@
+\chapter{Requirements}
diff --git a/documentation/thesis/content/05_solution.tex b/documentation/thesis/content/05_solution.tex
new file mode 100644
index 0000000..f3a07f1
--- /dev/null
+++ b/documentation/thesis/content/05_solution.tex
@@ -0,0 +1 @@
+\chapter{Solution}
diff --git a/documentation/thesis/content/06_testing.tex b/documentation/thesis/content/06_testing.tex
new file mode 100644
index 0000000..d8d07d5
--- /dev/null
+++ b/documentation/thesis/content/06_testing.tex
@@ -0,0 +1 @@
+\chapter{Testing}
diff --git a/documentation/thesis/content/07_benchmarking.tex b/documentation/thesis/content/07_benchmarking.tex
new file mode 100644
index 0000000..afd3a86
--- /dev/null
+++ b/documentation/thesis/content/07_benchmarking.tex
@@ -0,0 +1 @@
+\chapter{Benchmarking}
diff --git a/documentation/thesis/content/08_materials_methods.tex b/documentation/thesis/content/08_materials_methods.tex
new file mode 100644
index 0000000..f8c8690
--- /dev/null
+++ b/documentation/thesis/content/08_materials_methods.tex
@@ -0,0 +1 @@
+\chapter{Materials \& Methods}
diff --git a/documentation/thesis/content/09_future_work.tex b/documentation/thesis/content/09_future_work.tex
new file mode 100644
index 0000000..a6cd135
--- /dev/null
+++ b/documentation/thesis/content/09_future_work.tex
@@ -0,0 +1 @@
+\chapter{Future Work}
diff --git a/documentation/thesis/content/10_project_management.tex b/documentation/thesis/content/10_project_management.tex
new file mode 100644
index 0000000..e025ff5
--- /dev/null
+++ b/documentation/thesis/content/10_project_management.tex
@@ -0,0 +1 @@
+\chapter{Project Management}
diff --git a/documentation/thesis/thesis.tex b/documentation/thesis/thesis.tex
index 5faee94..556cd44 100644
--- a/documentation/thesis/thesis.tex
+++ b/documentation/thesis/thesis.tex
@@ -17,29 +17,25 @@
 
 % https://tex.stackexchange.com/a/24827
 \makeatletter
-\def\input@path{{documentation/thesis/}}
+\def\input@path{{documentation/thesis/content}}
 \makeatother
 
 \begin{document}
 
 \frontmatter
 
-\title{Bachelor's Thesis}
-\subtitle{Thesis subject}
+\title{Inductive Short-Range Communication Channel}
 \author{Severin Kaderli}
 \institution{Bern University of Applied Sciences}
 \department{Engineering and Computer Science }
 \version{0.0.1}
-\titlegraphic{\includegraphics[width=\width]{example-image}}
 \advisor{Dr. Reto König}
-\expert{Some expert}
+\expert{Thomas Jäggi}
 \degreeprogram{Bachelor of Science in Computer Science} 
-\titlegraphic{}
+
 
 %----------------  BFH tile page   -----------------------------------------
 \maketitle
-
-
 \input{00_abstract.tex}
 
 
@@ -49,7 +45,17 @@
 %------------ START MAIN PART ----------------
 \mainmatter
 
-\chapter{First chapter of the main part}
+\input{01_introduction.tex}
+\input{02_preliminaries.tex}
+\input{03_use_cases_personas.tex}
+\input{04_requirements.tex}
+\input{05_solution.tex}
+\input{06_testing.tex}
+\input{07_benchmarking.tex}
+\input{08_materials_methods.tex}
+\input{09_future_work.tex}
+\input{10_project_management.tex}
+
 \appendix
 \chapter{First appendix Chapter}  
 \end{document}