diff --git a/FAQ.md b/FAQ.md
index bf1145b..fa8bd74 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,6 +1,6 @@
 ## How do I connect to DN42?
 
-We have a [page](/howto/Getting-started) for that!
+We have a [page](/howto/Getting-Started) for that!
 
 
 ### What BGP daemon should I use?
diff --git a/contact.md b/contact.md
index 0b0260f..a78793f 100644
--- a/contact.md
+++ b/contact.md
@@ -2,7 +2,7 @@
 
 Members of the dn42 network mostly communicate via IRC or the mailing list.
 
-If you would like to contact an individual network operator, you will find contact information in the [Whois](/Whois) registry.
+If you would like to contact an individual network operator, you will find contact information in the [Whois](/services/Whois) registry.
 
 ## Mailing list
 
@@ -15,7 +15,7 @@ If you would like to contact an individual network operator, you will find conta
 
 Channel #dn42 in [hackint](http://www.hackint.eu/)
 
-See [IRC](/IRC) too.
+See [IRC](/services/IRC) too.
 
 ## Telegram
 
diff --git a/howto/EdgeOS-Config.md b/howto/EdgeOS-Config.md
index a398282..7e212e5 100644
--- a/howto/EdgeOS-Config.md
+++ b/howto/EdgeOS-Config.md
@@ -11,8 +11,8 @@ This document describes some possibilities for connecting to dn42 using an Ubiqu
 
 ## First Steps
 
-1. Create the required objects in the Registry - see [Getting Started](/Getting-Started) 
-2. Find a peer - ask nicely in [IRC](/IRC)!
+1. Create the required objects in the Registry - see [Getting Started](/howto/Getting-Started) 
+2. Find a peer - ask nicely in [IRC](/services/IRC)!
 3. Get the following details:
     * Tunnel configuration (OpenVPN, IPsec, QuickTun)
     * AS numbers 
diff --git a/howto/GRE-plus-IPsec.md b/howto/GRE-plus-IPsec.md
index 077bcc0..8efb71b 100644
--- a/howto/GRE-plus-IPsec.md
+++ b/howto/GRE-plus-IPsec.md
@@ -25,10 +25,10 @@
 * At least one peer should operate his own (Sub-)CA.
 
 ## How to configure a GRE tunnel on FreeBSD
-See [GRE on FreeBSD](gre-on-freebsd).
+See [GRE on FreeBSD](GRE-on-FreeBSD).
 
 ## How to configure IPsec on FreeBSD
-See [IPsec on FreeBSD](ipsec-on-freebsd).
+See [IPsec on FreeBSD](IPsec-on-FreeBSD).
 
 ## How to configure GRE + IPsec on Debian
-See [GRE + IPsec on Debian](gre-plus-ipsec-debian).
+See [GRE + IPsec on Debian](IPsecWithPublicKeys/GRE-plus-IPsec-Debian).
diff --git a/howto/Getting-Started.md b/howto/Getting-Started.md
index 0f09d7b..bd693c2 100644
--- a/howto/Getting-Started.md
+++ b/howto/Getting-Started.md
@@ -313,9 +313,9 @@ There is some documentation in this wiki, like [gre-plus-ipsec](GRE-plus-IPsec).
 
 ## Running a routing daemon
 
