diff --git a/aleksis/apps/untis/management/commands/untis_import.py b/aleksis/apps/untis/management/commands/untis_import.py
index 8a263c84a041fc8cfd6433da61a722d39556f43f..084c12fbfc412c83bbb8761fc08de8c166ed1d8c 100644
--- a/aleksis/apps/untis/management/commands/untis_import.py
+++ b/aleksis/apps/untis/management/commands/untis_import.py
@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.utils.translation import ugettext as _
 
-from ...util import untis_import_xml
+from aleksis.apps.untis.util.xml.xml import untis_import_xml
 
 
 class Command(BaseCommand):
diff --git a/aleksis/apps/untis/menus.py b/aleksis/apps/untis/menus.py
index 3bda041ce510e34e5c31825919b9b4baed3d4439..e21787858d8a7de6e55d8db3cf2f530d6c51d3c8 100644
--- a/aleksis/apps/untis/menus.py
+++ b/aleksis/apps/untis/menus.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 MENUS = {
     "DATA_MANAGEMENT_MENU": [
         {
-            "name": _("Units import"),
+            "name": _("Untis import"),
             "url": "untis_import",
             "validators": [
                 "menu_generator.validators.is_authenticated",
diff --git a/aleksis/apps/untis/datetimeutils.py b/aleksis/apps/untis/util/mysql/datetimeutils.py
similarity index 100%
rename from aleksis/apps/untis/datetimeutils.py
rename to aleksis/apps/untis/util/mysql/datetimeutils.py
diff --git a/aleksis/apps/untis/drive.py b/aleksis/apps/untis/util/mysql/drive.py
similarity index 100%
rename from aleksis/apps/untis/drive.py
rename to aleksis/apps/untis/util/mysql/drive.py
diff --git a/aleksis/apps/untis/events.py b/aleksis/apps/untis/util/mysql/events.py
similarity index 98%
rename from aleksis/apps/untis/events.py
rename to aleksis/apps/untis/util/mysql/events.py
index 66f76c6c1b0605363e3d4f0e0ee7adc7b6e5d3e8..5186f285adb44bf478c6f3cbdad0bcb5461751dd 100644
--- a/aleksis/apps/untis/events.py
+++ b/aleksis/apps/untis/util/mysql/events.py
@@ -4,7 +4,7 @@ from schoolapps.settings import TIMETABLE_HEIGHT
 from .drive import drive
 from .api_helper import untis_date_to_date, date_to_untis_date
 from .api import row_by_row_helper, run_all, get_absence_by_id
-from . import models
+from aleksis.apps.untis import models
 
 
 #########
diff --git a/aleksis/apps/untis/parse.py b/aleksis/apps/untis/util/mysql/parse.py
similarity index 100%
rename from aleksis/apps/untis/parse.py
rename to aleksis/apps/untis/util/mysql/parse.py
diff --git a/aleksis/apps/untis/plan.py b/aleksis/apps/untis/util/mysql/plan.py
similarity index 100%
rename from aleksis/apps/untis/plan.py
rename to aleksis/apps/untis/util/mysql/plan.py
diff --git a/aleksis/apps/untis/schoolapps_util.py b/aleksis/apps/untis/util/mysql/schoolapps_util.py
similarity index 100%
rename from aleksis/apps/untis/schoolapps_util.py
rename to aleksis/apps/untis/util/mysql/schoolapps_util.py
diff --git a/aleksis/apps/untis/sub.py b/aleksis/apps/untis/util/mysql/sub.py
similarity index 100%
rename from aleksis/apps/untis/sub.py
rename to aleksis/apps/untis/util/mysql/sub.py
diff --git a/aleksis/apps/untis/util.py b/aleksis/apps/untis/util/xml/xml.py
similarity index 100%
rename from aleksis/apps/untis/util.py
rename to aleksis/apps/untis/util/xml/xml.py
diff --git a/aleksis/apps/untis/views.py b/aleksis/apps/untis/views.py
index fbea02bf07176dfab33516ad4368890ec3b052c4..098a681d0ffaffbb701155d27b0db3c18956bc13 100644
--- a/aleksis/apps/untis/views.py
+++ b/aleksis/apps/untis/views.py
@@ -5,12 +5,12 @@ from django.shortcuts import render
 from aleksis.core.decorators import admin_required
 
 from .forms import UntisUploadForm
-from .util import untis_import_xml
+from aleksis.apps.untis.util.xml.xml import untis_import_xml
 
 
 @login_required
 @admin_required
-def untis_import(request: HttpRequest) -> HttpResponse:
+def xml_import(request: HttpRequest) -> HttpResponse:
     context = {}
 
     upload_form = UntisUploadForm()