diff --git a/_i18n/en.yml b/_i18n/en.yml
index 72424bd..930c500 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -11,12 +11,32 @@ pages:
   about:
     title: "About"
   angels:
-    title: "Fairphone Angels"
-  community-maps:
-    title: "Community Maps"
+    title: "The Angels Program"
+  contribute:
+    title: "Contribute"
+  design:
+    title: "Design Guidelines"
+  events:
+    title: "Community Events"
+  local-events:
+    title: "Local Meetups and Events"
   event-materials:
-    title: "Community event materials"
-  installation:
-    title: "Installation"
+    title: "Useful Event Materials"
+  event-guide:
+    title: "Fairphone Meetup Guide"
+  efct:
+    title: "European Fairphoners Community Meetup"
+  hardware:
+    title: "DIY & Repair"
+  online:
+    title: "Online Communities"
+  software:
+    title: "Custom Roms & other Software"
+  custom-roms:
+    title: "Custom Roms"
+  flashable-zips:
+    title: "Flashable ZIPs"
+  apks:
+    title: "Community Apps"
   synapse:
     title: "Synapse"
diff --git a/contribute/community-maps.md b/contribute/community-maps.md
deleted file mode 100644
index ff058cd..0000000
--- a/contribute/community-maps.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: page
-title: pages.community-maps.title
----
-<iframe src="https://wearefairphone.github.io/fprsmap/?show=angels,events,repairshops,shops"
-        width="100%"
-        height="400"
-        allowfullscreen="true"
-        frameborder="0">
-  <p>
-    <a href="https://wearefairphone.github.io/fprsmap/?show=angels,events,repairshops,shops" target="_blank">See the Fairphone Community Map!
-    </a>
-  </p>
-</iframe>
diff --git a/angels.md b/pages/angels.md
similarity index 100%
rename from angels.md
rename to pages/angels.md
diff --git a/pages/contribute.md b/pages/contribute.md
new file mode 100644
index 0000000..0692020
--- /dev/null
+++ b/pages/contribute.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.contribute.title
+---
+
+{% translate_file contribute.md %}
diff --git a/pages/design.md b/pages/design.md
new file mode 100644
index 0000000..06273b8
--- /dev/null
+++ b/pages/design.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.design.title
+---
+
+{% translate_file design.md %}
diff --git a/pages/events.md b/pages/events.md
new file mode 100644
index 0000000..1d3d71f
--- /dev/null
+++ b/pages/events.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.events.title
+---
+
+{% translate_file events.md %}
diff --git a/pages/events/efct.md b/pages/events/efct.md
new file mode 100644
index 0000000..f8d09c3
--- /dev/null
+++ b/pages/events/efct.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.efct.title
+---
+
+{% translate_file efct.md %}
diff --git a/pages/events/event-guide.md b/pages/events/event-guide.md
new file mode 100644
index 0000000..b7fbfda
--- /dev/null
+++ b/pages/events/event-guide.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.event-guide.title
+---
+
+{% translate_file event-guide.md %}
diff --git a/community-events/event-materials.md b/pages/events/event-materials.md
similarity index 87%
rename from community-events/event-materials.md
rename to pages/events/event-materials.md
index 8b99c7f..d87beab 100644
--- a/community-events/event-materials.md
+++ b/pages/events/event-materials.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: subpage
 title:  pages.event-materials.title
 further_reading: event
 ---
diff --git a/pages/events/local-events.md b/pages/events/local-events.md
new file mode 100644
index 0000000..78b444f
--- /dev/null
+++ b/pages/events/local-events.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.local-events.title
+---
+
+{% translate_file local-events.md %}
diff --git a/pages/hardware.md b/pages/hardware.md
new file mode 100644
index 0000000..7ee07e1
--- /dev/null
+++ b/pages/hardware.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.hardware.title
+---
+
+{% translate_file hardware.md %}
diff --git a/pages/online.md b/pages/online.md
new file mode 100644
index 0000000..674db3f
--- /dev/null
+++ b/pages/online.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.online.title
+---
+
+{% translate_file online.md %}
diff --git a/pages/software.md b/pages/software.md
new file mode 100644
index 0000000..8ace7cf
--- /dev/null
+++ b/pages/software.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.software.title
+---
+
+{% translate_file software.md %}
diff --git a/pages/software/apks.md b/pages/software/apks.md
new file mode 100644
index 0000000..778f4f3
--- /dev/null
+++ b/pages/software/apks.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.apks.title
+---
+
+{% translate_file apks.md %}
diff --git a/pages/software/custom-roms.md b/pages/software/custom-roms.md
new file mode 100644
index 0000000..4a3ef35
--- /dev/null
+++ b/pages/software/custom-roms.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.custom-roms.title
+---
+
+{% translate_file custom-roms.md %}
diff --git a/pages/software/flashable-zips.md b/pages/software/flashable-zips.md
new file mode 100644
index 0000000..45b19b2
--- /dev/null
+++ b/pages/software/flashable-zips.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.flashable-zips.title
+---
+
+{% translate_file flashable-zips.md %}
diff --git a/synapse.md b/pages/synapse.md
similarity index 100%
rename from synapse.md
rename to pages/synapse.md
diff --git a/software/installation.md b/software/installation.md
deleted file mode 100644
index 20cf62c..0000000
--- a/software/installation.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title:  pages.installation.title
----
-
-{% translate_file installation.md %}