diff --git a/content/Events/index.md b/content/Events/index.md
index 3d3e625..d865c34 100644
--- a/content/Events/index.md
+++ b/content/Events/index.md
@@ -7,7 +7,7 @@ draft: false
 weight: 1
 ---
 
-{% row(style="center" margin="through." bgPath="events.png" bgStyle="full") %} 
+{% row(style="center" margin="through." bgPath="img/events.png" bgStyle="full") %} 
 
 ## <span style="color: white;">Dunia Yetu Events</span>
 
diff --git a/content/build_on_dunia/index.md b/content/build_on_dunia/index.md
index 141b5af..0da4042 100644
--- a/content/build_on_dunia/index.md
+++ b/content/build_on_dunia/index.md
@@ -10,7 +10,7 @@ extra:
     logo_path: images/logo.svg
 ---
 
-{% row(style="center" padding="top"bgPath="buildbackground2.png" bgStyle="short") %}
+{% row(style="center" padding="top"bgPath="img/build_background_2.png" bgStyle="short") %}
 
 ## Build on top of Tanzania’s decentralised internet 
 
diff --git a/content/coding_academy/index.md b/content/coding_academy/index.md
index 7908b4a..64e7212 100644
--- a/content/coding_academy/index.md
+++ b/content/coding_academy/index.md
@@ -7,7 +7,7 @@ draft: false
 weight: 1
 ---
 
-{% row(style="center" margin="through." bgPath="background2.png" bgStyle="full") %} 
+{% row(style="center" margin="through." bgPath="img/background_2.png" bgStyle="full") %} 
 
 ## <span style="color: white;">Dunia Yetu Coding Academy</span>
 
@@ -28,7 +28,7 @@ Welcome to our Coding Academy in Dar es Salaam, a hub for accessible tech educat
 
 <br>
 
