diff --git a/README.md b/README.md
deleted file mode 120000
index 9eb48a35a0a9ab1e4ce4656cebc1eeceec6c4d60..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-_index.md
\ No newline at end of file
diff --git a/_header.md b/_header.md
new file mode 100644
index 0000000000000000000000000000000000000000..966eda67631268aaa5bb3e9a0e5a12da587d52fb
--- /dev/null
+++ b/_header.md
@@ -0,0 +1,8 @@
+---
+title: logo placeholder
+---
+
+{{< rawhtml >}}
+<a class="baselink" href="/">card10</a>
+{{< /rawhtml >}}
+
diff --git a/_index.md b/_index.md
index d3380513ad755ca3f919f8e28cd0fb5ce2603a78..6ac0807d0fdcfd32535fc0e248a3105be429998c 100644
--- a/_index.md
+++ b/_index.md
@@ -11,19 +11,19 @@ It features an ECG sensor, Bluetooth Low Energy, an optical pulse sensor, a comp
 
 # News
 ## rC3 is coming!
-What role(s) can play card10 in a distributed, remote conference? Brainstorming about connectivity, functionalities, interactions: [card10 at rC3](/en/card10_at_rc3)
+What role(s) can play card10 in a distributed, remote conference? Brainstorming about connectivity, functionalities, interactions: [card10 at rC3](/events/card10_at_rc3)
 
 ## Firmware Update: Okra (as of 2020-02-02)
-It is very easy to [update your card10 firmware](/en/firmwareupdate) with just a USB-C cable. The update instructions
+It is very easy to [update your card10 firmware](/firmware/firmwareupdate) with just a USB-C cable. The update instructions
 also contain a list of the existing firmware releases.
 
-### [Getting started](/en/gettingstarted) 
-You just received your card10, what now? The [Getting started](/en/gettingstarted) page has some advice how to assemble and use the card10.
+### [Getting started](/tutorials/gettingstarted) 
+You just received your card10, what now? The [Getting started](/tutorials/gettingstarted) page has some advice how to assemble and use the card10.
 
-### [First interhacktions](/en/firstinterhacktions)
+### [First interhacktions](/interhacktions/firstinterhacktions)
 After playing around with card10 a bit, you want to learn how to write your own software. Even if you have never programmed before, it is super easy to make some LEDs blink on card10 :)
 
-### [tl;dr](/en/tldr)
+### [tl;dr](/faq/tldr)
 Spare me the details just give me the links to the docs!
 
 ### Community
