diff --git a/docs/blueprints/app_admin/uml/app_admin_domain_model.png b/docs/blueprints/app_admin/uml/app_admin_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7294efeb19df012be9bdbdfa5907775d4d968cc
Binary files /dev/null and b/docs/blueprints/app_admin/uml/app_admin_domain_model.png differ
diff --git a/docs/blueprints/app_admin/uml_implementation/admin_domain_model.txt b/docs/blueprints/app_admin/uml/app_admin_domain_model.txt
similarity index 100%
rename from docs/blueprints/app_admin/uml_implementation/admin_domain_model.txt
rename to docs/blueprints/app_admin/uml/app_admin_domain_model.txt
diff --git a/docs/blueprints/app_admin/uml/app_admin_domain_model_impl.png b/docs/blueprints/app_admin/uml/app_admin_domain_model_impl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c65dd37a19dfab86818fee8abfb764366bae30ce
Binary files /dev/null and b/docs/blueprints/app_admin/uml/app_admin_domain_model_impl.png differ
diff --git a/docs/blueprints/app_admin/uml_requirements/admin_domain_model.txt b/docs/blueprints/app_admin/uml/app_admin_domain_model_impl.txt
similarity index 100%
rename from docs/blueprints/app_admin/uml_requirements/admin_domain_model.txt
rename to docs/blueprints/app_admin/uml/app_admin_domain_model_impl.txt
diff --git a/docs/blueprints/app_admin/uml/app_admin_use_cases.png b/docs/blueprints/app_admin/uml/app_admin_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d8c7a69eccaaf0face3fda0a9cc42087fc58ed0
Binary files /dev/null and b/docs/blueprints/app_admin/uml/app_admin_use_cases.png differ
diff --git a/docs/blueprints/app_admin/uml_requirements/app_admin_use_cases.txt b/docs/blueprints/app_admin/uml/app_admin_use_cases.txt
similarity index 83%
rename from docs/blueprints/app_admin/uml_requirements/app_admin_use_cases.txt
rename to docs/blueprints/app_admin/uml/app_admin_use_cases.txt
index 815258ef7b78f257680940669e4a14494af03456..995826a729c9dd3927287a828d9b9e05ed6b3a26 100644
--- a/docs/blueprints/app_admin/uml_requirements/app_admin_use_cases.txt
+++ b/docs/blueprints/app_admin/uml/app_admin_use_cases.txt
@@ -12,13 +12,13 @@ package covid19.blueprints.app_user {
 	au <|-- du
 }
 left to right direction
-package covid19.blueprints.admin.admin_views_frontend {
+package covid19.blueprints.app_admin.admin_views_frontend {
 	usecase page_root as UC1
 	usecase page_home as UC2
 }
 vu --> UC1
 vu --> UC2
-package covid19.blueprints.admin.admin_views_for_tasks {
+package covid19.blueprints.app_admin.admin_views_for_tasks {
 	usecase page_admin_crud as UC3
 	usecase alive_message as UC200
     usecase database_drop_create as UC201
diff --git a/docs/blueprints/app_admin/uml_implementation/admin_use_cases.png b/docs/blueprints/app_admin/uml/app_admin_use_cases_impl.png
similarity index 100%
rename from docs/blueprints/app_admin/uml_implementation/admin_use_cases.png
rename to docs/blueprints/app_admin/uml/app_admin_use_cases_impl.png
diff --git a/docs/blueprints/app_admin/uml_implementation/app_admin_use_cases.txt b/docs/blueprints/app_admin/uml/app_admin_use_cases_impl.txt
similarity index 100%
rename from docs/blueprints/app_admin/uml_implementation/app_admin_use_cases.txt
rename to docs/blueprints/app_admin/uml/app_admin_use_cases_impl.txt
diff --git a/docs/blueprints/app_admin/uml_implementation/admin_domain_model.png b/docs/blueprints/app_admin/uml_implementation/admin_domain_model.png
deleted file mode 100644
index 339837e5d62311f0373bc81aa69cc91ea449ee2e..0000000000000000000000000000000000000000
Binary files a/docs/blueprints/app_admin/uml_implementation/admin_domain_model.png and /dev/null differ
diff --git a/docs/blueprints/app_admin/uml_implementation/app_admin_use_cases.png b/docs/blueprints/app_admin/uml_implementation/app_admin_use_cases.png
deleted file mode 100644
index 1a4750c48e2cd91b1141d59a84381b0ab30f61a0..0000000000000000000000000000000000000000
Binary files a/docs/blueprints/app_admin/uml_implementation/app_admin_use_cases.png and /dev/null differ