-You need a routing daemon to speak BGP with your peers. People usually run Quagga or Bird, but you may use anything (OpenBGPD, XORP, somebody even used an old [hardware router](bgp-on-extreme-summit1i) ).  See the relevant [FAQ entry](/FAQ#frequently-asked-questions_what-bgp-daemon-should-i-use).
+You need a routing daemon to speak BGP with your peers. People usually run Quagga or Bird, but you may use anything (OpenBGPD, XORP, somebody even used an old [hardware router](BGP-on-Extreme-Summit1i) ).  See the relevant [FAQ entry](/FAQ#frequently-asked-questions_what-bgp-daemon-should-i-use).
 
-You can find [configuration examples for Bird here](bird).
+You can find [configuration examples for Bird here](Bird).
 
 ## Configuration Examples
 
@@ -337,7 +337,7 @@ You can find [configuration examples for Bird here](bird).
 
 # Configure DNS
 
-See [Services DNS](/Services/DNS).
+See [Services DNS](/services/DNS).
 
 # Use and provide services
 
diff --git a/howto/IPsecWithPublicKeys/RacoonExample.md b/howto/IPsecWithPublicKeys/RacoonExample.md
index 7514dd0..669320b 100644
--- a/howto/IPsecWithPublicKeys/RacoonExample.md
+++ b/howto/IPsecWithPublicKeys/RacoonExample.md
@@ -1,6 +1,6 @@
 Quote from #dn42: `hexa: nobody runs racoon on their free will :)`.
 
-See also [strongswan](howto/IPsecWithPublicKeys/strongSwan5Example)
+See also [strongSwan](/howto/IPsecWithPublicKeys/strongSwan5Example)
 
 The keys are generated with plainrsa-gen.
 
@@ -40,4 +40,4 @@ remote 192.168.255.2 {
 
 ## Se also
 
-[debian specific configuration](IPsecWithPublicKeys/GRE plus IPsec Debian)
+[Debian specific configuration](/howto/IPsecWithPublicKeys/GRE-plus-IPsec-Debian)
diff --git a/howto/IPv6.md b/howto/IPv6.md
index 7691fce..c2a0939 100644
--- a/howto/IPv6.md
+++ b/howto/IPv6.md
@@ -16,7 +16,7 @@ If you're already running IPv4 on DN42, here's how to get started:
  * ???
  * Profit!
 
-If not, you can follow the instructions on the [Getting Started](GettingStarted) page, as they'll mostly apply to IPv6 aswell.
+If not, you can follow the instructions on the [Getting Started](Getting-Started) page, as they'll mostly apply to IPv6 aswell.
 
 ## What can i do on DN42-v6 ?
 
diff --git a/services/DNS.md b/services/DNS.md
index 807ae88..0f43df8 100644
--- a/services/DNS.md
+++ b/services/DNS.md
@@ -65,5 +65,5 @@ Authoritative DNS for DN42 is provided by the *.delegation-servers.dn42 servers,
 * [dns/Configuration](/services/dns/Configuration) - Forwarder/Resolver configuration examples
 * [New DNS](/services/New-DNS) - current architecture
 * [dns/External-DNS](/services/dns/External-DNS) - external DNS zones from interconnected networks
-* [Old Hierarchical DNS](/Old-Hierarchical-DNS) - deprecated
-* [Original DNS (deprecated)](/Original-DNS-(deprecated)) - deprecated
+* [Old Hierarchical DNS](/services/Old-Hierarchical-DNS) - deprecated
+* [Original DNS (deprecated)](/services/Original-DNS-(deprecated)) - deprecated
diff --git a/services/Distributed-Wiki.md b/services/Distributed-Wiki.md
index 49e65f4..49c4ed2 100644
--- a/services/Distributed-Wiki.md
+++ b/services/Distributed-Wiki.md
@@ -1,7 +1,7 @@
 # this page is outdated and need update
 
 The idea is to deploy mirrors across dn42 using [anycast](https://en.wikipedia.org/wiki/Anycast) addressing (BGP), thus providing redundancy, load-balancing and improved access times to the wiki. Sites are powered by [gollum](https://github.com/gollum/gollum) which has no native SSL support, so Nginx acts as a reverse proxy and handles the encryption.
-The local webserver is monitored with a simple [shell script](/Distributed-Wiki#exabgp_watchdog-script) working [in conjunction](/Distributed-Wiki#exabgp) with [ExaBGP](https://github.com/Exa-Networks/exabgp), announcing/withdrawing the assigned route if the service is up/down.
+The local webserver is monitored with a simple [shell script](Distributed-Wiki#exabgp_watchdog-script) working [in conjunction](Distributed-Wiki#exabgp) with [ExaBGP](https://github.com/Exa-Networks/exabgp), announcing/withdrawing the assigned route if the service is up/down.
 
 ## Prerequisites
 
diff --git a/services/IPv6-Anycast.md b/services/IPv6-Anycast.md
index ef6a93f..0820eab 100644
--- a/services/IPv6-Anycast.md
+++ b/services/IPv6-Anycast.md
@@ -18,7 +18,7 @@ Remember, if you announce an anycast /64, then you need to provide **all** servi
 | internal Wiki          | `fd42:d42:d42:80::1/64`   | TCP/80, TCP/443   |                               |
 
 
-[Providers]: Providing-Anycast-DNS#Persons-providing-anycast-DNS-for-IPv6
+[Providers]: dns/Providing-Anycast-DNS#Persons-providing-anycast-DNS-for-IPv6
 
 ### Future services
 
diff --git a/services/New-DNS.md b/services/New-DNS.md
index 6152f7a..57f6eaa 100644
--- a/services/New-DNS.md
+++ b/services/New-DNS.md
@@ -1,4 +1,4 @@
-After frequent issues with the [Old Hierarchical DNS](/Old-Hierarchical-DNS) system in early 2018, work has started to build a new and more reliable DNS system. The main goals are:
+After frequent issues with the [Old Hierarchical DNS](Old-Hierarchical-DNS) system in early 2018, work has started to build a new and more reliable DNS system. The main goals are:
 * Reliability and Consistency to avoid debugging very obscure issues that are also hard to reproduce.
 * Low maintenance burden on operators.
 * Proper DNSSEC support for everything.
@@ -47,6 +47,6 @@ The set of valid KSKs can be found in the registry.
 
 # See also
 
-* [DNS Quick Start](/DNS)
-* [Old Hierarchical DNS](/Old-Hierarchical-DNS)
-* [Original DNS (deprecated)](/Original-DNS-(deprecated))
+* [DNS Quick Start](DNS)
+* [Old Hierarchical DNS](Old-Hierarchical-DNS)
+* [Original DNS (deprecated)](Original-DNS-(deprecated))
diff --git a/services/Old-Hierarchical-DNS.md b/services/Old-Hierarchical-DNS.md
index 165dcd3..803fd1e 100644
--- a/services/Old-Hierarchical-DNS.md
+++ b/services/Old-Hierarchical-DNS.md
@@ -1,4 +1,4 @@
-This information is now **deprecated**. Please check [New DNS](/New DNS) for the current architecture.
+This information is now **deprecated**. Please check [New DNS](New-DNS) for the current architecture.
 
 ***
 
diff --git a/services/Original-DNS-(deprecated).md b/services/Original-DNS-(deprecated).md
index 419f1e1..b7fe563 100644
--- a/services/Original-DNS-(deprecated).md
+++ b/services/Original-DNS-(deprecated).md
@@ -1,5 +1,5 @@
 # Original DNS (deprecated)
-This information is now **deprecated**. Please check [New DNS](/New DNS) for the current architecture.
+This information is now **deprecated**. Please check [New DNS](New-DNS) for the current architecture.
 
 ***
 
@@ -23,7 +23,7 @@ If you run your own resolver (`unbound`, `dnsmasq`, `bind`), you can configure i
 
 ### Recursive resolver
 
-You may also want to configure your resolver to recursively resolve dn42 domains. For this, you need to find authoritative DNS servers for the `dn42` zone (and for the reverse zones). See [services/dns/Recursive DNS resolver](/services/dns/Recursive DNS resolver).
+You may also want to configure your resolver to recursively resolve dn42 domains. For this, you need to find authoritative DNS servers for the `dn42` zone (and for the reverse zones). See [services/dns/Recursive DNS resolver](/services/dns/Recursive-DNS-resolver).
 
 ### Building the dn42 zones from the registry
 
@@ -35,12 +35,12 @@ The root zone for `dn42.` is built from the [whois registry](/services/Whois). I
 
 ## DNS services for other networks
 
-Other networks are interconnected with dn42 (ChaosVPN, Freifunk, etc). Some of them also provide DNS service, you can configure your resolver to use it. See [External DNS](/External DNS).
+Other networks are interconnected with dn42 (ChaosVPN, Freifunk, etc). Some of them also provide DNS service, you can configure your resolver to use it. See [External DNS](dns/External-DNS).
 
 ## Providing DNS services
 
-See [Providing Anycast DNS](/Providing Anycast DNS).
+See [Providing Anycast DNS](dns/Providing-Anycast-DNS).
 
-## [Old Hierarchical DNS](/Old Hierarchical DNS)
+## [Old Hierarchical DNS](Old-Hierarchical-DNS)
 
 This is a new effort to build a DNS system that mirrors how DNS was designed to work in clearnet. 
diff --git a/services/Whois.md b/services/Whois.md
index cc04593..b8f993a 100644
--- a/services/Whois.md
+++ b/services/Whois.md
@@ -32,7 +32,7 @@ Note that currently, most AS are using one of the legacy ASN range (and will pro
 
 ## DNS zones
 
-dn42 uses the `dn42.` TLD, which is not present in the root DNS zone of the ICANN-net.  For details, see [DNS](/DNS).
+dn42 uses the `dn42.` TLD, which is not present in the root DNS zone of the ICANN-net.  For details, see [DNS](DNS).
 
 Note that other TLDs should also be usable from dn42, most notably from Freifunk and ChaosVPN. A tentative list is available at [External DNS](/services/dns/External-DNS).
 
@@ -57,7 +57,7 @@ The service is provided by [dn42regsrv](https://git.dn42.us/burble/dn42regsrv) w
 
 ## Authentication
 
-See the page on [Registry Authentication](howto/Registry-Authentication)
+See the page on [Registry Authentication](/howto/Registry-Authentication)
 
 # DNS interface
 
diff --git a/services/dns/Providing-Anycast-DNS.md b/services/dns/Providing-Anycast-DNS.md
index 7d70a2d..eeda2ca 100644
--- a/services/dns/Providing-Anycast-DNS.md
+++ b/services/dns/Providing-Anycast-DNS.md
@@ -10,7 +10,7 @@ Configuration requirements for all members of the anycast group are:
  * listen on a unicast IP too for testing/debugging reasons
  * with bind, please use ```minimal-responses yes;``` (goes into ```options```/```view```)
 
-It is _really_ good to hang around in [IRC](/IRC) to get things sorted out, if something doesn't work. Letting some people test your DNS behavior before joining the anycast-group is considered best practice - better safe than sorry.
+It is _really_ good to hang around in [IRC](/services/IRC) to get things sorted out, if something doesn't work. Letting some people test your DNS behavior before joining the anycast-group is considered best practice - better safe than sorry.
 
  * **IP:** 172.23.0.53
  * **Announciation Subnet:** 172.23.0.53/32
diff --git a/services/dns/Recursive-DNS-resolver.md b/services/dns/Recursive-DNS-resolver.md
index 675ba64..52757c3 100644
--- a/services/dns/Recursive-DNS-resolver.md
+++ b/services/dns/Recursive-DNS-resolver.md
@@ -1,6 +1,6 @@
 If you want to run your own recursive DNS server, you must find upstream servers that are authoritative for the dn42 zones.
 
-You may use some servers listed in the [table of anycast servers](/Providing-Anycast-DNS#Persons-providing-anycast-DNS), or just use `172.22.119.160` and `172.22.119.163` (ns{1,2}.fritz.dn42).
+You may use some servers listed in the [table of anycast servers](Providing-Anycast-DNS#Persons-providing-anycast-DNS), or just use `172.22.119.160` and `172.22.119.163` (ns{1,2}.fritz.dn42).
 
 ## Configuration