diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56c25d0..dd8671b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v0.4.0 - Feb 7, 2020
+
+### Changes
+
+* Reorganise the DNS records to improve the visibility
+* Add a `TXT` record to get the domain verified by GitHub
+
 ## v0.3.0 - Feb 7, 2020
 
 ### Changes
diff --git a/dns-records.tf b/dns-records.tf
index 613dd24..0afaca5 100644
--- a/dns-records.tf
+++ b/dns-records.tf
@@ -2,6 +2,9 @@ locals {
   zone = "zerowastesgp.fr"
 
   dns_records = [
+    # -------------------------------------------------- #
+    # DNS zone configuration
+    # -------------------------------------------------- #
     {
       name = ""
       type = "NS"
@@ -11,14 +14,6 @@ locals {
         "ns100.ovh.net.",
       ]
     },
-    {
-      name = ""
-      type = "MX"
-      ttl  = 0,
-      targets = [
-        "1 redirect.ovh.net.",
-      ]
-    },
     # See https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-an-apex-domain.
     {
       name = ""
@@ -31,12 +26,24 @@ locals {
         "185.199.111.153",
       ]
     },
+    # https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-a-subdomain.
+    {
+      name = "www"
+      type = "CNAME"
+      ttl  = 0,
+      targets = [
+        "zerowastesgp.github.io.",
+      ]
+    },
+    # -------------------------------------------------- #
+    # Email configuration
+    # -------------------------------------------------- #
     {
       name = ""
-      type = "SPF"
-      ttl  = 600,
+      type = "MX"
+      ttl  = 0,
       targets = [
-        "\"v=spf1 include:mx.ovh.com ~all\"",
+        "1 redirect.ovh.net.",
       ]
     },
     {
@@ -56,15 +63,15 @@ locals {
       ]
     },
     {
-      name = "_autodiscover._tcp"
-      type = "SRV"
+      name = "mail"
+      type = "CNAME"
       ttl  = 0,
       targets = [
-        "0 0 443 mailconfig.ovh.net.",
+        "ssl0.ovh.net.",
       ]
     },
     {
-      name = "imap"
+      name = "pop3"
       type = "CNAME"
       ttl  = 0,
       targets = [
@@ -72,15 +79,15 @@ locals {
       ]
     },
     {
-      name = "_imaps._tcp"
-      type = "SRV"
+      name = "imap"
+      type = "CNAME"
       ttl  = 0,
       targets = [
-        "0 0 993 ssl0.ovh.net.",
+        "ssl0.ovh.net.",
       ]
     },
     {
-      name = "mail"
+      name = "smtp"
       type = "CNAME"
       ttl  = 0,
       targets = [
@@ -88,19 +95,19 @@ locals {
       ]
     },
     {
-      name = "pop3"
-      type = "CNAME"
+      name = "_autodiscover._tcp"
+      type = "SRV"
       ttl  = 0,
       targets = [
-        "ssl0.ovh.net.",
+        "0 0 443 mailconfig.ovh.net.",
       ]
     },
     {
-      name = "smtp"
-      type = "CNAME"
+      name = "_imaps._tcp"
+      type = "SRV"
       ttl  = 0,
       targets = [
-        "ssl0.ovh.net.",
+        "0 0 993 ssl0.ovh.net.",
       ]
     },
     {
@@ -111,13 +118,23 @@ locals {
         "0 0 465 ssl0.ovh.net.",
       ]
     },
-    # https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-a-subdomain.
     {
-      name = "www"
-      type = "CNAME"
+      name = ""
+      type = "SPF"
+      ttl  = 600,
+      targets = [
+        "\"v=spf1 include:mx.ovh.com ~all\"",
+      ]
+    },
+    # -------------------------------------------------- #
+    # Domain verification
+    # -------------------------------------------------- #
+    {
+      name = "_github-challenge-zerowastesgp"
+      type = "TXT"
       ttl  = 0,
       targets = [
-        "zerowastesgp.github.io.",
+        "\"c50ef36f27\"",
       ]
     },
   ]
diff --git a/examples/.gitkeep b/examples/.gitkeep
deleted file mode 100644
index e69de29..0000000