diff --git a/01-front/abstract.tex b/0-front/content/abstract.tex
similarity index 100%
rename from 01-front/abstract.tex
rename to 0-front/content/abstract.tex
diff --git a/01-front/acknowledgement.tex b/0-front/content/acknowledgement.tex
similarity index 100%
rename from 01-front/acknowledgement.tex
rename to 0-front/content/acknowledgement.tex
diff --git a/01-front/acronyms.tex b/0-front/content/acronyms.tex
similarity index 100%
rename from 01-front/acronyms.tex
rename to 0-front/content/acronyms.tex
diff --git a/01-front/contents.tex b/0-front/content/contents.tex
similarity index 100%
rename from 01-front/contents.tex
rename to 0-front/content/contents.tex
diff --git a/01-front/figures.tex b/0-front/content/figures.tex
similarity index 100%
rename from 01-front/figures.tex
rename to 0-front/content/figures.tex
diff --git a/01-front/publications.tex b/0-front/content/publications.tex
similarity index 100%
rename from 01-front/publications.tex
rename to 0-front/content/publications.tex
diff --git a/01-front/résumé.tex b/0-front/content/résumé.tex
similarity index 100%
rename from 01-front/résumé.tex
rename to 0-front/content/résumé.tex
diff --git a/01-front/tables.tex b/0-front/content/tables.tex
similarity index 100%
rename from 01-front/tables.tex
rename to 0-front/content/tables.tex
diff --git a/00-cover/README.md b/0-front/cover/README.md
similarity index 100%
rename from 00-cover/README.md
rename to 0-front/cover/README.md
diff --git a/00-cover/cover.tex b/0-front/cover/cover.tex
similarity index 97%
rename from 00-cover/cover.tex
rename to 0-front/cover/cover.tex
index fdc3db0..8605b21 100644
--- a/00-cover/cover.tex
+++ b/0-front/cover/cover.tex
@@ -4,7 +4,7 @@
 
 % Inclure les infos de chaque établissement
 % Include each institution data
-\input{00-cover/liste-ecoles-etablissements}
+\input{0-front/cover/liste-ecoles-etablissements}
 
 % Inclure infos de l'école doctorale
 % Include doctoral school data
@@ -84,3 +84,4 @@
 }
 
 \maketitle
+\pdfbookmark[-1]{Front Matter}{frontmatter}
diff --git a/00-cover/cover_background.tex b/0-front/cover/cover_background.tex
similarity index 96%
rename from 00-cover/cover_background.tex
rename to 0-front/cover/cover_background.tex
index 476971e..e49a829 100644
--- a/00-cover/cover_background.tex
+++ b/0-front/cover/cover_background.tex
@@ -17,6 +17,6 @@
   \fill[couleur-ecole-recto, fill opacity = 1] (-1,0) -- (-1,12.7817142857) -- (14,8.556) -- (14,6.4) -- (\paperwidth,4.4281) -- (\paperwidth,0) -- cycle;
 
   %points
-  \input{00-cover/cover_points}
+  \input{0-front/cover/cover_points}
   \shade[shading=axis, top color = white, path fading = south] (14,8.556) rectangle (\paperwidth,10);
 \end{tikzpicture}
\ No newline at end of file
diff --git a/00-cover/cover_points.tex b/0-front/cover/cover_points.tex
similarity index 100%
rename from 00-cover/cover_points.tex
rename to 0-front/cover/cover_points.tex
diff --git a/00-cover/ecoles-doctorales/MATISSE/logo.png b/0-front/cover/ecoles-doctorales/MATISSE/logo.png
similarity index 100%
rename from 00-cover/ecoles-doctorales/MATISSE/logo.png
rename to 0-front/cover/ecoles-doctorales/MATISSE/logo.png
diff --git a/00-cover/liste-ecoles-etablissements.tex b/0-front/cover/liste-ecoles-etablissements.tex
similarity index 100%
rename from 00-cover/liste-ecoles-etablissements.tex
rename to 0-front/cover/liste-ecoles-etablissements.tex
diff --git a/00-cover/logos-etablissements/UR.png b/0-front/cover/logos-etablissements/UR.png
similarity index 100%
rename from 00-cover/logos-etablissements/UR.png
rename to 0-front/cover/logos-etablissements/UR.png
diff --git a/11-introduction/introduction.tex b/1-introduction/introduction/introduction.tex
similarity index 98%
rename from 11-introduction/introduction.tex
rename to 1-introduction/introduction/introduction.tex
index d64f000..86b508c 100644
--- a/11-introduction/introduction.tex
+++ b/1-introduction/introduction/introduction.tex
@@ -7,6 +7,8 @@
 
 Touch is the only sense that allows not only to perceive the environment, but also to interact with it. Explain how both vision and touch are complementary and important for combined perception and interaction with the environment.
 
