diff --git a/content/footnotes.tex b/content/footnotes.tex
index 2fa55ef..8fc9df4 100644
--- a/content/footnotes.tex
+++ b/content/footnotes.tex
@@ -1,5 +1,6 @@
-\chapter{Footnotes}
-\label{sec:footnotes}
+\chapter{References and Footnotes}
+\section{Footnotes}\label{sec:footnotes}
+
 
 Whenever we want to include footnotes into our \LaTeX{} document, we can use 
 the command \code{latex}{\textbackslash footnote{<text>}}. At the position where we use 
@@ -16,3 +17,62 @@ The package \pkg{footmisc} provides us with additional options for how to displa
   \item \code{latex}{\textbackslash usepackage[symbol]\{footmisc\}} causes a numbering with symbols (e.\,g.,  \textdagger, \textdaggerdbl) instead of numbers.
 \end{itemize}
 
+
+\section{References}\label{sec:references}
+
+If we want to make references, like \enquote{\textellipsis , which you can see 
+in figure 21, \textellipsis}, \LaTeX{} by default provides us with the command 
+\code{latex}{\textbackslash ref\{<label>\}}. No more adapting of the numbering 
+for graphics, tables, etc. needed!
+The command expects a unique label as argument, that needs to be assigned to 
+the referenced element. After that, wherever we call the command, the number of 
+our referenced object appears in the text.
+\Example{lst:fooboar-learning-latex}{references/ref}{references/ref_crop}{Example
+ for a reference}
+
+A smarter package for references is \pkg{cleverref}.\footnote{with only one 
+\enquote{r}!}
+It provides us with the command \code{latex}{\textbackslash cref\{<label>\}}, 
+which can also handle multiple labels separated by commas.
+This automatically generates elegant references like \enquote{sections 1 to 3, 
+and 5.}\footnote{for the source code \code{latex}{\textbackslash 
+cref\{sec:section1,sec:section2,
+		sec:section3,sec:section5\}}}
+Furthermore, \code{latex}{\textbackslash ref\{<label>\}} automatically inserts 
+a suited abbreviation, e.\,g., \enquote{fig.} for figures.
+
+We can reference graphics, tables, sections, chapters, source code listings, 
+and equations. 
+Many packages use the label in order to find out the object type of the 
+referenced element.
+For this reason, it is common to insert a prefix before each label 
+(\cref{lst:reference-prefixes}).
+
+\begin{table}[H]
+	\centering
+	\begin{tabular}{@{}llll@{}}
+		\toprule
+		Prefix & Object type & Prefix & Object type \\ \midrule
+		fig: & figures & tbl:    & tables            \\ 
+		sec: & sections  & subsec: & subsections     \\
+		ch:  & chapters     & itm:    & items \\
+		eq:  & equations & lst:    & source code listings  \\ \bottomrule
+	\end{tabular}
+	\caption{Prefixes for labels}
+	\label{lst:reference-prefixes}
+\end{table}
+
+Note that if we use \code{latex}{\textbackslash cref\{<label>\}}\,---\,for some 
+document classes\,---\,the generated passages only appear in the desired 
+language (e.\,g., German) when the language is specified already within the 
+document class command:
+
+\codeblock{latex}{listings/references/set-language.tex}
+
+\noindent Except for sections, captions\footnote{\code{latex}{\textbackslash 
+caption\{…\}}} \emph{always need to be specified and positioned before the 
+label}\textit{.} Otherwise, they cannot be referenced later on in the text.
+Labels for sections are inserted directly after the command:
+
+\codeblock{latex}{listings/references/sections.tex}
+
diff --git a/content/references.tex b/content/references.tex
deleted file mode 100644
index d3bc8b7..0000000
--- a/content/references.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-\chapter{References}
-\label{sec:references}
-
-If we want to make references, like \enquote{\textellipsis , which you can see in figure 21, \textellipsis}, \LaTeX{} by default provides us with the command \code{latex}{\textbackslash ref\{<label>\}}. No more adapting of the numbering for graphics, tables, etc. needed!
-The command expects a unique label as argument, that needs to be assigned to 
-the referenced element. After that, wherever we call the command, the number of 
-our referenced object appears in the text.
-\Example{lst:fooboar-learning-latex}{references/ref}{references/ref_crop}{Example for a reference}
-
-A smarter package for references is \pkg{cleverref}.\footnote{with only one \enquote{r}!}
-It provides us with the command \code{latex}{\textbackslash cref\{<label>\}}, which can also handle multiple labels separated by commas.
-This automatically generates elegant references like \enquote{sections 1 to 3, and 5.}\footnote{for the source code \code{latex}{\textbackslash cref\{sec:section1,sec:section2,
-sec:section3,sec:section5\}}}
-Furthermore, \code{latex}{\textbackslash ref\{<label>\}} automatically inserts a suited abbreviation, e.\,g., \enquote{fig.} for figures.
-
-We can reference graphics, tables, sections, chapters, source code listings, and equations. 
-Many packages use the label in order to find out the object type of the referenced element.
-For this reason, it is common to insert a prefix before each label (\cref{lst:reference-prefixes}).
-
-\begin{table}[H]
-  \centering
-  \begin{tabular}{@{}llll@{}}
-    \toprule
-    Prefix & Object type & Prefix & Object type \\ \midrule
-    fig: & figures & tbl:    & tables            \\ 
-    sec: & sections  & subsec: & subsections     \\
-    ch:  & chapters     & itm:    & items \\
-    eq:  & equations & lst:    & source code listings  \\ \bottomrule
-  \end{tabular}
-  \caption{Prefixes for labels}
-  \label{lst:reference-prefixes}
-\end{table}
-
-Note that if we use \code{latex}{\textbackslash cref\{<label>\}}\,---\,for some document classes\,---\,the generated passages only appear in the desired language (e.\,g., German) when the language is specified already within the document class command:
-
-\codeblock{latex}{listings/references/set-language.tex}
-
-	\noindent Except for sections, captions\footnote{\code{latex}{\textbackslash caption\{…\}}} \emph{always need to be specified and positioned before the label}\textit{.} Otherwise, they cannot be referenced later on in the text.
-	Labels for sections are inserted directly after the command:
-
-\codeblock{latex}{listings/references/sections.tex}
diff --git a/exercises/footnotes/task.tex b/exercises/footnotes/task.tex
index ff91fd7..1972717 100644
--- a/exercises/footnotes/task.tex
+++ b/exercises/footnotes/task.tex
@@ -1,3 +1,4 @@
+\section*{Exercise \thechapter .1}
 Make the text \enquote{March 2021} of the file 
 \file{exercises/footnotes/footnotes.tex} appear as a footnote instead of in 
 parentheses. Additionally, insert a clickable URL to the Java Development Kit 
