diff --git a/src/covid19/blueprints/common/common_model.py b/src/covid19/blueprints/common/application_model.py
similarity index 100%
rename from src/covid19/blueprints/common/common_model.py
rename to src/covid19/blueprints/common/application_model.py
diff --git a/src/covid19/blueprints/common/common_model_transient.py b/src/covid19/blueprints/common/application_model_transient.py
similarity index 100%
rename from src/covid19/blueprints/common/common_model_transient.py
rename to src/covid19/blueprints/common/application_model_transient.py
diff --git a/src/covid19/blueprints/common/common_service.py b/src/covid19/blueprints/common/application_service.py
similarity index 94%
rename from src/covid19/blueprints/common/common_service.py
rename to src/covid19/blueprints/common/application_service.py
index e2bc66a41d89420fe50503cd7e676c9c11b38f7c..b13881d0945ed87431cc639adcdac61389d866d6 100644
--- a/src/covid19/blueprints/common/common_service.py
+++ b/src/covid19/blueprints/common/application_service.py
@@ -7,6 +7,5 @@ class CommonService:
         app.logger.debug(" Common Service [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
-        self.limit_nr = 20
         app.logger.debug("------------------------------------------------------------")
         app.logger.info(" Common Service [ready]")
diff --git a/src/covid19/app_services.py b/src/covid19/blueprints/common/application_services.py
similarity index 88%
rename from src/covid19/app_services.py
rename to src/covid19/blueprints/common/application_services.py
index fa93ca4219f925ebc93906077cf2e61fa7d822be..675765f57c3fa711cfad79ece4a3f4deb7f79c31 100644
--- a/src/covid19/app_services.py
+++ b/src/covid19/blueprints/common/application_services.py
@@ -1,7 +1,7 @@
 from database import db
 
 from covid19.blueprints.admin.admin_service import AdminService
-from covid19.blueprints.common.common_service import CommonService
+from covid19.blueprints.common.application_service import CommonService
 from covid19.blueprints.ecdc.ecdc_service import EcdcService
 from covid19.blueprints.rki_bundeslaender.rki_service import RkiBundeslaenderService
 from covid19.blueprints.rki_landkreise.rki_service import RkiLandkreiseService
@@ -14,7 +14,7 @@ from covid19.blueprints.who.who_service import WhoService
 # Services
 #
 admin_service = AdminService(db)
-common_service = CommonService(db)
+application_service = CommonService(db)
 ecdc_service = EcdcService(db)
 rki_service_bundeslaender = RkiBundeslaenderService(db)
 rki_service_landkreise = RkiLandkreiseService(db)
diff --git a/src/covid19/app_views.py b/src/covid19/blueprints/common/application_views.py
similarity index 94%
rename from src/covid19/app_views.py
rename to src/covid19/blueprints/common/application_views.py
index 9a601027e11eb5076498d14affb8348ba61d200c..432b450b19d2867dbf804dca50c2748babffd494 100644
--- a/src/covid19/app_views.py
+++ b/src/covid19/blueprints/common/application_views.py
@@ -1,6 +1,6 @@
 from flask import render_template, redirect, url_for
 from database import app
-from covid19.blueprints.common.common_model_transient import ApplicationPage
+from covid19.blueprints.common.application_model_transient import ApplicationPage
 
 import covid19.blueprints.admin.admin_views
 import covid19.blueprints.ecdc.ecdc_views
diff --git a/src/covid19/app_workers.py b/src/covid19/blueprints/common/application_workers.py
similarity index 100%
rename from src/covid19/app_workers.py
rename to src/covid19/blueprints/common/application_workers.py
diff --git a/src/covid19/templates/common/fragment_flashed_messages.html b/src/covid19/blueprints/common/templates/common/fragment_flashed_messages.html
similarity index 100%
rename from src/covid19/templates/common/fragment_flashed_messages.html
rename to src/covid19/blueprints/common/templates/common/fragment_flashed_messages.html
diff --git a/src/covid19/templates/common/fragment_navbar.html b/src/covid19/blueprints/common/templates/common/fragment_navbar.html
similarity index 100%
rename from src/covid19/templates/common/fragment_navbar.html
rename to src/covid19/blueprints/common/templates/common/fragment_navbar.html
diff --git a/src/covid19/templates/common/fragment_navtabs.html b/src/covid19/blueprints/common/templates/common/fragment_navtabs.html
similarity index 100%
rename from src/covid19/templates/common/fragment_navtabs.html
rename to src/covid19/blueprints/common/templates/common/fragment_navtabs.html
diff --git a/src/covid19/templates/common/fragment_pagination.html b/src/covid19/blueprints/common/templates/common/fragment_pagination.html
similarity index 100%
rename from src/covid19/templates/common/fragment_pagination.html
rename to src/covid19/blueprints/common/templates/common/fragment_pagination.html
diff --git a/src/covid19/templates/common/page_home.html b/src/covid19/blueprints/common/templates/common/page_home.html
similarity index 100%
rename from src/covid19/templates/common/page_home.html
rename to src/covid19/blueprints/common/templates/common/page_home.html
diff --git a/src/covid19/templates/common/page_layout.html b/src/covid19/blueprints/common/templates/common/page_layout.html
similarity index 100%
rename from src/covid19/templates/common/page_layout.html
rename to src/covid19/blueprints/common/templates/common/page_layout.html