+\fig{real}{Foo bar baz}
+
 \subsectionstartoc{Wearable Haptics and the Augmentation of Touch}
 
 Present what is wearable haptics, how they can be used to augment the sense of touch~\autocite{pacchierotti2017wearable}. Detail then how they have been used with virtual reality, but how little they have been used with augmented reality.
diff --git a/1-introduction/part.tex b/1-introduction/part.tex
new file mode 100644
index 0000000..e6fbe60
--- /dev/null
+++ b/1-introduction/part.tex
@@ -0,0 +1,2 @@
+\part{Introduction}
+\label{part:introduction}
diff --git a/12-related-work/related-work.tex b/1-introduction/related-work/related-work.tex
similarity index 93%
rename from 12-related-work/related-work.tex
rename to 1-introduction/related-work/related-work.tex
index 9681ad9..d60cb01 100644
--- a/12-related-work/related-work.tex
+++ b/1-introduction/related-work/related-work.tex
@@ -1,4 +1,5 @@
-\mainchapter{12-related-work}{Related Work}
+\mainchapter{Related Work}
+\label{ch:related-work}
 
 \section{Haptics}
 
diff --git a/13-chapitre2/chapitre2.tex b/13-chapitre2/chapitre2.tex
deleted file mode 100644
index e37d52f..0000000
--- a/13-chapitre2/chapitre2.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\part{Augmenting the Visuo-haptic Texture Perception of Tangible Surfaces}
-\label{part:texture}
-
-\mainchapter{13-chapitre2}{Perception of Visual-Haptic Texture Augmentation in Augmented and Virtual Reality}
-
-\mainchapter{13-chapitre2}{Augmenting the Texture Perception of Tangible Surfaces in Augmented Reality using Vibrotactile Haptics}
-
-\part{Improving Virtual Object Manipulation with Visuo-Haptic Augmentations of the Hand}
-\label{part:hand}
-
-\mainchapter{13-chapitre2}{Visual Rendering of the Hand in Augmented Reality}
-
-\mainchapter{13-chapitre2}{Visuo-Haptic Rendering of the Hand in Augmented Reality}
diff --git a/2-perception/ar-textures/ar-textures.tex b/2-perception/ar-textures/ar-textures.tex
new file mode 100644
index 0000000..e9b4515
--- /dev/null
+++ b/2-perception/ar-textures/ar-textures.tex
@@ -0,0 +1,2 @@
+\mainchapter{Augmenting the Texture Perception of Tangible Surfaces in Augmented Reality using Vibrotactile Haptics}
+\label{ch:ar-textures}
diff --git a/2-perception/perception.tex b/2-perception/perception.tex
new file mode 100644
index 0000000..78efee5
--- /dev/null
+++ b/2-perception/perception.tex
@@ -0,0 +1,2 @@
+\part{Augmenting the Visuo-haptic Texture Perception of Tangible Surfaces}
+\label{part:texture}
\ No newline at end of file
diff --git a/2-perception/xr-perception/xr-perception.tex b/2-perception/xr-perception/xr-perception.tex
new file mode 100644
index 0000000..59876cf
--- /dev/null
+++ b/2-perception/xr-perception/xr-perception.tex
@@ -0,0 +1,3 @@
+\mainchapter{Perception of Visual-Haptic Texture Augmentation in Augmented and Virtual Reality}
+\label{ch:xr-perception}
+
diff --git a/3-manipulation/manipulation.tex b/3-manipulation/manipulation.tex
new file mode 100644
index 0000000..4acb101
--- /dev/null
+++ b/3-manipulation/manipulation.tex
@@ -0,0 +1,2 @@
+\part{Improving Virtual Object Manipulation with Visuo-Haptic Augmentations of the Hand}
+\label{part:manipulation}
\ No newline at end of file
diff --git a/3-manipulation/visual-hand/visual-hand.tex b/3-manipulation/visual-hand/visual-hand.tex
new file mode 100644
index 0000000..5a25383
--- /dev/null
+++ b/3-manipulation/visual-hand/visual-hand.tex
@@ -0,0 +1,2 @@
+\mainchapter{Visual Rendering of the Hand in Augmented Reality}
+\label{ch:visual-hand}
diff --git a/3-manipulation/visuo-haptic-hand/visuo-haptic-hand.tex b/3-manipulation/visuo-haptic-hand/visuo-haptic-hand.tex
new file mode 100644
index 0000000..823f000
--- /dev/null
+++ b/3-manipulation/visuo-haptic-hand/visuo-haptic-hand.tex
@@ -0,0 +1,2 @@
+\mainchapter{Visuo-Haptic Rendering of the Hand in Augmented Reality}
+\label{ch:visuo-haptic-hand}
diff --git a/20-back/backcover.tex b/4-conclusion/backcover/backcover.tex
similarity index 96%
rename from 20-back/backcover.tex
rename to 4-conclusion/backcover/backcover.tex
index 5451d3f..b47e04b 100644
--- a/20-back/backcover.tex
+++ b/4-conclusion/backcover/backcover.tex
@@ -9,7 +9,7 @@
         \put(0,0){%
             \parbox[t][\paperheight]{\paperwidth}{%
                 \vspace{-33.1cm}
-                \input{20-back/backcover_background}
+                \input{4-conclusion/backcover/backcover_background}
             }}
     }
     \hspace{9mm}