@@ -31,16 +31,16 @@ Spare me the details just give me the links to the docs!
   - mirrored to [Matrix](https://en.wikipedia.org/wiki/Matrix_(protocol)) (mirror): [`#card10badge:asra.gr`](https://matrix.to/#/#card10badge:asra.gr)
   - [GitLab: `https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
 
-You can [browse](https://git.card10.badge.events.ccc.de/card10/logix) this wiki's source and [read more](/en/gitlab) about our GitLab instance.
+You can [browse](https://git.card10.badge.events.ccc.de/card10/logix) this wiki's source and [read more](/firmware/gitlab) about our GitLab instance.
 
 ### Social Media
   - [`@card10badge@chaos.social`](https://chaos.social/@card10badge)
   - [`twitter.com/card10badge`](https://twitter.com/card10badge)
 
-### [FAQ](/en/faq)
+### [FAQ](/faq)
 
 ### Events
-  - Events [archive](en/events).
+  - Events [archive](/events).
 
 
 ### News Archive
@@ -52,7 +52,7 @@ Our assembly is here: [c3nav](https://36c3.c3nav.de/l/card10/@0,491.08,374.33,5)
 Please stop by at any time :)
 
 
-We are working on a workshop schedule and post it on the [workshop page](/en/workshops/)
+We are working on a workshop schedule and post it on the [workshop page](/events/workshops/)
 
 ## Camp was wonderful, see you at 36C3
 if you still have a voucher (white or blue), bring it to congress and you might be able to redeem it against one of the card10s we are reparing in the meantime.
@@ -60,6 +60,6 @@ if you still have a voucher (white or blue), bring it to congress and you might
 No sale of card10s!
 
 ## Got a card10 you don't use or need one for your next project?
-The card10 exchange point is [here](/en/card10exchange)
+The card10 exchange point is [here](/other/card10exchange)
 
 
diff --git a/app.md b/app.md
deleted file mode 100644
index 327e4cd1c87dc8ac1e4b4e3369a437195e6fb9c7..0000000000000000000000000000000000000000
--- a/app.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### App
-
-Apps for android and apple devices are being made.
\ No newline at end of file
diff --git a/app/_index.md b/app/_index.md
index 7bbd509a9f39f43d173467ea8d3b539d303e40f6..3f0d5d2583db65dc5c3ec4ba7f791af63a547d07 100644
--- a/app/_index.md
+++ b/app/_index.md
@@ -13,13 +13,13 @@ title: Companion App
 
 ## We need really help, please follow us [here](developing)
 
-# Android / F-Droid releases
+## Android / F-Droid releases
 
 You can find the latest release of the Companion App in the F-Droid repository:
 
 [Companion App for the card10 Chaos Communication Camp badge](https://f-droid.org/app/de.ccc.events.badge.card10)
 
-# iOS Testflight builds
+## iOS Testflight builds
 
 **[https://testflight.apple.com/join/oqZhY70M](https://testflight.apple.com/join/oqZhY70M)**
 
diff --git a/de/.gitkeep b/de/.gitkeep
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/de/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/de/_index.md b/de/_index.md
deleted file mode 100644
index d7d84f0b389027aea82da7ff4f2b1f8da9855d3b..0000000000000000000000000000000000000000
--- a/de/_index.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Deutsch
----
-## card10-Ausgabe: Du kannst ab jetzt weiße Gutscheine gegen card10s beim card10 assembly tauschen.
-## Aktuelle Firmware-Version: card10s werden mit dem aktuellen Release "Asparagus" verteilt.
-Es ist sehr einfach, deine [card10 firmware zu updaten](/de/firmwareupdate) indem du ein USB-C-Kabel benutzt. Die Update-Anleitung hat auch eine Liste mit existierenden Firmware-Versionen.
-
-# card10
-
-Willkommen im card10 Wiki. Du kannst diese Wikiquelle [browsen](https://git.card10.badge.events.ccc.de/card10/logix) mehr über unsere Gitlab-Instanz [lesen](/de/gitlab).
-
-**card10** ist der Name für das Badge des [Chaos Communication Camp](https://events.ccc.de/camp/2019/wiki/Main_Page). 
-
-### [Los geht's](/de/gettingstarted) 
-Du hast gerade dein card10 empfangen. Was jetzt? Die [los geht's](/de/gettingstarted) Seite hat ein bisschen Hilfe wie du das card10 zusammen baust und benutzt.
-
-### [Erste Interhacktionen](/de/firstinterhacktions)
-Nachdem du ein bisschen mit card10 herumgespielt hast, willst du lernen, wie du deine eigene Software schreiben kannst. Auch wenn du noch nie programmiert hast, ist es super einfach, ein paar LEDs auf card10 zum blinken zu bringen :)
-
-### [tl;dr](/de/tldr)
-Erspar mir die Details, gib mir einfach die Links zur Doku!
-
-## Übersicht
-
-[![Bild des card10 badge](media/ECKyISOXsAYDJZl.jpg)](media/ECKyISOXsAYDJZl.jpg)
->
-> Hallo, mein Name ist card10
-
-### Community
-  - [IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat): [`freenode.net#card10badge`](ircs://chat.freenode.net:6697/card10badge)
-  - oder [Matrix](https://en.wikipedia.org/wiki/Matrix_(protocol)) (mirror): [`#card10badge:asra.gr`](https://matrix.to/#/#card10badge:asra.gr)
-  - [GitLab: `https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
-
-### Social Media
-  - [`@card10badge@chaos.social`](https://chaos.social/@card10badge)
-  - [`twitter.com/card10badge`](https://twitter.com/card10badge)
-
-### [FAQ](/de/faq)
-<!--- Bitte auch zu de/events.md hinzufügen-->
-
-### Events
-  - Dauernd:
-     - **card10 reparieren/löten/firmware/etc.**: card10 village (R8):
-       - Firmware-Arbeit: Bitte bring deinen Laptop mit einem Klon des Firmware Git-Repos und der [toolchain](firmware.card10.badge.events.ccc.de/how-to-build.html)
-
diff --git a/de/firmwareupdate.md b/de/firmwareupdate.md
deleted file mode 100644
index ba3b00e67ae71e01bcccea5908cda03913ad3d61..0000000000000000000000000000000000000000
--- a/de/firmwareupdate.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## Asparagus
-Ab Tag 1, 18:00
-Asparagus ist die firmware, die auf den card10s geladen ist, die an Tag 1 ab 18 Uhr ausgegeben wurden.
-Den Link zur aktuellen Firmware findest du [auf der englischen Seite für Firmware-Updates](https://card10.badge.events.ccc.de/en/firmwareupdate/)
-
-# Das Firmware-Release auf deinem card10 updaten
-* lade die aktuelle Firmware `.zip` Datei auf deinen Computer herunter
-* extrahiere sie
-* setze dein card10 in den [USB storage modus](/de/gettingstarted#usb-storage)
-* Kopiere die Dateien, die du gerade extrahiert hast, in den Hauptordner
-* wirf dein Gerät aus (wenn du das auf der Kommandozeile unter Linux tust, vergiss das `sync` nicht)
-* Schalte dein card10 aus und wieder an.
-
diff --git a/de/tldr.md b/de/tldr.md
deleted file mode 100644
index 2e481fa1b91b28cf22a1aa72fe085eecdce0d44d..0000000000000000000000000000000000000000
--- a/de/tldr.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## tl;dr
-
-- [Hardware](http://git.card10.badge.events.ccc.de/card10/hardware) - hardware repo mit docs und specs
-- [Firmware](http://git.card10.badge.events.ccc.de/card10/firmware) - firmware repo
-- [Firmware Docs](https://firmware.card10.badge.events.ccc.de/) - rendered version der firmware-doku
-- [Assembly guide](/de/assembleyourcard10) - bau dein card10 zusammen
-- [LogBook](/de/logbook) - Geschichten der Reisenden
-- [Interhacktions](/de/interhacktions) - eine Anleitung, um Apps zu bauen
-- [Hardware-Übersicht](/de/hardware-overview)  
-- [USB-C](/de/usbc)
-- [personal state](/ps)
-- [app](/app)
-- [zusammenbau-video](/vid)
\ No newline at end of file
diff --git a/en/_index.md b/en/_index.md
deleted file mode 100644
index 749ccd56dd1d630cf580710344018b1f8951ae32..0000000000000000000000000000000000000000
--- a/en/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: English
----
-# English part of this wiki
diff --git a/en/accessories.md b/en/accessories.md
deleted file mode 100644
index af37536eaf3a755234b96941ac562e5addb577ea..0000000000000000000000000000000000000000
--- a/en/accessories.md
+++ /dev/null
@@ -1,7 +0,0 @@
-```
-Title: Accessories
-```
-
-## Cases
-
-- [3d printable cover](https://git.card10.badge.events.ccc.de/card10/cover)
diff --git a/en/announcements/2019-06-04-gitlab-server.md b/en/announcements/2019-06-04-gitlab-server.md
deleted file mode 100644
index 2074e88993e4051f588e1543a08aaf43815cae40..0000000000000000000000000000000000000000
--- a/en/announcements/2019-06-04-gitlab-server.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: New GitLab Server
-date: 2019-06-04
-type: blog
----
-
-We moved from our [Hamburg GitLab](https://gitlab.hamburg.ccc.de/card10/) to:
-
-> [`https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
-
-1. Please be aware this hosting is a work in progress. If you encounter any issues please let us know on Matrix or IRC (see below).
-2. We are aware and working on GDPR compliance, for progress you can track this [issue](https://git.card10.badge.events.ccc.de/card10/meta/issues/1)
-3. Social-Sign-On (Twitter, Github, ...) is coming soon
diff --git a/en/announcements/_index.md b/en/announcements/_index.md
deleted file mode 100644
index 6d3b2893033af577f37ea1e9b4bf961dc157356f..0000000000000000000000000000000000000000
--- a/en/announcements/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- ---
-title: Announcements
---- -->
-- [2019-06-04 New Gitlab Server](2019-06-04-gitlab-server)
diff --git a/en/userguide/cases.md b/en/userguide/cases.md
deleted file mode 100644
index 081aecc97d7e4a0f7336b2bac7a7ea52adecdcd3..0000000000000000000000000000000000000000
--- a/en/userguide/cases.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "6: Cases"
----
-
-
diff --git a/en/userguide/ecg.md b/en/userguide/ecg.md
deleted file mode 100644
index fad5cb29c3f5fe34e34bf543917845e619c75359..0000000000000000000000000000000000000000
--- a/en/userguide/ecg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "5: ECG usage"
----
-
-
diff --git a/en/userguide/watch.md b/en/userguide/watch.md
deleted file mode 100644
index 3f84671cc29e952cfc172670460c94e62db7afcb..0000000000000000000000000000000000000000
--- a/en/userguide/watch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "4: Watch usage"
----
-
-
diff --git a/en/events.md b/events/_index.md
similarity index 86%
rename from en/events.md
rename to events/_index.md
index f6e8af6c0b2fb8187aa861fa7152653ca2f6d60c..42ff2af7eb9acbf13ea3d735589e85fabc487272 100644
--- a/en/events.md
+++ b/events/_index.md
@@ -1,9 +1,10 @@
 ---
 title: Events
+weight: 50
 ---
 <!-- Please keep ongoing and current events in sync with _index.md -->
 - Upcoming:
-  - card10 [workout in Berlin](/en/workouts/berlin-2019-11-09): xHain, Sat-Sun, November 9th to 10th, 2019
+  - card10 [workout in Berlin](/events/workouts/berlin-2019-11-09): xHain, Sat-Sun, November 9th to 10th, 2019
 
 
 <!-- past events, please remove any events you move here from _index.md to keep the home page clean -->
@@ -20,4 +21,4 @@ title: Events
   - CCCamp 2019 Badge at #eh19 (easterhegg2019): [Description](https://conference.c3w.at/eh19/talk/DA7KTT/), [Recording](https://media.ccc.de/search/?q=CCCamp+Badge+Talk)
   - **card10 [talk](https://fahrplan.events.ccc.de/camp/2019/Fahrplan/events/10365.html)**: Curie Wed 21.08. 12:00
   - **card10 firmware workshop**: card10 village (R8), Sun 18.08. 16:00
-  - card10 [workout in Berlin](/en/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019
+  - card10 [workout in Berlin](/events/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019
diff --git a/en/awards.md b/events/awards.md
similarity index 100%
rename from en/awards.md
rename to events/awards.md
diff --git a/en/card10_at_rc3.md b/events/card10_at_rc3.md
similarity index 100%
rename from en/card10_at_rc3.md
rename to events/card10_at_rc3.md
diff --git a/events/workouts/_index.md b/events/workouts/_index.md
new file mode 100644
index 0000000000000000000000000000000000000000..2cd3bf1a644d3446e418c981f85fe4afda86af96
--- /dev/null
+++ b/events/workouts/_index.md
@@ -0,0 +1,5 @@
+---
+title: Workouts
+---
+
+.
diff --git a/en/workouts/berlin-2019-10-03.md b/events/workouts/berlin-2019-10-03.md
similarity index 100%
rename from en/workouts/berlin-2019-10-03.md
rename to events/workouts/berlin-2019-10-03.md
diff --git a/en/workouts/berlin-2019-11-09.md b/events/workouts/berlin-2019-11-09.md
similarity index 100%
rename from en/workouts/berlin-2019-11-09.md
rename to events/workouts/berlin-2019-11-09.md
diff --git a/en/workshops.md b/events/workshops.md
similarity index 100%
rename from en/workshops.md
rename to events/workshops.md
diff --git a/en/faq.md b/faq/_index.md
similarity index 92%
rename from en/faq.md
rename to faq/_index.md
index d01c837506fb5679da7430feec4fbff8a6f4ebc4..e739810d0761269b1e3599bffd11f4bcd4a58667 100644
--- a/en/faq.md
+++ b/faq/_index.md
@@ -1,8 +1,13 @@
 ---
 title: FAQ
 ---
+
+{{% notice info %}}
+Deutsche Version: [FAQ](faq.de)
+{{% /notice %}}
+
 ## How can I contribute?
-Generally, there is a wide range of contributions that can be made to the firmware, the iOS and Android apps, the various methods of BLE communication, the user interface, the documentation, by reviewing existing work, and of course by creating your own [interhacktions](/en/interhacktions)!
+Generally, there is a wide range of contributions that can be made to the firmware, the iOS and Android apps, the various methods of BLE communication, the user interface, the documentation, by reviewing existing work, and of course by creating your own [interhacktions](/interhacktions)!
 
 If you don't know where to get started you can also have a look at some of the ideas for contributions we outlined [here](https://git.card10.badge.events.ccc.de/card10/logix/issues). If you have questions on the issue, please don't hesitate to comment or get in touch to the creator of the issue through our [Matrix](https://en.wikipedia.org/wiki/Matrix_(protocol)):( [`#card10badge:asra.gr`](https://matrix.to/#/#card10badge:asra.gr))/[IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat) ( [`freenode.net#card10badge`](ircs://chat.freenode.net:6697/card10badge)) channel.
 
@@ -28,11 +33,13 @@ The display has a polarizing filter. With some sunglasses this has the unfortion
 
 ## What can I do if the filesystem of my badge is read-only?
 tl;dr: `fsck`
-The [maintenance and repair](/en/maintenance/_index) section of card10logix includes information about [filsystem repairs](/en/maintenance/filesystem).
+
+The [maintenance and repair](/maintenance) section of card10logix includes information about [filsystem repairs](/maintenance/filesystem).
 
 ## Help! My Display is not working / it cracked
 During camp we discovered that the badge display is one of the parts that easily gets damaged.
 If you get a crack due to a mechanical crash or similar incident you have to replace your display.
-The [maintenance and repair](/en/maintenance/_index) section of card10logix includes a [guide for display replacement](/en/maintenance/display).
+
+The [maintenance and repair](/maintenance) section of card10logix includes a [guide for display replacement](/maintenance/display).
 
 
diff --git a/de/faq.md b/faq/faq.de.md
similarity index 99%
rename from de/faq.md
rename to faq/faq.de.md
index 9ffdb242f1cc9eb86bd3c57b13e9ea58991ec9da..f8675c18c42b93f1dcb7cb3213abb6ded5520c7d 100644
--- a/de/faq.md
+++ b/faq/faq.de.md
@@ -1,5 +1,6 @@
 ---
 title: FAQ
+hidden: true
 ---
 ## Was soll ich zum CCCamp 2019 mitbringen, damit ich Spaß mit card10 haben kann?
 *Ich habe bemerkt, dass das card10 ein bisschen Wartung braucht; die meisten Leute, die ein card10 mit sich tragen, haben ihre eigenen Werkzeuge zur Wartung des card10 mitgebracht, um es individueller zu gestalten oder Funktionalität hinzu zu fügen. An manchen Orten, sind Wartungsstationen verfügbar, wo card10s aufgeladen werden können und Werkzeuge und Wissen geteilt werden.*
diff --git a/faq/tldr.de.md b/faq/tldr.de.md
new file mode 100644
index 0000000000000000000000000000000000000000..fe80b5e6fceb3b5fc6ace2b919c94d14a7b76772
--- /dev/null
+++ b/faq/tldr.de.md
@@ -0,0 +1,16 @@
+---
+title: tl;dr
+hidden: true
+---
+
+- [Hardware](http://git.card10.badge.events.ccc.de/card10/hardware) - hardware repo mit docs und specs
+- [Firmware](http://git.card10.badge.events.ccc.de/card10/firmware) - firmware repo
+- [Firmware Docs](https://firmware.card10.badge.events.ccc.de/) - rendered version der firmware-doku
+- [Assembly guide](/userguide/assembly.de/) - bau dein card10 zusammen
+- [LogBook](/logbook) - Geschichten der Reisenden
+- [Interhacktions](/interhacktions) - eine Anleitung, um Apps zu bauen
+- [Hardware-Übersicht](/hardware)
+- [USB-C](/hardware/usbc)
+- [personal state](/ps)
+- [app](/app)
+- [zusammenbau-video](/userguide/assembly#assembly-video)
diff --git a/en/tldr.md b/faq/tldr.md
similarity index 69%
rename from en/tldr.md
rename to faq/tldr.md
index b5bec6bce5318e43e57a94d82c639ed2f0ceae8a..78da84056a06fce8308386bd44da8c982232b0b5 100644
--- a/en/tldr.md
+++ b/faq/tldr.md
@@ -1,17 +1,20 @@
 ---
 title: tl;dr
 ---
-## tl;dr
+
+{{% notice info %}}
+Deutsche Version: [tl;dr](../tldr.de)
+{{% /notice %}}
 
 - [Assembly video and instructions](../userguide/assembly) - Assemble your card10
 - [app](/app) - Companion app for Android and iOS
 - [personal state](/ps)
-- [Interhacktions](/en/interhacktions) - a guide to making apps
+- [Interhacktions](/interhacktions) - a guide to making apps
 - [Hatchery](https://badge.team/badge/card10) - the card10 app store, publish your app
 - [Hardware](http://git.card10.badge.events.ccc.de/card10/hardware) - hardware repo with docs and specs
-- [Hardware Overview](/en/hardware-overview)  
-- [USB-C](/en/usbc)
+- [Hardware Overview](/hardware)
+- [USB-C](/hardware/usbc)
 - [Firmware](http://git.card10.badge.events.ccc.de/card10/firmware) - firmware repo
 - [Firmware Docs](https://firmware.card10.badge.events.ccc.de/) - rendered version of the firmware docs
-- [LogBook](/en/logbook) - records of travellers
+- [LogBook](/logbook) - records of travellers
 
diff --git a/en/firmware.md b/firmware/_index.md
similarity index 99%
rename from en/firmware.md
rename to firmware/_index.md
index 24c69f46104cce86af3e16765a0484064aaeee71..e28f695226cc46a8969ac58c78211cad08f1174e 100644
--- a/en/firmware.md
+++ b/firmware/_index.md
@@ -1,5 +1,6 @@
 ---
 title: Firmware
+weight: 30
 ---
 
 ![Firmware running FreeRTOS and MicroPython](/media/firmware/teaser.png)
diff --git a/en/firmwareupdate.md b/firmware/firmwareupdate.md
similarity index 88%
rename from en/firmwareupdate.md
rename to firmware/firmwareupdate.md
index 59e07f44e1303bb496e1645bb12746c4688a46b8..0be122806b05702e04328fb0d16ce638e55469db 100644
--- a/en/firmwareupdate.md
+++ b/firmware/firmwareupdate.md
@@ -1,32 +1,36 @@
 ---
-title: Current Release
+title: Firmware Updates
 ---
-# Current: Okra (2020-02-02)
+
+## Current: Okra (2020-02-02)
 - Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.15-Okra.zip
 - [Changelog](https://git.card10.badge.events.ccc.de/card10/firmware/blob/master/CHANGELOG.md#v115-2020-02-02-okra)
 
-# Update the firmware release on your card10
+## Updating the firmware on your card10
 * Download the current firmware `.zip` file to your computer
 * Extract it
-* Put your card10 into [USB storage mode](/en/gettingstarted#usb-storage)
+* Put your card10 into [USB storage mode](/userguide/general-usage/#installing-apps-via-usb)
 * Copy over the files you just extracted directly into the main folder. Make sure to also update all files cotained in the `apps` folder. Note: on macOS devices it is recommended to use the terminal, e.g. for the broccoli release: `cp -r ~/Downloads/card10-v1.2-broccoli/* /Volumes/CARD10/`
-* Eject your device (if you're doing this in the command line: don't forget the `sync` on linux)
+{{% notice info %}}
+If your card10 reboots during this operation, use the bootloader to copy the files as explained [here](/userguide/general-usage#bootloader-fix)!
+{{% /notice %}}
+* Eject your device (if you're doing this in the command line: don't forget to run `sync` on Linux)
 * Switch your card10 off and on again
 
 ---
 
-# Experimental Releases
+## Experimental Releases
 
 These releases are untested and must be considered faulty. Always create a backup of the files on your
 card10 before applying them. Please follow the steps mentioned above.
 
-- [Exposure Notifications](/en/exposure_notifications): https://card10.badge.events.ccc.de/release/card10-exno-r1.zip
+- [Exposure Notifications](/interhacktions/exposure_notifications): https://card10.badge.events.ccc.de/release/card10-exno-r1.zip
   - Important: New Bluetooth bondings can only be made with the "Bluetooth" app active.
 
 ---
 
-# Previous Releases
-# Nettle (2019-12-29)
+## Previous Releases
+### Nettle (2019-12-29)
 - Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.14-Nettle.zip
 - [Changelog](https://git.card10.badge.events.ccc.de/card10/firmware/blob/master/CHANGELOG.md#v114-2019-12-29-nettle)
 
diff --git a/en/gitlab.md b/firmware/gitlab.md
similarity index 100%
rename from en/gitlab.md
rename to firmware/gitlab.md
diff --git a/en/hardware-overview.md b/hardware/_index.md
similarity index 87%
rename from en/hardware-overview.md
rename to hardware/_index.md
index e08df6026f71689f7af1ab3ef6fe9eda8e4854b0..42224018a96da2de1b5bf0e6113a41bafc248c8c 100644
--- a/en/hardware-overview.md
+++ b/hardware/_index.md
@@ -1,5 +1,6 @@
 ---
-title: Hardware Overview
+title: Hardware
+weight: 40
 ---
 
 Our reconstruction of the card10 badge consists of three things:
@@ -47,7 +48,7 @@ More information to come.
 
 The Fundamental Board is located just above the wristband; above it comes the battery, the Harmonic Board, and the display. The Harmonic Board is connected to the Fundamental Board via a board to board connector.
 
-Several interfaces for [interhacktions](/en/interhacktions) are included on the Fundamental Board. The travelers can be alerted to an event using the vibration motor. Screws through the ECG contacts are used both for attaching the wristband and for making contact with your skin for ECG measurements. Besides its use for interhacktions, the [USB-C](/en/usbc) connector is also used for charging the battery and for updating the firmware.
+Several interfaces for [interhacktions](/interhacktions/) are included on the Fundamental Board. The travelers can be alerted to an event using the vibration motor. Screws through the ECG contacts are used both for attaching the wristband and for making contact with your skin for ECG measurements. Besides its use for interhacktions, the [USB-C](/hardware/usbc/) connector is also used for charging the battery and for updating the firmware.
 
 A PDF version of the schematic of the Fundamental Board is available [here](https://git.card10.badge.events.ccc.de/card10/hardware/blob/master/boards/Fundamental-Board/Fundamental-Board.pdf)
 
diff --git a/de/accessories.md b/hardware/accessories.de.md
similarity index 70%
rename from de/accessories.md
rename to hardware/accessories.de.md
index c404e0b69b23f4d2bf5154c0b6f5054571cbd543..d974b4089ea42dedf843fe3e5e4b2b16fba293c0 100644
--- a/de/accessories.md
+++ b/hardware/accessories.de.md
@@ -1,6 +1,7 @@
-```
-Title: Accessories
-```
+---
+title: Accessories
+hidden: true
+---
 
 ## Gehäuse
 
diff --git a/hardware/accessories.md b/hardware/accessories.md
new file mode 100644
index 0000000000000000000000000000000000000000..b33f84729ad626c7b28ef58b8dcd84cc02dc4930
--- /dev/null
+++ b/hardware/accessories.md
@@ -0,0 +1,11 @@
+---
+title: Accessories
+---
+
+{{% notice info %}}
+Deutsche Version: [Accessories](../accessories.de)
+{{% /notice %}}
+
+## Cases
+
+- [3d printable cover](https://git.card10.badge.events.ccc.de/card10/cover)
diff --git a/en/mechanical.md b/hardware/mechanical.md
similarity index 89%
rename from en/mechanical.md
rename to hardware/mechanical.md
index b226b9cca2595be54d1b0b87f0f32c4391f95f60..f064ceca7ba09ae464c1dec0a4bb90a7c5cc2695 100644
--- a/en/mechanical.md
+++ b/hardware/mechanical.md
@@ -4,7 +4,7 @@ title: Mechanical Data
 
 Our reconstruction of the card10 badge is made of two 1 mm PCBs, spaced 5 mm apart.
 
-- The [Fundamental Board](/en/hardware-overview/#fundamental-board) is a bit larger than the [Harmonic Board](/en/hardware-overview/#harmonic-board)
+- The [Fundamental Board](/hardware/#fundamental-board) is a bit larger than the [Harmonic Board](/hardware/#harmonic-board)
  - To make sewing the wristband connections easier when the card10 is fully assembled
 - The wirstband is about 34-38 mm wide and 25 - 30 cm long
 - The two PCBs are spaced using three 5 mm brass spacers and one 5 mm nylon spacer
diff --git a/en/usbc.md b/hardware/usbc.md
similarity index 95%
rename from en/usbc.md
rename to hardware/usbc.md
index f3844cac87dc02d316fa4f3aa8a54e8fa9a70f5b..75da18f3737d7e53102874f288b527ef75f0df19 100644
--- a/en/usbc.md
+++ b/hardware/usbc.md
@@ -2,12 +2,12 @@
 title: USB-C
 ---
 
-# General use
+## General use
 
 You will need a USB-C cable to charge your card10. You can also use it as a storage device to read/write files and update software. We plan to provide most of these functions via BLE as well, but a wired connection might still come handy.
 The charging and file transfer works whichever way round the USB-C cable is plugged in.
 
-# Full I/O
+## Full I/O
 
 Traveler reports agree that the badge uses USB-C, the assumption is that this was chosen over Micro-USB for the available range of extra pins. The reconstruction thus has some extra pins available, which would explain several observations of hardware interHacktions using USB-C.
 
@@ -24,18 +24,18 @@ Traveler reports agree that the badge uses USB-C, the assumption is that this wa
 | TX2+     | B2         | Reset               | Pull low to trigger a reset                           |
 | TX2-     | B3         | -                   |                                                       |
 
-# Schematics
+## Schematics
 ![USB-C related schematics section](/media/hardware/usb-c-pinout.png)
 
 **!Caution!** Most USB-C cables available for sale do not connect all pins of the connector. Whilst this is not a problem for general use, if you want to access the full available I/O contacts, it might be best to choose a cable from the suggestions listed at the bottom of the page.
 
 To use full I/O, there is a 'correct side up' for the USB-C cable.
 
-## SWD
-## UART
-## ECG
-External ECG electrodes can be connected via USB-C with a [self-made cable](/en/ecg_kit_assembly/).
-## GPIOs
+### SWD
+### UART
+### ECG
+External ECG electrodes can be connected via USB-C with a [self-made cable](/tutorials/ecg_kit_assembly/).
+### GPIOs
 
 ## 'Confirmed' full pin cable options
 Whilst this list does not guarantee you anything, these cables have been bought before and were found to have all contacts connected:
diff --git a/en/interhacktions.md b/interhacktions/_index.md
similarity index 73%
rename from en/interhacktions.md
rename to interhacktions/_index.md
index 50cd20a721f83b5aa32293b7b683c28e5c58ad27..f315dd1310489e63e7cfac1f895c1069ed82918a 100644
--- a/en/interhacktions.md
+++ b/interhacktions/_index.md
@@ -2,48 +2,48 @@
 title: Interhacktions
 ---
 
-# General considerations
-## Privacy
+## General considerations
+### Privacy
 Do not collect unneeded data. Always ask yourself if you can reduce the amount of needed data further. Avoid keeping logs.
 
-## Different personal space of people
+### Different personal space of people
 Make sure your InterHacktions don't encourage people to grab or otherwise uncomfortly interact with people who did not consent.
 
-## Chirality
+### Chirality
 Some people are left-handed, others are right-handed. Some place a watch below the wrist, some above. When designing user interfaces, bear in mind that the display output may be rotated and buttons may be in a different position than you expect.
 
-## Accessibility
+### Accessibility
 Consider the variability in range of motion, vision, etc. New ideas how menus can be navigated and the HERT2 can become more accessible are very welcome.
 
-# Interfaces
-## Physical
+## Interfaces
+### Physical
 
-### Contacts for sewing or soldering
+#### Contacts for sewing or soldering
 A total of 4 GPIO pins, as well as 3.3V and GND contacts are available for sewing wearable LEDs, sensors, ... onto the wristband.
 
 The pitch of the small holes between the sewable connectors fits a 2.54 mm pin header, so if you rather work with solder than thread, you can use an angled pin header to access the sewable connectors. Additional debugging pins are also available through the small contacts between the five sewable connectors on each side.
 
-### USB-C spare pins
-Besides the usual USB pins, we made some special signals e.g. UART and contacts for attaching ECG probes available on the USB-C connector. You can find more details on the [USB-C](/en/usbc) page.
+#### USB-C spare pins
+Besides the usual USB pins, we made some special signals e.g. UART and contacts for attaching ECG probes available on the USB-C connector. You can find more details on the [USB-C](/hardware/usbc/) page.
 
 
-### Wristband
+#### Wristband
 If the velcro lined wristband doesn't fit your needs, you can use the holes for the sewing contacts or the ECG contacts to attach your own wristband.
 
-### Harmonic Board
+#### Harmonic Board
 The Harmonic Board is a fairly simple 4 layer board, you can make a customized Harmonic Board if you like.
 
-## Wireless Interfaces
-### Bluetooth Low Energy
-Below an overview of BLE interhacktions; for more details see the [ble page](/en/ble)
-#### Badge to badge
-#### Badge to app
-#### Badge to interhactions, latptop, etc.
-#### Mesh
+### Wireless Interfaces
+#### Bluetooth Low Energy
+Below an overview of BLE interhacktions; for more details see the [ble page](/userguide/ble)
+##### Badge to badge
+##### Badge to app
+##### Badge to interhactions, latptop, etc.
+##### Mesh
 
 
-# Software
-## Micropython l0dables
-## c l0dables
-### Air Guitar
-## Files read as a USB drive
+## Software
+### Micropython l0dables
+### c l0dables
+#### Air Guitar
+### Files read as a USB drive
diff --git a/blinkisync.md b/interhacktions/blinkisync.md
similarity index 98%
rename from blinkisync.md
rename to interhacktions/blinkisync.md
index 12fce0391d04c5023c4415063cefc59f2791bde7..08b5832c3daf2f31f0fb62dffc43378128d2daa6 100644
--- a/blinkisync.md
+++ b/interhacktions/blinkisync.md
@@ -1,4 +1,6 @@
-### blinkisync
+---
+title: blinkisync
+---
 
 From firmware version 1.8 you will be able to send and receive text via light with your card10.
 
diff --git a/en/exposure_notifications.md b/interhacktions/exposure_notifications.md
similarity index 97%
rename from en/exposure_notifications.md
rename to interhacktions/exposure_notifications.md
index b0caa0b3c7b9a63fd6417df1b5cde00eb9267ca0..5d42c40e44697935959354763db5f487602b7bb7 100644
--- a/en/exposure_notifications.md
+++ b/interhacktions/exposure_notifications.md
@@ -14,7 +14,7 @@ a Merge Request which implements this functionality. If you have a working toolc
 please try and build this MR, as you will have to most up-to-date version.
 
 If you do not have a working toolchain, you can download a [pre-build image](/release/card10-exno-r1.zip).
-Simply unzip the archive and merge it onto your card10. See the [firmware update page](/en/firmwareupdate) for details. Most importantly
+Simply unzip the archive and merge it onto your card10. See the [firmware update page](/firmware/firmwareupdate) for details. Most importantly
 always use the "safely eject" functionality of your operating system after writing files to the card10.
 
 To use the BLE features of the card10 make sure to enable BLE in the `Bluetooth` app.
diff --git a/de/firstinterhactions.md b/interhacktions/firstinterhacktions.de.md
similarity index 97%
rename from de/firstinterhactions.md
rename to interhacktions/firstinterhacktions.de.md
index 0839664648c84b710c98383713544ebb3725d786..4a0205978715acb1150ea949f0fceedb37483ebb 100644
--- a/de/firstinterhactions.md
+++ b/interhacktions/firstinterhacktions.de.md
@@ -1,11 +1,11 @@
 ---
 title: Erste Interhacktionen
+hidden: true
 ---
 
-
-Hinweis: Die authoritative Seite ist die englische. Wenn du hier etwas inhaltlich änderst, bitte sorge dafür, dass es auch auf der englischen Seite geändert wird. 
-
-# Erste Interhacktionen
+{{% notice info %}}
+Hinweis: Die authoritative Seite ist die englische. Wenn du hier etwas inhaltlich änderst, bitte sorge dafür, dass es auch auf der englischen Seite geändert wird.
+{{% /notice %}}
 
 Die einfachste Art und Weise, um LEDs zum blinken zu bringen, ist, python zu benutzen. Es gibt zwei Möglichkeiten, um Python-Code auszuführen: Entweder du verwendest eine interaktive Python-Kommandozeile oder du speicherst `.py`-Dateien auf dem card10. Die interaktive Kommandozeile ist sehr praktisch, um Python-Kommandos auszuführen und `.py`-Dateien zu debuggen. Wenn du.py-Dateien direkt speicherst, sind die Skripte, die du schreibst auch dann verfügbar, wenn card10 nicht mehr mit deinem Computer verbunden ist.
 
diff --git a/en/firstinterhacktions.md b/interhacktions/firstinterhacktions.md
similarity index 94%
rename from en/firstinterhacktions.md
rename to interhacktions/firstinterhacktions.md
index 1f128fcec5be8cfeded45bbebf07f1c15d57630b..cc8c4680194fb0159e84a7ce5549b9b977c17ec5 100644
--- a/en/firstinterhacktions.md
+++ b/interhacktions/firstinterhacktions.md
@@ -2,6 +2,10 @@
 title: First Interhacktions
 ---
 
+{{% notice info %}}
+Deutsche Version: [Erste Interhacktionen](../firstinterhacktions.de)
+{{% /notice %}}
+
 The easiest way to make some LEDs blink is using python. There are two ways of executing python code: Using an interactive python command line, and saving `.py` files on the card10. The interactive command line is very practical to try out python commands, and debug '.py' files. Directly saving .py files makes the scripts you write available when you have card10 disconnected from your computer.
 
 ## Using the interactive command line
@@ -79,4 +83,4 @@ Once you are satisfied, you can publish it in an official revision. As you impro
 To close a session in screen, press `Ctrl+A` then `k` then `y`.  In picocom, exit using `Ctrl+A`, then `Ctrl+Q`.
 
 ## Congratulations!
-When applying your newly learned card10 skills, please have a look at the [general considerations for designing Interhacktions](/en/interhacktions). Also bear in mind that some blinking patterns have been assigned a special meaning for communicating a traveler's [personal state](/ps).
+When applying your newly learned card10 skills, please have a look at the [general considerations for designing Interhacktions](/interhacktions/). Also bear in mind that some blinking patterns have been assigned a special meaning for communicating a traveler's [personal state](/ps/).
diff --git a/en/logbook/I-O-time-wristband-individual-design.md b/logbook/I-O-time-wristband-individual-design.md
similarity index 100%
rename from en/logbook/I-O-time-wristband-individual-design.md
rename to logbook/I-O-time-wristband-individual-design.md
diff --git a/en/logbook/_index.md b/logbook/_index.md
similarity index 69%
rename from en/logbook/_index.md
rename to logbook/_index.md
index 3f935cc077388b775744ce5f43dbc3d9a03fc414..2c482047164bc5c05b23071facdae0b9c3ea8032 100644
--- a/en/logbook/_index.md
+++ b/logbook/_index.md
@@ -1,8 +1,9 @@
 ---
 title: Logbook
+weight: 60
 ---
 
-#### general 
+## General 
 We got some log entries from travelers that have been to this years camp. As far as we know there will be a badge, people call it card10 and "wear" it on one of their arms and connect via BLE.
 It is documented that we will have been developing a wide range of so called "interhacktions" (loadables) for card10. A lot of the villages at the camp will have so called GIGAs, BLE Devices to spread new interhacktions, host games and connect to travelers.
 To not ruin the future by hiding information that was given to us, we started a wiki (CARD10LOGIX) for everyone to collaborate on ideas for card10.
@@ -10,9 +11,9 @@ To not ruin the future by hiding information that was given to us, we started a
 what travelers will write down in their log-entry at cccamp 2019 will be developed from now on by all of us.
 
 
-# Logbooks
-## [card10-camp-travelers](/en/logbook/card10-camp)
-## [personal time, wristband, individual design](/en/logbook/i-o-time-wristband-individual-design)
-## [personale state LED](/en/logbook/personal-state-led)
-## [topics near by](/en/logbook/topics-near-by)
-## [notifications](/en/logbook/notifications)
+## Logbooks
+### [card10-camp-travelers](/logbook/card10-camp)
+### [personal time, wristband, individual design](/logbook/i-o-time-wristband-individual-design)
+### [personale state LED](/logbook/personal-state-led)
+### [topics near by](/logbook/topics-near-by)
+### [notifications](/logbook/notifications)
diff --git a/en/logbook/card10-camp.md b/logbook/card10-camp.md
similarity index 100%
rename from en/logbook/card10-camp.md
rename to logbook/card10-camp.md
diff --git a/en/logbook/display-own-name.md b/logbook/display-own-name.md
similarity index 100%
rename from en/logbook/display-own-name.md
rename to logbook/display-own-name.md
diff --git a/en/logbook/notifications.md b/logbook/notifications.md
similarity index 94%
rename from en/logbook/notifications.md
rename to logbook/notifications.md
index 87f689283ce3d35a131c37b3f78ec7f05f96504a..2f0039ecd27ae0429cdcfceddad695c3f70774fa 100644
--- a/en/logbook/notifications.md
+++ b/logbook/notifications.md
@@ -3,11 +3,11 @@ title: Notifications
 ---
 
 
-# Overview:
+## Overview:
 
 Android notifications can be intercepted and sent to the card10 to be displayed there
 
-# Firmware support:
+## Firmware support:
 - The badge can receive notifications via BLE and display them
 - It is possible to trigger the  vibration motor with a notification
 - It is possible to define on the Android side how the motor vibrates
@@ -18,7 +18,7 @@ Android notifications can be intercepted and sent to the card10 to be displayed
 — For example: If the notification is a call notification: The user can reject or take that call
 — In general: pressing a button opens the application on the users phone
 
-# Data Format:
+## Data Format:
 - Protobufs are used  to encode these notifications to the badge
 
 
diff --git a/en/logbook/personal-state-led.md b/logbook/personal-state-led.md
similarity index 100%
rename from en/logbook/personal-state-led.md
rename to logbook/personal-state-led.md
diff --git a/en/logbook/topics-near-by.md b/logbook/topics-near-by.md
similarity index 96%
rename from en/logbook/topics-near-by.md
rename to logbook/topics-near-by.md
index bb0ef15066163812052eb1642671f8cfa5a143d3..d18144251f5e9b8daf0ea6f1dcd4f934471f9176 100644
--- a/en/logbook/topics-near-by.md
+++ b/logbook/topics-near-by.md
@@ -26,4 +26,4 @@ Additionally there could be a privacy friendly way to announce personal topics v
 * There could be a way to find other people with same topics.
 * If I try to contact a person with a similar topic, this person should be able to anonymously decline the the contact before we are "matched"
 * There needs to be a way to find that person if we get matched. Maybe the LEDs on our badges show the same randomly generated pattern and we raise our badge wearing arm to find each other.
-* other peoples interests shouldn't be discoverable if they set their [personal state leds](/en/logbook/personal-state-led.md) to a non-communicative state
+* other peoples interests shouldn't be discoverable if they set their [personal state leds](/logbook/personal-state-led) to a non-communicative state
diff --git a/en/maintenance/_index.md b/maintenance/_index.md
similarity index 90%
rename from en/maintenance/_index.md
rename to maintenance/_index.md
index ae368701953b565641aead3cd6a56df1d936ebcc..d69bfe8b13fd66f39605b90cf7029eb45302b5d7 100644
--- a/en/maintenance/_index.md
+++ b/maintenance/_index.md
@@ -1,5 +1,6 @@
 ---
-title: Maintenance and Repair Instructions
+title: Maintenance & Repair
+weight: 20
 ---
 
 An important aspect of open hardware is that you have the information you need so you can fix it - if you have the skills to do so.
diff --git a/en/maintenance/display.md b/maintenance/display.md
similarity index 100%
rename from en/maintenance/display.md
rename to maintenance/display.md
diff --git a/en/maintenance/filesystem.md b/maintenance/filesystem.md
similarity index 100%
rename from en/maintenance/filesystem.md
rename to maintenance/filesystem.md
diff --git a/other/_index.md b/other/_index.md
new file mode 100644
index 0000000000000000000000000000000000000000..a375951e4da46d3e7f01da102b6515271f0abee6
--- /dev/null
+++ b/other/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Other"
+---
+
diff --git a/en/card10exchange.md b/other/card10exchange.md
similarity index 50%
rename from en/card10exchange.md
rename to other/card10exchange.md
index a573a751e241e20c9289bd9ff799ea785930ac9d..d74b02225a797f009f12c7a829852a9613000a7b 100644
--- a/en/card10exchange.md
+++ b/other/card10exchange.md
@@ -1,4 +1,6 @@
-# card10 exchange point
+---
+title: card10 exchange point
+---
 
 ## I have a card10badge to give away
 
@@ -8,4 +10,4 @@
 
 ## I'm looking for a card10badge
 
-- [LordBonzi](https://twitter.com/LordBonzi)
\ No newline at end of file
+- [LordBonzi](https://twitter.com/LordBonzi)
diff --git a/en/tutorials/_index.md b/tutorials/_index.md
similarity index 75%
rename from en/tutorials/_index.md
rename to tutorials/_index.md
index 902d254147b6286ea23185842a375807af7e6fb3..e27653a1aa6d60869e25d6daeeba4b574fc85d9b 100644
--- a/en/tutorials/_index.md
+++ b/tutorials/_index.md
@@ -11,12 +11,12 @@ title: Tutorials
 ## E-textile
 
 * Photo tutorial for the E-textile card10 workshop at CCCam19 by plusea https://flickr.com/photos/plusea/albums/72157710505658161
-* Tutorial for sewable RGB LEDs (LilyPad Pixel Board): [Sewable RGB LEDs Tutorial](/en/tutorials/sewable_leds)
+* Tutorial for sewable RGB LEDs (LilyPad Pixel Board): [Sewable RGB LEDs Tutorial](/tutorials/sewable_leds)
 
 ## ECG
 
-* ECG kit assembly https://card10.badge.events.ccc.de/en/ecg_kit_assembly/
+* ECG kit assembly https://card10.badge.events.ccc.de/tutorials/ecg_kit_assembly
 
 ## Maintenance and repairs
 
-We dedicated a separate section of card10logix to repair work for the maintenance of your card10: https://card10.badge.events.ccc.de/en/maintenance
+We dedicated a separate section of card10logix to repair work for the maintenance of your card10: https://card10.badge.events.ccc.de/maintenance
diff --git a/en/ecg/.gitkeep b/tutorials/ecg/.gitkeep
similarity index 100%
rename from en/ecg/.gitkeep
rename to tutorials/ecg/.gitkeep
diff --git a/en/ecg/_index.md b/tutorials/ecg/_index.md
similarity index 97%
rename from en/ecg/_index.md
rename to tutorials/ecg/_index.md
index fe6079b22939d690b1558540f18ab64a81f26031..0240103f5ca60db2a65b0526682a750e74a25894 100644
--- a/en/ecg/_index.md
+++ b/tutorials/ecg/_index.md
@@ -1,4 +1,6 @@
-# How to use the ECG
+---
+title: How to use the ECG
+---
 
 Here's some basic info on how to use the ECG functionality of your card10
 
diff --git a/en/ecg/bottom_5-6.jpg b/tutorials/ecg/bottom_5-6.jpg
similarity index 100%
rename from en/ecg/bottom_5-6.jpg
rename to tutorials/ecg/bottom_5-6.jpg
diff --git a/en/ecg/side_front_7-8.jpg b/tutorials/ecg/side_front_7-8.jpg
similarity index 100%
rename from en/ecg/side_front_7-8.jpg
rename to tutorials/ecg/side_front_7-8.jpg
diff --git a/en/ecg/top_1-4.jpg b/tutorials/ecg/top_1-4.jpg
similarity index 100%
rename from en/ecg/top_1-4.jpg
rename to tutorials/ecg/top_1-4.jpg
diff --git a/en/ecg_kit_assembly.md b/tutorials/ecg_kit_assembly.md
similarity index 100%
rename from en/ecg_kit_assembly.md
rename to tutorials/ecg_kit_assembly.md
diff --git a/de/gettingstarted.md b/tutorials/gettingstarted.de.md
similarity index 94%
rename from de/gettingstarted.md
rename to tutorials/gettingstarted.de.md
index cc33c255f63c718ff7ccc11bfca95c751337948b..22c4c8417b159024a59b9e7cccc63fa377280e4c 100644
--- a/de/gettingstarted.md
+++ b/tutorials/gettingstarted.de.md
@@ -1,14 +1,13 @@
 ---
 title: Los gehts!
+hidden: true
 ---
 
-# Los geht's!
-
 Du hast also gerade dein card10 bekommen. Und jetzt?
 
 ## card10 zusammen bauen
 
-[Hier](/en/assembleyourcard10) ist eine schritt-für-schritt-anleitung mit Bildern, um dein card10 zusammen zu bauen.
+[Hier](/userguide/assembly.de) ist eine schritt-für-schritt-anleitung mit Bildern, um dein card10 zusammen zu bauen.
 
 ## card10 navigation
 Es gibt vier Knopfe auf dem card10 _harmonic_ board: Oben links, direkt über dem USB-C-Connector ist der POWER-Knopf. Darunter ist der LEFT Knopf. Die Knöpfe auf der rechten Seite sind näher beieinander. Auf dieser Seite ist der obere Knopf der SELECT-Knopf und der untere der RIGHT Knopf.
@@ -41,7 +40,7 @@ Diese App zeigt dienen Nickname an..
 
 Die [hatchery](https://badge.team/) bietet weitere Apps, die andere card10-Nutzer geschrieben haben. Um die Apps auf Deinen card10 zu bekommen,
 kannst Du entweder die [App](/app) installieren oder Du lädst sie selbst auf den USB-Massenspeicher: Lade die `tar.gz`-Dateien herunter und entpacke sie (oder lade alle Dateien einzeln). 
-Versetze Deinen card10 in den [USB-Massenspeicher-Modus](/en/gettingstarted#usb-storage-mode) und kopiere die Dateien dorthin.
+Versetze Deinen card10 in den [USB-Massenspeicher-Modus](/userguide/general-usage/#installing-apps-via-usb) und kopiere die Dateien dorthin.
 Alle Apps sind im `apps`-Ordner abgelegt. Im `apps`-Ordner hat jede App ihren eigenen Ordner, benannt nach dem App-Namen (z.B. `apps/app_name`). Um eine neue App hinzuzufügen, erstelle einen neuen Ordner mit dem Namen der App und lege alle Dateien der App dort ab!
 
 ### BLE aktivieren
diff --git a/en/gettingstarted.md b/tutorials/gettingstarted.md
similarity index 74%
rename from en/gettingstarted.md
rename to tutorials/gettingstarted.md
index f4f9b1181b05090ea5c43ea097e13a717f53ff0f..e484dd2ed918ab6447eabd007a42e3c6fd762b77 100644
--- a/en/gettingstarted.md
+++ b/tutorials/gettingstarted.md
@@ -2,15 +2,19 @@
 title: Getting Started
 ---
 
+{{% notice info %}}
+Deutsche Version: [Los geht’s!](../gettingstarted.de)
+{{% /notice %}}
+
 You just received your card10 - what now?
 
 ## card10 assembly
 
-[Here](/en/userguide/assemble)'s a step by step guide with a video and pictures for assembling your card10
+[Here](/userguide/assemble)'s a step by step guide with a video and pictures for assembling your card10
 
 ## User guide
 
-Have a look at the [General Usage](../userguide/general-usage) section of the [User Guide](../userguide). It will tell you how to:
+Have a look at the [General Usage](/userguide/general-usage) section of the [User Guide](/userguide). It will tell you how to:
  - Switch the card10 on and off
  - Navigate the menu
  - Install new apps
@@ -36,4 +40,4 @@ For better results use [USB-C electrodes](../ecg_kit_assembly/)
 
 ## Next
 Now it is time to start playing with the card10, writing your own micropython code!
-Continue in the [first interhacktions](/en/firstinterhacktions) section.
+Continue in the [first interhacktions](/interhacktions/firstinterhacktions) section.
diff --git a/en/tutorials/sewable_leds.md b/tutorials/sewable_leds.md
similarity index 98%
rename from en/tutorials/sewable_leds.md
rename to tutorials/sewable_leds.md
index 1be307976056ca2b07f51c206e56b3d86f10ffca..8333c6c62e65008f2f33f886029e50c90bc0ff3f 100644
--- a/en/tutorials/sewable_leds.md
+++ b/tutorials/sewable_leds.md
@@ -49,7 +49,7 @@ The card10 firmware has support for the type of LED which the LilyPad Pixel Boar
 ### Quick start
 
  - Connect your card10 via USB
- - Open a serial console to your card10 (see [First Interhacktions](/en/firstinterhacktions/) for details)
+ - Open a serial console to your card10 (see [First Interhacktions](/interhacktions/firstinterhacktions/) for details)
  - Press Ctrl+C to stop the current application
  - Type the following code (replacing `gpio.WRISTBAND_1` with the pin you are using:
 
diff --git a/en/userguide/_index.md b/userguide/_index.md
similarity index 93%
rename from en/userguide/_index.md
rename to userguide/_index.md
index 966eea01dc765fcaf47506cf2146c36cc29a6f37..3ef32f30e2204a78973673f4be45430679f8b1a8 100644
--- a/en/userguide/_index.md
+++ b/userguide/_index.md
@@ -1,8 +1,11 @@
 ---
 title: User Guide
+weight: 10
 ---
 
-# **THIS USER GUIDE IS IN ITS EARLY STATE OF CONSTRUCTION. IT IS INCOMPLETE. **
+{{% notice warning %}}
+THIS USER GUIDE IS IN ITS EARLY STATE OF CONSTRUCTION. IT IS INCOMPLETE.
+{{% /notice %}}
 
 The user guide of the card10 is divided into a few sections. Here is an overview of the different sections and what they cover:
 
diff --git a/en/userguide/_index.md.bak b/userguide/_index.md.bak
similarity index 100%
rename from en/userguide/_index.md.bak
rename to userguide/_index.md.bak
diff --git a/de/assembleyourcard10.md b/userguide/assembly.de.md
similarity index 96%
rename from de/assembleyourcard10.md
rename to userguide/assembly.de.md
index 1152a0029c2fe474473caec12267ececb4c4c74d..2ed2af51d115740bc2f3454c7c0ebacf5b0caceb 100644
--- a/de/assembleyourcard10.md
+++ b/userguide/assembly.de.md
@@ -1,12 +1,13 @@
 ---
 title: Das card10 zusammenbauen
+hidden: true
 ---
 
 Dein card10 kommt mit all seinen Komponenten und einem [flyer/booklet/Handbuch](/media/assembly_flyer.pdf). Du kannst dir ausserdem unser Zusammenbau-[video-tutorial](/vid/) anschauen.
 
 Die Hauptkomponenten deines Card10 sind zwei elektronische Boards, das _fundamental_-Board und das _harmonic_-Board.
 Das _fundamental_-Board sitzt direkt auf dem Armband, das _harmonic_-Board sitzt darüber.
-Wenn du mehr über die Boards lernen willst, kannst du eine detailliertere Beschreibung auf der [Hardware-Übersicht](/en/hardware-overview/)-Seite finden.
+Wenn du mehr über die Boards lernen willst, kannst du eine detailliertere Beschreibung auf der [Hardware-Übersicht](/hardware)-Seite finden.
 Wenn du die Tüte auspackst und das Board zusammensetzt, sorge dafür dass die Schutzfolie auf dem Display bleibt, bis du dir die Sektion zu 
 [polarisierenden Displays](/de/faq/#why-should-i-consider-keeping-the-protective-foil-on-the-display) in der FAQ angeschaut hast.
 
diff --git a/en/userguide/assembly.md b/userguide/assembly.md
similarity index 95%
rename from en/userguide/assembly.md
rename to userguide/assembly.md
index c1d48ded43c071919353e41302e890f5e271e3f4..e2c9d99da47e78446726d76ad1eba9584e789a54 100644
--- a/en/userguide/assembly.md
+++ b/userguide/assembly.md
@@ -1,6 +1,10 @@
 ---
-title: "0: Assembly"
+title: "Assembly"
+weight: 10
 ---
+{{% notice info %}}
+Deutsche Version: [Das card10 zusammenbauen](../assembly.de)
+{{% /notice %}}
 
 Your card10 comes in a bag with all its components and a [flyer/booklet/manual](/media/assembly_flyer.pdf).
 
diff --git a/en/userguide/ble.md b/userguide/ble.md
similarity index 98%
rename from en/userguide/ble.md
rename to userguide/ble.md
index 923a2d586051d97667d3373de330bcb4442d6059..bb204497b5577b7b759b017f53ad14a0ed69c3ed 100644
--- a/en/userguide/ble.md
+++ b/userguide/ble.md
@@ -1,5 +1,6 @@
 ---
-title: "2: Bluetooth Low Energy (BLE)"
+title: "Bluetooth Low Energy (BLE)"
+weight: 30
 ---
 
 BLE is a low power (and low throughput) radio communication standard. Currently the card10 only implements the peripheral role and can be connected to one other device at a time. The other device acts as the central and is usually a smartphone or a regular computer.
@@ -36,7 +37,7 @@ To create a pairing open the `Bluetooth` app:
 Your card10 is now in pairing mode and can be seen by other devices. You can use the `card10companion` on Android or the system dialog of other devices to find your card10 and start the pairing process:
 
 Android:
-{{< figure src="/media/ug/2-ble-android-1.png" link="/media/ug/2-ble-android-1.png" width="300px">}}
+{{< figure src="/media/ug/2-ble-android-1.png" link="/media/ug/2-ble-android-1.png" width="300px" >}}
 iOS:
 card10companion:
 
diff --git a/userguide/cases.md b/userguide/cases.md
new file mode 100644
index 0000000000000000000000000000000000000000..b8a05984a578a34f03de3ff8c05c58060a3c5d0f
--- /dev/null
+++ b/userguide/cases.md
@@ -0,0 +1,6 @@
+---
+title: "Cases"
+weight: 70
+---
+
+
diff --git a/userguide/ecg.md b/userguide/ecg.md
new file mode 100644
index 0000000000000000000000000000000000000000..26a3f1f80c7d536ac4937d7ef556396d4f03ed14
--- /dev/null
+++ b/userguide/ecg.md
@@ -0,0 +1,6 @@
+---
+title: "ECG usage"
+weight: 60
+---
+
+
diff --git a/en/userguide/general-usage.md b/userguide/general-usage.md
similarity index 97%
rename from en/userguide/general-usage.md
rename to userguide/general-usage.md
index 5b41c9c7ab8a6ddeabbb45f39fac60f751534148..cff30ebc186ca873169201b42d0570f8a8aff843 100644
--- a/en/userguide/general-usage.md
+++ b/userguide/general-usage.md
@@ -1,5 +1,6 @@
 ---
-title: "1: General Usage"
+title: "General Usage"
+weight: 20
 ---
 
 ## Buttons
@@ -66,7 +67,13 @@ Press the `POWER` button to enter the menu and navigate to `USB Storage`. Then u
 [![Going to standby](/media/ug/1-usb-storage.jpg)](/media/ug/1-usb-storage.jpg)
 [![Going to standby](/media/ug/1-usb-active.jpg)](/media/ug/1-usb-active.jpg)
 
+{{< rawhtml >}}
+<div id="bootloader-fix"></div>
+{{< /rawhtml >}}
+
+{{% notice info %}}
 If you don't have a `USB Storage` menu entry or your card10 reboots while using it, you can also use the bootloader to access your card10: First put your card10 into [standby](#going-to-standby) with a long press of the `POWER` button. Next, hold down the `RIGHT/DOWN` button and press the `POWER` button, until your display shows the text "USB activated. Ready.". Use your operating systems "Eject Safely" function or press the POWER button again to exit the bootloader after you are done.
+{{% /notice %}}
 
 You can now use your computer to access the internal file system of the card10. The `apps` folder contains all applications which are installed on the card10. The card10 comes with a few applications already pre-installed which you can find as well in the `apps` folder.
 
diff --git a/en/userguide/menu-system.md b/userguide/menu-system.md
similarity index 97%
rename from en/userguide/menu-system.md
rename to userguide/menu-system.md
index 486bac24d51853650af363272d74bb51cb7beeea..9d56894ae31092500e94337bcea68abae5747121 100644
--- a/en/userguide/menu-system.md
+++ b/userguide/menu-system.md
@@ -1,5 +1,6 @@
 ---
-title: "3: The menu system"
+title: "The menu system"
+weight: 40
 ---
 
 ## Selecting a default app
diff --git a/userguide/watch.md b/userguide/watch.md
new file mode 100644
index 0000000000000000000000000000000000000000..a993ac895380beb5b0718d270156e16f9e4fe2f4
--- /dev/null
+++ b/userguide/watch.md
@@ -0,0 +1,6 @@
+---
+title: "Watch usage"
+weight: 50
+---
+
+
diff --git a/vid.md b/vid.md
new file mode 100644
index 0000000000000000000000000000000000000000..c0c131ad130743c6b2d846a3ec7035acc37ab3db
--- /dev/null
+++ b/vid.md
@@ -0,0 +1,5 @@
+---
+title: Assembly Video
+---
+
+This page has moved to the [User Guide](/userguide/assembly)
diff --git a/vid/_index.md b/vid/_index.md
deleted file mode 100644
index c2c40ae3c5d29d987bd000450bcd84a7cf65de75..0000000000000000000000000000000000000000
--- a/vid/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Assembly Video
----
-
-This page has moved to the [User Guide](/en/userguide/assembly)