diff --git a/unisportomat/course_scraper/course_scraper.py b/unisportomat/quiz/course_scraper/course_scraper.py
similarity index 93%
rename from unisportomat/course_scraper/course_scraper.py
rename to unisportomat/quiz/course_scraper/course_scraper.py
index 4c4a7103633a2b69de4ccd6f760bbe57c843e6f3..855a951c21bbf77c6e02302e14f57c2992c50ab1 100644
--- a/unisportomat/course_scraper/course_scraper.py
+++ b/unisportomat/quiz/course_scraper/course_scraper.py
@@ -5,6 +5,7 @@ for http://www.buchsys.de for SWP UniSport-O-Mat.
 
 import requests
 from bs4 import BeautifulSoup
+from collections import OrderedDict
 
 
 def fetch_website(url):
@@ -27,14 +28,14 @@ def fetch_website(url):
         raise
 
 
-def scraping(site=None) -> dict:
+def scraping(site=None) -> OrderedDict:
     """
     Returns a dictionary of the form {name: link},
     containing the scraped content of
     https://www.buchsys.de/fu-berlin/angebote/aktueller_zeitraum/index.html,
     unless another URL is given as an argument.
     """
-    courses = {}
+    courses = OrderedDict()
 
     if site is None:
         site = "https://www.buchsys.de/fu-berlin/angebote/aktueller_zeitraum/"
diff --git a/unisportomat/course_scraper/test_course_scraper.py b/unisportomat/quiz/course_scraper/test_course_scraper.py
similarity index 85%
rename from unisportomat/course_scraper/test_course_scraper.py
rename to unisportomat/quiz/course_scraper/test_course_scraper.py
index 62909ec52d70d6e7cee664b28aaf2eedd181253f..b48a3f437b6e084b44687ad95a13ab848a7aa542 100644
--- a/unisportomat/course_scraper/test_course_scraper.py
+++ b/unisportomat/quiz/course_scraper/test_course_scraper.py
@@ -3,6 +3,7 @@ Testing module, yo. Just for the course_scraper.py.
 """
 from django.test import TestCase
 from course_scraper import scraping  # , fetch_website
+from collections import OrderedDict
 
 
 class ScraperTestCase(TestCase):
@@ -15,7 +16,7 @@ class ScraperTestCase(TestCase):
         """
         Testing return type of scraping().
         """
-        self.assertIsInstance(scraping(), dict)
+        self.assertIsInstance(scraping(), OrderedDict)
 
     def test_dict_not_empty(self):
         """