@@ -39,6 +39,7 @@
         docens, idque, incertum qua mente, ne lateret adfectans. quibus mox Caesar acrius efferatus, velut contumaciae quoddam vexillum altius erigens, sine respectu salutis alienae vel suae ad vertenda opposita instar rapidi fluminis irrevocabili impetu ferebatur.
         Hae duae provinciae bello quondam piratico catervis mixtae praedonum.}
 
+    \addcontentsline{toc}{chapter}{Back Cover}
 }
 
 \restoregeometry
diff --git a/20-back/backcover_background.tex b/4-conclusion/backcover/backcover_background.tex
similarity index 100%
rename from 20-back/backcover_background.tex
rename to 4-conclusion/backcover/backcover_background.tex
diff --git a/4-conclusion/bibliography.tex b/4-conclusion/bibliography.tex
new file mode 100644
index 0000000..0b069ab
--- /dev/null
+++ b/4-conclusion/bibliography.tex
@@ -0,0 +1 @@
+\printbibliography[heading=bibintoc]
diff --git a/14-conclusion/conclusion.tex b/4-conclusion/conclusion.tex
similarity index 76%
rename from 14-conclusion/conclusion.tex
rename to 4-conclusion/conclusion.tex
index a83a8a5..33b85dd 100644
--- a/14-conclusion/conclusion.tex
+++ b/4-conclusion/conclusion.tex
@@ -1,4 +1,2 @@
-\resetparts
-
 \chapter{Conclusion}
 \label{ch:conclusion}
diff --git a/4-conclusion/part.tex b/4-conclusion/part.tex
new file mode 100644
index 0000000..a514cde
--- /dev/null
+++ b/4-conclusion/part.tex
@@ -0,0 +1,2 @@
+\part{Conclusion}
+\label{part:conclusion}
diff --git a/main.tex b/main.tex
index 1c39918..1eb2eeb 100644
--- a/main.tex
+++ b/main.tex
@@ -44,12 +44,14 @@
 
 %% Typography
 % babel, csquotes, fontenc, microtype, lmodern, textcomp are already loaded by the class
-\usepackage[varqu, varl]{inconsolata} % Better monospace font (with alternative quote [varqu] and l [varl])
-\usepackage[libertinus]{newtx} % Use Garamond font for text and math
+\usepackage[varqu, varl]{inconsolata} % Better monospace font (with alternative "quote" [varqu] and "l" [varl])
+%\usepackage{newtx} % Use Libertinus font for text and math
 \usepackage{microtype} % Micro-typography improvements (slightly more compact, better to read)
 
+% Customise fonts (sectsty package, loaded by the class)
+\renewcommand*{\selectfontchapheads}{}
+\chapterfont{\sffamily} % Smaller chapter titles
 \allsectionsfont{\sffamily} % Sans-serif for section titles
-\chapterfont{\sffamily} % Sans-serif for chapter titles
 
 %% Custom commands
 \input{utils/commands}
