diff --git a/docs/mkdocs-base.yml b/docs/mkdocs-base.yml
index 5dc965c0..3af84855 100644
--- a/docs/mkdocs-base.yml
+++ b/docs/mkdocs-base.yml
@@ -43,4 +43,4 @@ nav:
   - Developers:
       - developer/index.md
       - Documentation:
-          - "Data model": developer/documentation/data-model.md
\ No newline at end of file
+          - "Data model": developer/data-model.md
\ No newline at end of file
diff --git a/docs/src/developer/documentation/data-model.md b/docs/src/developer/data-model.md
similarity index 84%
rename from docs/src/developer/documentation/data-model.md
rename to docs/src/developer/data-model.md
index 60d08d69..bb9bbd7d 100644
--- a/docs/src/developer/documentation/data-model.md
+++ b/docs/src/developer/data-model.md
@@ -7,12 +7,12 @@ some_url: https://github.com/kartoza/tomorrownow_gap.git
 copyright: Copyright 2024, Kartoza
 contact:
 license: This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
-context_id: 
+#context_id: 1234
 ---
 
 # Data model diagram
 
 ## Ground observations
 
-![database design](./img/ground-observations-database-design-1.png)
+![database design](./diagram/ground-observations-database-design-1.png)
 
diff --git a/docs/src/developer/documentation/img/ground-observations-database-design-1.png b/docs/src/developer/diagram/ground-observations-database-design-1.png
similarity index 100%
rename from docs/src/developer/documentation/img/ground-observations-database-design-1.png
rename to docs/src/developer/diagram/ground-observations-database-design-1.png
diff --git a/docs/src/developer/documentation/diagram/solution-design-app-0018.drawio b/docs/src/developer/diagram/solution-design-app-0018.drawio
similarity index 100%
rename from docs/src/developer/documentation/diagram/solution-design-app-0018.drawio
rename to docs/src/developer/diagram/solution-design-app-0018.drawio
diff --git a/docs/src/developer/documentation/index.md b/docs/src/developer/documentation/index.md
deleted file mode 100644
index de4cdfde..00000000
--- a/docs/src/developer/documentation/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Documentation
-summary: Tomorrow Now GAP
-  - Irwan Fathurrahman
-date: 2024-06-21
-some_url: https://github.com/kartoza/tomorrownow_gap.git
-copyright: Copyright 2024, Kartoza
-contact:
-license: This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
-context_id: 
----
-
-# Documentation for developers
-
diff --git a/docs/src/developer/index.md b/docs/src/developer/index.md
index 1caf4e9d..76b32db7 100644
--- a/docs/src/developer/index.md
+++ b/docs/src/developer/index.md
@@ -7,7 +7,7 @@ some_url: https://github.com/kartoza/tomorrownow_gap.git
 copyright: Copyright 2024, Kartoza
 contact:
 license: This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
-context_id: 
+#context_id: 1234
 ---
 
 # For Developers