@@ -6,3 +7,14 @@ as footnote.
 \texttt{https://www.oracle.com/java/technologies/javase-downloads.html}
 
 \exercisematerial{exercises/footnotes/footnotes}
+
+\section*{Exercise \thechapter .2}
+In file \file{exercises/references/references.tex}, replace \enquote{in the 
+figure} and \enquote{the following source code listing} with suited references. 
+Use the command \code{latex}{\textbackslash cref}. Do not forget to first 
+introduce labels for the elements that you want to reference. To do so, first 
+of all, wrap the source code listing in a \code{latex}{listing} environment.
+Also, insert a caption for the source code listing. 
+Make sure to use suitable prefixes before the labels.
+
+\exercisematerial{exercises/references/references}
diff --git a/exercises/references/task.tex b/exercises/references/task.tex
deleted file mode 100644
index 4e9c3b6..0000000
--- a/exercises/references/task.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-In file \file{exercises/references/references.tex}, replace \enquote{in the figure} and \enquote{the following source code listing} with suited references. 
-Use the command \code{latex}{\textbackslash cref}. Do not forget to first introduce labels for the elements that you want to reference. To do so, first of all, wrap the source code listing in a \code{latex}{listing} environment.
-Also, insert a caption for the source code listing. 
-Make sure to use suitable prefixes before the labels.
-
-\exercisematerial{exercises/references/references}
diff --git a/main.tex b/main.tex
index 6ff134d..29e1894 100644
--- a/main.tex
+++ b/main.tex
@@ -43,8 +43,6 @@
 \exercise{source-code-listings}
 \input{content/footnotes.tex}
 \exercise{footnotes}
-\input{content/references.tex}
-\exercise{references}
 \input{content/literature.tex}
 \exercise{literature}
 \input{content/prospects.tex}