diff --git a/.gitignore b/.gitignore
index fdd247b..750dcd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -314,4 +314,7 @@ TSWLatexianTemp*
 # End of https://www.toptal.com/developers/gitignore/api/latex
 
 # ignore generated pdf file
-main.pdf
\ No newline at end of file
+main.pdf
+
+tmp
+build
\ No newline at end of file
diff --git a/.latexmkrc b/.latexmkrc
index 4310bac..0af5cad 100644
--- a/.latexmkrc
+++ b/.latexmkrc
@@ -1,6 +1,13 @@
 # make file for latex
 @default_files = ('main.tex');
 
+# Move all axuiliary files to a separate directory, so they do not clutter up the project directory
+$emulate_aux = 1;
+$aux_dir = "tmp";
+
+# Move the compiled files (and synctex) to a separate directory
+$out_dir = 'build';
+
 $pdflatex = 'pdflatex %O -interaction=nonstopmode -shell-escape %S';
 
 # Specify the bibliography
@@ -10,11 +17,16 @@ $makeglossaries = 'makeglossaries %O %B';
 # Continuous preview mode
 $continuous_mode = 1;
 
-# Output to PDF
+# Set the program used to generate the PDF
+# 1: pdflatex
+# 2: postscript conversion, don't use this
+# 3: dvi conversion, don't use this
+# 4: lualatex
+# 5: xelatex
 $pdf_mode = 1;
 
 # Keep auxiliary files
-$clean_ext = "";
+$clean_ext = " ";
 
 add_cus_dep( 'acn', 'acr', 0, 'makeglossaries' );
 add_cus_dep( 'glo', 'gls', 0, 'makeglossaries' );
diff --git a/main.tex b/main.tex
index a3ac909..499d4b5 100644
--- a/main.tex
+++ b/main.tex
@@ -2,29 +2,29 @@
 
 % =====================================================================
 % latex packages to use
-\usepackage{graphicx}       % Required for inserting images
-\usepackage{longtable}      % Tables that can overflow pages
-\usepackage{setspace}       % for more spacing control
-\usepackage{geometry}       % for margin control
-\usepackage{tabularx}       % extension of tabular environment that allows dynamic widths
-\usepackage{hyperref}       % for referecing stuff
-\usepackage{fancyhdr}       % fancy headers
-\usepackage{import}         % advanced document import
-\usepackage{pdfpages}       % include multipage pdf documents
-\usepackage{tikz}           % graphics, diagrams, logic
-\usepackage{imakeidx}       % inhaltsverzeichnis
-\usepackage{nomencl}        % nomenclature
-\usepackage{acro}           % acronyms
-\usepackage[ngerman]{babel} % german language support
-\usepackage[labelfont=bf]{caption} % make caption title fat
-\usepackage{wrapfig}        % for figures wrapping text wraps around
-\usepackage{minted}         % highlighted code blocks
+\usepackage{graphicx}               % Required for inserting images
+\usepackage{longtable}              % Tables that can overflow pages
+\usepackage{setspace}               % for more spacing control
+\usepackage{geometry}               % for margin control
+\usepackage{tabularx}               % extension of tabular environment that allows dynamic widths
+\usepackage{hyperref}               % for referecing stuff
+\usepackage{fancyhdr}               % fancy headers
+\usepackage{import}                 % advanced document import
+\usepackage{pdfpages}               % include multipage pdf documents
+\usepackage{tikz}                   % graphics, diagrams, logic
+\usepackage{imakeidx}               % inhaltsverzeichnis
+\usepackage{nomencl}                % nomenclature
+\usepackage{acro}                   % acronyms
+\usepackage[ngerman]{babel}         % german language support
+\usepackage[labelfont=bf]{caption}  % make caption title fat
+\usepackage{wrapfig}                % for figures wrapping text wraps around
+\usepackage[cache=false]{minted}    % highlighted code blocks
 \usepackage[toc,style=altlist]{glossaries}
-\usepackage{tocloft}        % control over the typography of the Table of Contents, etc.
-\usepackage{listings}       % code listings
-\usepackage{color}          % more colors
-\usepackage{tikz}           % painting
-\usepackage{tikz-imagelabels} % overlay labels for images 
+\usepackage{tocloft}                % control over the typography of the Table of Contents, etc.
+\usepackage{listings}               % code listings
+\usepackage{color}                  % more colors
+\usepackage{tikz}                   % painting
+\usepackage{tikz-imagelabels}       % overlay labels for images 
 
 \makeindex
 \makenomenclature
@@ -41,9 +41,9 @@
 
     % =====================================================================
     % include configuration files
-    \include{config/author}  % meta information about author 
-    \include{config/pages}   % set page configuration
-    \include{config/minted}  % set minted configuration
+    \input{config/author}  % meta information about author 
+    \input{config/pages}   % set page configuration
+    \input{config/minted}  % set minted configuration
     
     \input{extra/utils}  % some utility stuff
     
@@ -52,13 +52,13 @@
     \pagenumbering{Roman}
     
     % include documents in the directory pages/
-    \include{pages/page-01-title}
-    \include{pages/page-02-indipendence-declaration}
-    \include{pages/page-03-lock-notice}
-    \include{pages/page-04-abstract}
-    \include{pages/page-05-summary}
-    \include{pages/page-06-preface}
-    \include{pages/page-07-indices}
+    \input{pages/page-01-title}
+    \input{pages/page-02-indipendence-declaration}
+    \input{pages/page-03-lock-notice}
+    \input{pages/page-04-abstract}
+    \input{pages/page-05-summary}
+    \input{pages/page-06-preface}
+    \input{pages/page-07-indices}
 
     % =====================================================================
     % chapter
diff --git a/pages/page-08-chapter.tex b/pages/page-08-chapter.tex
index 9fc5894..d0f3329 100644
--- a/pages/page-08-chapter.tex
+++ b/pages/page-08-chapter.tex
@@ -2,4 +2,4 @@
 % Every chapter used in the document has to be included here
 
 % include actual chapters
-\include{chapter/chapter-introduction}
\ No newline at end of file
+\input{chapter/chapter-introduction}
\ No newline at end of file