diff --git a/basic_datatypes.ipynb b/basic_datatypes.ipynb
index 4263d429..b42ae27d 100644
--- a/basic_datatypes.ipynb
+++ b/basic_datatypes.ipynb
@@ -68,7 +68,7 @@
     "# Some relevant modules\n",
     "import sys\n",
     "import math\n",
-    "from tutorial import basic_datatypes as bdt"
+    "from tutorial.quiz import basic_datatypes as bdt"
    ]
   },
   {
diff --git a/control_flow.ipynb b/control_flow.ipynb
index d11e78b3..b8112267 100644
--- a/control_flow.ipynb
+++ b/control_flow.ipynb
@@ -155,7 +155,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial import control_flow as quiz\n",
+    "from tutorial.quiz import control_flow as quiz\n",
     "quiz.ConditionalsQuiz()"
    ]
   },
@@ -815,7 +815,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial import control_flow as quiz\n",
+    "from tutorial.quiz import control_flow as quiz\n",
     "quiz.LoopsQuiz()"
    ]
   },
diff --git a/functional_programming.ipynb b/functional_programming.ipynb
index f0a63838..82135435 100644
--- a/functional_programming.ipynb
+++ b/functional_programming.ipynb
@@ -243,7 +243,7 @@
    },
    "outputs": [],
    "source": [
-    "import tutorial.functional_programming as fp\n",
+    "import tutorial.quiz.functional_programming as fp\n",
     "fp.PureFunctions()"
    ]
   },
diff --git a/functions.ipynb b/functions.ipynb
index a27e4a6b..d442a36e 100644
--- a/functions.ipynb
+++ b/functions.ipynb
@@ -1107,7 +1107,7 @@
    },
    "outputs": [],
    "source": [
-    "from tutorial import functions as quiz\n",
+    "from tutorial.quiz import functions as quiz\n",
     "quiz.Functions()"
    ]
   },
diff --git a/functions_advanced.ipynb b/functions_advanced.ipynb
index 2847558b..b12f8a9e 100644
--- a/functions_advanced.ipynb
+++ b/functions_advanced.ipynb
@@ -1795,7 +1795,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial.functions_advanced import tricky_closures as answer\n",
+    "from tutorial.quiz.functions_advanced import tricky_closures as answer\n",
     "answer"
    ]
   },
diff --git a/input_output.ipynb b/input_output.ipynb
index 57afaab5..7a4c3153 100644
--- a/input_output.ipynb
+++ b/input_output.ipynb
@@ -157,7 +157,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.StringOutput()"
    ]
   },
@@ -210,7 +210,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.StringInput()"
    ]
   },
@@ -499,7 +499,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.Paths()"
    ]
   },
@@ -725,7 +725,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.ReadFiles()"
    ]
   },
@@ -853,7 +853,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.WriteFiles()"
    ]
   },
@@ -1017,7 +1017,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.ContextManagers()"
    ]
   },
@@ -1298,7 +1298,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tutorial.input_output as op\n",
+    "import tutorial.quiz.input_output as op\n",
     "op.CSV()"
    ]
   },
diff --git a/object_oriented_programming.ipynb b/object_oriented_programming.ipynb
index b9b7e482..afb772b5 100644
--- a/object_oriented_programming.ipynb
+++ b/object_oriented_programming.ipynb
@@ -1361,7 +1361,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial import object_oriented_programming as oop\n",
+    "from tutorial.quiz import object_oriented_programming as oop\n",
     "\n",
     "oop.OopQuiz()"
    ]
diff --git a/object_oriented_programming_advanced.ipynb b/object_oriented_programming_advanced.ipynb
index 15724cc0..b7600018 100644
--- a/object_oriented_programming_advanced.ipynb
+++ b/object_oriented_programming_advanced.ipynb
@@ -1158,7 +1158,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial import object_oriented_programming_advanced as oopa\n",
+    "from tutorial.quiz import object_oriented_programming_advanced as oopa\n",
     "\n",
     "oopa.OopAdvanced()"
    ]
diff --git a/threads.ipynb b/threads.ipynb
index 247fe9ce..0a7c075f 100644
--- a/threads.ipynb
+++ b/threads.ipynb
@@ -107,7 +107,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from tutorial.threads import Threads\n",
+    "from tutorial.quiz.threads import Threads\n",
     "\n",
     "Threads()"
    ]
diff --git a/tutorial/quiz/__init__.py b/tutorial/quiz/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tutorial/basic_datatypes.py b/tutorial/quiz/basic_datatypes.py
similarity index 100%
rename from tutorial/basic_datatypes.py
rename to tutorial/quiz/basic_datatypes.py
diff --git a/tutorial/common.py b/tutorial/quiz/common.py
similarity index 100%
rename from tutorial/common.py
rename to tutorial/quiz/common.py
diff --git a/tutorial/control_flow.py b/tutorial/quiz/control_flow.py
similarity index 100%
rename from tutorial/control_flow.py
rename to tutorial/quiz/control_flow.py
diff --git a/tutorial/functional_programming.py b/tutorial/quiz/functional_programming.py
similarity index 100%
rename from tutorial/functional_programming.py
rename to tutorial/quiz/functional_programming.py
diff --git a/tutorial/functions.py b/tutorial/quiz/functions.py
similarity index 100%
rename from tutorial/functions.py
rename to tutorial/quiz/functions.py
diff --git a/tutorial/functions_advanced.py b/tutorial/quiz/functions_advanced.py
similarity index 100%
rename from tutorial/functions_advanced.py
rename to tutorial/quiz/functions_advanced.py
diff --git a/tutorial/input_output.py b/tutorial/quiz/input_output.py
similarity index 100%
rename from tutorial/input_output.py
rename to tutorial/quiz/input_output.py
diff --git a/tutorial/object_oriented_programming.py b/tutorial/quiz/object_oriented_programming.py
similarity index 100%
rename from tutorial/object_oriented_programming.py
rename to tutorial/quiz/object_oriented_programming.py
diff --git a/tutorial/object_oriented_programming_advanced.py b/tutorial/quiz/object_oriented_programming_advanced.py
similarity index 100%
rename from tutorial/object_oriented_programming_advanced.py
rename to tutorial/quiz/object_oriented_programming_advanced.py
diff --git a/tutorial/threads.py b/tutorial/quiz/threads.py
similarity index 100%
rename from tutorial/threads.py
rename to tutorial/quiz/threads.py