diff --git a/covid19/ui/__init__.py b/covid19/ui/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/ui/admin/__init__.py b/covid19/ui/admin/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/views_admin.py b/covid19/ui/admin/views_admin.py
similarity index 100%
rename from covid19/views_admin.py
rename to covid19/ui/admin/views_admin.py
diff --git a/covid19/ui/common/__init__.py b/covid19/ui/common/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/ui/europe/__init__.py b/covid19/ui/europe/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/views_europe.py b/covid19/ui/europe/views_europe.py
similarity index 100%
rename from covid19/views_europe.py
rename to covid19/ui/europe/views_europe.py
diff --git a/covid19/ui/rki/__init__.py b/covid19/ui/rki/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/views_rki.py b/covid19/ui/rki/views_rki.py
similarity index 100%
rename from covid19/views_rki.py
rename to covid19/ui/rki/views_rki.py
diff --git a/covid19/ui/vaccination/__init__.py b/covid19/ui/vaccination/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/views_vaccination.py b/covid19/ui/vaccination/views_vaccination.py
similarity index 100%
rename from covid19/views_vaccination.py
rename to covid19/ui/vaccination/views_vaccination.py
diff --git a/covid19/ui/who/__init__.py b/covid19/ui/who/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/covid19/views_who.py b/covid19/ui/who/views_who.py
similarity index 100%
rename from covid19/views_who.py
rename to covid19/ui/who/views_who.py
diff --git a/covid19/views.py b/covid19/views.py
index e16e53628cc62e29edd00c72ff18ee76f54593e2..d1978bdef4480c6115e108c0392257ae5fa87109 100644
--- a/covid19/views.py
+++ b/covid19/views.py
@@ -2,11 +2,11 @@ from flask import render_template, redirect, url_for
 from database import app
 from covid19.oodm.common.common_model_transient import ApplicationPage
 
-import covid19.views_who
-import covid19.views_europe
-import covid19.views_vaccination
-import covid19.views_rki
-import covid19.views_admin
+import covid19.ui.who.views_who
+import covid19.ui.europe.views_europe
+import covid19.ui.vaccination.views_vaccination
+import covid19.ui.rki.views_rki
+import covid19.ui.admin.views_admin
 
 
 ############################################################################################