-![Image](codingacademy4.png#small#mx-auto)
+![Image](img/coding_academy_4.png#small#mx-auto)
 
 <br>
 
@@ -48,7 +48,7 @@ Our team is dedicated to fostering technological empowerment within Dar es Salaa
 <!-- section 1 -->
 
 
-{% row(style="" reverse="rightreserve" bgPath="filler2.png" bgStyle="full") %}
+{% row(style="" reverse="rightreserve" bgPath="img/filler_2.png" bgStyle="full") %}
 
 ## <span style="color: white;">Our Hub</span>
  
@@ -60,7 +60,7 @@ Our team is dedicated to fostering technological empowerment within Dar es Salaa
 
 |||
 
-![Image](hub.png#medium#mx-auto)
+![Image](img/hub.png#medium#mx-auto)
 
 {% end %}
 
diff --git a/content/community/index.md b/content/community/index.md
index e0b7276..8127bcb 100644
--- a/content/community/index.md
+++ b/content/community/index.md
@@ -7,7 +7,7 @@ draft: false
 weight: 1
 ---
 
-{% row(style="center" margin="through." bgPath="bluebackground2.jpeg" bgStyle="full") %} 
+{% row(style="center" margin="through." bgPath="img/blue_background_2.jpeg" bgStyle="full") %} 
 
 ## <span style="color: white;">Welcome to our Community</span>
 
diff --git a/content/footer/_index.md b/content/footer/_index.md
index 231ef02..de2c25b 100644
--- a/content/footer/_index.md
+++ b/content/footer/_index.md
@@ -4,7 +4,7 @@ description: ""
 insert_anchor_links: "left"
 template: "partials/footer.html"
 extra:
-  logoPath: "footer/logodunia2.jpeg"
+  logoPath: "footer/img/logo_dunia_2.jpeg"
   socialLinks: { Youtube: "https://www.youtube.com/channel/UC_iykLteqV-jwOBzueLtUwg", Twitter: "https://twitter.com/DenisMukwege", Facebook: "https://www.facebook.com/DrDenisMukwege"  }
 ---
 
diff --git a/content/header/_index.md b/content/header/_index.md
index 2b08048..e976c86 100644
--- a/content/header/_index.md
+++ b/content/header/_index.md
@@ -4,11 +4,11 @@ description: "this is a header."
 insert_anchor_links: "left"
 template: "partials/header.html"
 extra:
-  logoPath: "/header/logodunia.jpeg"
+  logoPath: "/header/img/logo_dunia.jpeg"
   imgPath: ""
 ---
 - [Home]("/home")
-- [Coding Academy]("/codingacademy")
+- [Coding Academy]("/coding_academy")
 - Participate
 
 {% row(padding="none") %}
@@ -23,17 +23,17 @@ extra:
 
 |||
 
-<button onclick="window.location.href='/nodehost'">
+<button onclick="window.location.href='/node_host'">
 
-[Host a Node](/nodehost)
+[Host a Node](/node_host)
 <br>
 <p class="text-sm">Build a Node and Earn TFT</p>
 
 |||
 
-<button onclick="window.location.href='/buildondunia'">
+<button onclick="window.location.href='/build_on_dunia'">
 
-[Build on Dunia Yetu](/buildondunia)
+[Build on Dunia Yetu](/build_on_dunia)
 <br>
 <p class="text-sm">Develop Tanzania's Internet</p>
 
diff --git a/content/home/index.md b/content/home/index.md
index 1ba9825..12eb646 100644
--- a/content/home/index.md
+++ b/content/home/index.md
@@ -9,7 +9,7 @@ weight: 1
 
 <!-- section 1 -->
 
-{% row(style="" reverse="rightreserve" bgPath="./img/DuniaYetu-2.jpg" bgStyle="full") %}
+{% row(style="" reverse="rightreserve" bgPath="./img/dunia_yetu_2.jpg" bgStyle="full") %}
 
 ##  <span style="color: white;">Building Tanzania's Digital Future</span>
 ### <span style="color: white;">Join the movement to create a sovereign digital landscape in East Africa</span>
@@ -21,14 +21,14 @@ weight: 1
 
 {% end %}
 
-{% row(style="center" margin="tight" bgPath="img/DuniaYetu-4.jpg" bgStyle="full") %}
+{% row(style="center" margin="tight" bgPath="img/dunia_yetu_4.jpg" bgStyle="full") %}
 
 # <span style="color: white;">Dunia Yetu</span>
 
 ### <span style="color: white;">We empower East Africans coders with tools and a network to build an advanced, self-governed internet.
 </span>
 
-![Image](img/DuniaYetu.png)
+![Image](img/dunia_yetu.png)
 
 <span style="color: white;">We are embarking on an ambitious journey to revolutionise the digital space in East Africa. Within the next two years, our goal is to equip thousands of coders with a groundbreaking platform and toolkit. This initiative is more than just technology; it's about forging a self-reliant digital ecosystem, proudly owned and managed by East Africans.
 </span>
@@ -113,7 +113,7 @@ Complexity is killing progress.
 {% row(style="center" padding="none") %}
 
 ### Data Sovereignty
-![Image](sovereignty.png#small#mx-auto)
+![Image](img/sovereignty.png#small#mx-auto)
 
 <br/>
 
@@ -123,7 +123,7 @@ Take control of your data for privacy and security in the digital age.
 |||
 
 ### Open Source Sharing
-![Image](opensource.png#small#mx-auto)
+![Image](img/open_source.png#small#mx-auto)
 
 <br/>
 
@@ -132,7 +132,7 @@ Unite communities through open collaboration and a decentralized Internet.
 |||
 
 ### Community Collaboration
-![Image](communitycollab.png#small#mx-auto)
+![Image](img/community_collab.png#small#mx-auto)
 
 <br/>
 
@@ -145,7 +145,7 @@ Empower collaboration and co-creation in a community-owned digital space.
 
 
 ### Startups Launchpad
-![Image](startups.png#small#mx-auto)
+![Image](img/startups.png#small#mx-auto)
 
 <br/>
 
@@ -154,7 +154,7 @@ Fund and fuel startups' visions with innovative financing models.
 |||
 
 ### Local Content Hosting
-![Image](content.png#small#mx-auto)
+![Image](img/content.png#small#mx-auto)
 
 <br/>
 
@@ -163,7 +163,7 @@ Store and access content locally in Tanzania, eliminating hosting fees.
 |||
 
 ### Cost-effective Internet
-![Image](costreduction.png#small#mx-auto)
+![Image](img/cost_reduction.png#small#mx-auto)
 
 <br/>
 
@@ -193,7 +193,7 @@ Access an affordable alternative and community-driven Internet, earning TFT toke
 
 |||
 
-![Image](coding.jpg#large#mx-auto)
+![Image](img/coding.jpg#large#mx-auto)
 
 {% end %}
 
diff --git a/content/node_host/index.md b/content/node_host/index.md
index 2b05f61..0da6b90 100644
--- a/content/node_host/index.md
+++ b/content/node_host/index.md
@@ -22,7 +22,7 @@ By connecting hardware at your home or office – or anywhere you’d like – y
 
 <br>
 
-![image](pluginnode.png "image_tooltip")
+![image](img/plug_in_node.png "image_tooltip")
 
 <br>
 
@@ -66,7 +66,7 @@ Farmers earn TFT according to the amount of Internet capacity their Nodes connec
 <br>
 <br>
 
-![image](earntft.png "image_tooltip")
+![image](img/earn_tft.png "image_tooltip")
 
 <br>
 
diff --git a/content/participate/index.md b/content/participate/index.md
index d0bbdb8..75007b0 100644
--- a/content/participate/index.md
+++ b/content/participate/index.md
@@ -10,7 +10,7 @@ extra:
     logo_path: images/logo.svg
 ---
 
-{% row(style="center" margin="through." bgPath="participate2.png" bgStyle="full") %} 
+{% row(style="center" margin="through." bgPath="img/participate_2.png" bgStyle="full") %} 
 
 # <span style="color: white;">Join Dunia Yetu</span>
 
@@ -39,17 +39,17 @@ The future is about decentralisation, participation, and working together to ach
 <br>
 </p>
 
-![Image](threefold.png#large#mx-auto)
+![Image](img/threefold.png#large#mx-auto)
 
 {% end %}
 
 {% row(style="center" padding="none") %}
 
-<button>[Host a Node](/nodehost)</button>
+<button>[Host a Node](/node_host)</button>
 
 <br>
 
-<button>[Build on our internet](/buildondunia)</button>
+<button>[Build on our internet](/build_on_dunia)</button>
 
 
 
diff --git a/content/people/david_machuche/index.md b/content/people/david_machuche/index.md
index 0a44446..4ea9f07 100644
--- a/content/people/david_machuche/index.md
+++ b/content/people/david_machuche/index.md
@@ -6,7 +6,7 @@ taxonomies:
     people: [david_machuche]
     categories: [foundation]
 extra:
-    imgPath: david.jpeg
+    imgPath: img/david.jpeg
     organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
diff --git a/content/people/kalebu_gwalugano/index.md b/content/people/kalebu_gwalugano/index.md
index 8c387c1..e3ce038 100644
--- a/content/people/kalebu_gwalugano/index.md
+++ b/content/people/kalebu_gwalugano/index.md
@@ -6,7 +6,7 @@ taxonomies:
     people: [kalebu_gwalugano]
     categories: [foundation]
 extra:
-    imgPath: kalebu.jpeg 
+    imgPath: img/kalebu.jpeg 
     organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
diff --git a/content/people/melch_leonard/index.md b/content/people/melch_leonard/index.md
index 4bbe3a1..3e702d4 100644
--- a/content/people/melch_leonard/index.md
+++ b/content/people/melch_leonard/index.md
@@ -6,7 +6,7 @@ taxonomies:
     people: [melch_leonard]
     categories: [foundation]
 extra:
-    imgPath: melch.jpeg 
+    imgPath: img/melch.jpeg 
     organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
diff --git a/content/people/veronica_michael/index.md b/content/people/veronica_michael/index.md
index c2fc05d..45fe5b1 100644
--- a/content/people/veronica_michael/index.md
+++ b/content/people/veronica_michael/index.md
@@ -6,7 +6,7 @@ taxonomies:
     people: [veronica_michael]
     categories: [foundation]
 extra:
-    imgPath: vee.jpeg 
+    imgPath: img/vee.jpeg 
     organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
diff --git a/content/people/victor_muhagachi/index.md b/content/people/victor_muhagachi/index.md
index ba4c4ba..ae8aa58 100644
--- a/content/people/victor_muhagachi/index.md
+++ b/content/people/victor_muhagachi/index.md
@@ -7,7 +7,7 @@ taxonomies:
     memberships: []
     categories: []
 extra:
-    imgPath: victor.jpeg
+    imgPath: img/victor.jpeg
     organizations: []
     countries: []
     cities: []
diff --git a/run b/run
index fc57cc9..9c2767c 100755
Binary files a/run and b/run differ