@@ -61,11 +63,13 @@
 
 \newcommand{\inputchapter}[1]{\clearemptydoublepage\input{#1}} % Load a chapter after a clear double page
 
-\newcommand{\mainchapter}[2]{%
-    \chapter{#2}%
-    \label{ch:#1}%
-    %
-    \graphicspath{{#1/figures/}}% Load figures from the chapter folder
+\newcommand{\inputchapterfigures}[2]{% Load a chapter (#2) with figures from a specific directory (#1)
+    \graphicspath{{#1/#2/figures/}}%
+    \inputchapter{#1/#2/#2}%
+}
+
+\newcommand{\mainchapter}[1]{%
+    \chapter{#1}%
     %
     % Print the table of contents for the chapter
     \vspace*{-1cm}%
@@ -83,28 +87,36 @@
 
 \frontmatter
 \selectlanguage{french}
-\input{00-cover/cover}
+\input{0-front/cover/cover}
 \selectlanguage{english}
 
-\inputchapter{01-front/acknowledgement}
-\inputchapter{01-front/abstract}
-\inputchapter{01-front/résumé}
-\inputchapter{01-front/publications}
-\inputchapter{01-front/contents}
-\inputchapter{01-front/acronyms}
-\inputchapter{01-front/figures}
-\inputchapter{01-front/tables}
+\inputchapter{0-front/content/acknowledgement}
+\inputchapter{0-front/content/abstract}
+\inputchapter{0-front/content/résumé}
+\inputchapter{0-front/content/publications}
+\inputchapter{0-front/content/contents}
+\inputchapter{0-front/content/acronyms}
+\inputchapter{0-front/content/figures}
+\inputchapter{0-front/content/tables}
 
 \mainmatter
-\inputchapter{11-introduction/introduction}
-\inputchapter{12-related-work/related-work}
-\inputchapter{13-chapitre2/chapitre2}
-\inputchapter{14-conclusion/conclusion}
+\input{1-introduction/part}
+\inputchapterfigures{1-introduction}{introduction}
+\inputchapterfigures{1-introduction}{related-work}
+
+\input{2-perception/perception}
+\inputchapterfigures{2-perception}{xr-perception}
+\inputchapterfigures{2-perception}{ar-textures}
+
+\input{3-manipulation/manipulation}
+\inputchapterfigures{3-manipulation}{visual-hand}
+\inputchapterfigures{3-manipulation}{visuo-haptic-hand}
+
+\input{4-conclusion/part}
+\inputchapter{4-conclusion/conclusion}
 
 \backmatter
-\clearemptydoublepage
-\printbibliography[heading=bibintoc]
-
-\inputchapter{20-back/backcover}
+\inputchapter{4-conclusion/bibliography}
+\inputchapter{4-conclusion/backcover/backcover}
 
 \end{document}
diff --git a/thesis.cls b/thesis.cls
index 3b1f59f..8e1ec94 100644
--- a/thesis.cls
+++ b/thesis.cls
@@ -177,7 +177,7 @@
 %%%%%%%%%%%%%%%% VARIABLES PAGE DE GARDE %%%%%%%%%%%%%%%%
 
 %%%%% Dossier contenant les info de l'ecole doctorale
-\newcommand*{\direcole}[1]{\gdef\vdirecole{./00-cover/ecoles-doctorales/#1}}
+\newcommand*{\direcole}[1]{\gdef\vdirecole{0-front/cover/ecoles-doctorales/#1}}
 \direcole{}
 
 %%%%% Nom ecole, une variable par ligne
@@ -271,7 +271,7 @@
                 {\ifthenelse{\equal{\vlogoetablissementA}{}\and\equal{\vlogoetablissementB}{UR1-noir}}{
                             $\vcenter{\hbox{%
                                         \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementB,width=7cm
-                                        ]{./00-cover/logos-etablissements/\vlogoetablissementB}%
+                                        ]{0-front/cover/logos-etablissements/\vlogoetablissementB}%
                                     }}$
                         }{%
                             $\vcenter{\hbox{%
@@ -282,13 +282,13 @@
                             {\if\vlogoetablissementA\empty \else
                                     $\vcenter{\hbox{%
                                                 \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementA,width=7cm
-                                                ]{./00-cover/logos-etablissements/\vlogoetablissementA}%
+                                                ]{0-front/cover/logos-etablissements/\vlogoetablissementA}%
                                             }}$
                                 \fi}%
                             \hspace{3mm}
                             $\vcenter{\hbox{%
                                         \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementB,width=7cm
-                                        ]{./00-cover/logos-etablissements/\vlogoetablissementB}%
+                                        ]{0-front/cover/logos-etablissements/\vlogoetablissementB}%
                                     }}$
                         }}%
             }%
@@ -306,7 +306,7 @@
     \AddToShipoutPicture*{%
         \put(0,0){%
             \parbox[b][42.6cm]{\paperwidth}{%
-                \input{./00-cover/cover_background}
+                \input{0-front/cover/cover_background}
                 \vspace{10cm}
             }}}
     \displayLogos
diff --git a/utils/commands.tex b/utils/commands.tex
index 4501c63..b185663 100644
--- a/utils/commands.tex
+++ b/utils/commands.tex
@@ -112,7 +112,7 @@
 
 
 %% Maths
-\renewcommand{\eqref}[1]{Eq.~\ref{eq:#1}}
+\newcommand{\eqref}[1]{Eq.~\ref{eq:#1}}
 
 \newcommand{\measure}[3]{$\mathrm{#1} = \qty{#2}{#3}$}