diff --git a/tutorials/tutorial_complete.adoc b/tutorials/tutorial_complete.adoc
index 0302eb11..858ee1eb 100644
--- a/tutorials/tutorial_complete.adoc
+++ b/tutorials/tutorial_complete.adoc
@@ -59,7 +59,8 @@ You can do the exercises either in the browser, or on your local machine. If you
 include::../author/topics/metadata.adoc[tag=tutorial]
 
 [[exercise-2-1]]
-include::exercises.adoc[tag=exercise-2-1]
+include::../tutorials/exercises.adoc[tag=exercise-2-1]
+
 
 Let’s add some sections to our document in the next lesson.
 >> Start next lesson 
@@ -70,7 +71,7 @@ Let’s add some sections to our document in the next lesson.
 include::../author/topics/sections.adoc[tag=tutorial]
 
 [[exercise-2-2]]
-include::exercises.adoc[tag=exercise-2-2]
+include::../tutorials/exercises.adoc[tag=exercise-2-2]
 
 We’ve built the basic structure of a Metanorma document. Let’s add some content to our document in the next lesson.
 >> Start next lesson 
@@ -88,7 +89,7 @@ Let’s look at lists in the next lesson.
 include::../author/topics/blocks/lists.adoc[tags=tutorial,leveloffset=+2]
 
 [[exercise-2-3-1]]
-include::exercises.adoc[tag=exercise-2-3-1]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-1]
 
 Great work! Let’s have a look at term definitions in the next lesson.
 >> Start next lesson
@@ -137,7 +138,7 @@ Foreign seeds, husks, bran, sand, dust.
 
 
 [[exercise-2-3-2]]
-include::exercises.adoc[tag=exercise-2-3-2]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-2]
 
 The next type of block we will cover are tables.
 >> Start next lesson
@@ -147,7 +148,7 @@ The next type of block we will cover are tables.
 include::../author/topics/blocks/tables.adoc[tag=tutorial]
 
 [[exercise-2-3-3]]
-include::exercises.adoc[tag=exercise-2-3-3]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-3]
 
 Let’s look at inserting images next.
 >> Start next lesson
@@ -157,7 +158,7 @@ Let’s look at inserting images next.
 include::../author/topics/blocks/images.adoc[tag=tutorial]
 
 [[exercise-2-3-4]]
-include::exercises.adoc[tag=exercise-2-3-4]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-4]
 
 Let’s look at admonitions next.
 >> Start next lesson
@@ -166,16 +167,17 @@ Let’s look at admonitions next.
 === Admonitions
 include::../author/topics/blocks/admonitions.adoc[tag=tutorial,leveloffset=+2]
 [[exercise-2-3-5]]
-include::exercises.adoc[tag=exercise-2-3-5]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-5]
 
 Great progress so far! Let's look at code samples in the next lesson.
 >> Start next lesson
 
 //Lesson 2-3-6
 === Code Samples
-include::../author/topics/blocks/code_samples.adoc[tag=tutorial]
-[[exercise-2-3-6]]
-include::exercises.adoc[tag=exercise-2-3-6]
+// TODO: no code sample matched
+// include::../author/topics/blocks/code_samples.adoc[tag=tutorial]
+// [[exercise-2-3-6]]
+include::../tutorials/exercises.adoc[tag=exercise-2-3-6]
 
 We’re done with blocks - good job! The next lesson covers inline markup. 
 >> Start next lesson
@@ -193,16 +195,16 @@ include::../author/topics/inline_markup/text_formatting.adoc[tag=tutorial,levelo
 ==== Footnotes
 include::..//author/topics/inline_markup/footnotes.adoc[tag=tutorial]
 [[exercise-2-4-1]]
-include::exercises.adoc[tag=exercise-2-4-1]
+include::../tutorials/exercises.adoc[tag=exercise-2-4-1]
 
 Let’s look at a more advanced form of inline formatting: index entries
 >> Start next lesson
 
 //Lesson 2-4-2
 === Index Terms
-include::../author/topics/inline_markup/index.adoc[tag=tutorial]
+include::../author/topics/inline_markup/index_terms.adoc[tag=tutorial]
 [[exercise-2-4-2]]
-include::exercises.adoc[tag=exercise-2-4-2]
+include::../tutorials/exercises.adoc[tag=exercise-2-4-2]
 
 In the next lesson, we will cover references and links. 
 >> Start next lesson
@@ -213,7 +215,7 @@ include::../author/topics/inline_markup/links.adoc[tag=tutorial]
 === Bibliographic entries
 include::../author/topics/sections/entering_bib.adoc[tag=tutorial]
 [[exercise-2-4-3]]
-include::exercises.adoc[tag=exercise-2-4-3]
+include::../tutorials/exercises.adoc[tag=exercise-2-4-3]
 
 
 Let’s summarize what we’ve learnt so far.
@@ -254,7 +256,7 @@ include::../tutorials/learning_objectives.adoc[tag=learningobjectives-3]
 include::../author/topics/reviewing.adoc[leveloffset=1]
 
 [[exercise-3-1]]
-include::exercises.adoc[tag=exercise-3-1]
+include::../tutorials/exercises.adoc[tag=exercise-3-1]
 
 Now that we've commented on the content, let's create a draft of the document. 
 >> Start next lesson
@@ -282,7 +284,7 @@ With this command you trigger the Metanorma toolchain to:
 * Create HTML, PDF, and DOC output
 
 [[exercise-3-2]]
-include::exercises.adoc[tag=exercise-3-2]
+include::../tutorials/exercises.adoc[tag=exercise-3-2]
 
 
 Now that you are familiar with the simplest way of creating a Metanorma document, let's look at different ways to compile documents in the next lesson.
@@ -352,7 +354,7 @@ include::../author/topics/troubleshooting.adoc[tag=rendering-errors,leveloffset=
 
 
 //Exercise will promt the user to fix some bugs in a document: For example syntax errors. 
-include::exercises.adoc[tag=exercise-4]
+include::../tutorials/exercises.adoc[tag=exercise-4]
 >> Start next lesson
 
 // Lesson 4-2