diff --git a/content/contact.de.html b/content/contact/index.de.html
similarity index 100%
rename from content/contact.de.html
rename to content/contact/index.de.html
diff --git a/content/contact.en.html b/content/contact/index.en.html
similarity index 100%
rename from content/contact.en.html
rename to content/contact/index.en.html
diff --git a/content/generalInformation.de.md b/content/generalinformation/index.de.md
similarity index 100%
rename from content/generalInformation.de.md
rename to content/generalinformation/index.de.md
diff --git a/content/generalInformation.en.md b/content/generalinformation/index.en.md
similarity index 100%
rename from content/generalInformation.en.md
rename to content/generalinformation/index.en.md
diff --git a/content/imprint.de.md b/content/imprint/index.de.md
similarity index 97%
rename from content/imprint.de.md
rename to content/imprint/index.de.md
index bc92d38d..d65aae26 100644
--- a/content/imprint.de.md
+++ b/content/imprint/index.de.md
@@ -9,7 +9,7 @@ Klingerstraße 15\
 
 E-Mail: nextstop@fipguide.org
 
-Kontaktiere uns auch gerne über das [Kontaktformular]({{< relref path="contact.md" >}}).
+Kontaktiere uns auch gerne über das [Kontaktformular]({{< relref path="contact" >}}).
 
 ## Haftungsausschluss
 
diff --git a/content/imprint.en.md b/content/imprint/index.en.md
similarity index 97%
rename from content/imprint.en.md
rename to content/imprint/index.en.md
index d10d0d6a..c2ceb4f4 100644
--- a/content/imprint.en.md
+++ b/content/imprint/index.en.md
@@ -9,7 +9,7 @@ Klingerstraße 15\
 
 Email: nextstop@fipguide.org
 
-Feel free to contact us via the [contact form]({{< relref path="contact.md" >}}).
+Feel free to contact us via the [contact form]({{< relref path="contact" >}}).
 
 ## Disclaimer
 
diff --git a/content/privacy.de.md b/content/privacy/index.de.md
similarity index 100%
rename from content/privacy.de.md
rename to content/privacy/index.de.md
diff --git a/content/privacy.en.md b/content/privacy/index.en.md
similarity index 100%
rename from content/privacy.en.md
rename to content/privacy/index.en.md
diff --git a/content/success.de.html b/content/success/index.de.html
similarity index 65%
rename from content/success.de.html
rename to content/success/index.de.html
index 9c662ca2..cbde1ba1 100644
--- a/content/success.de.html
+++ b/content/success/index.de.html
@@ -3,6 +3,6 @@
 ---
 
 <div>
-    <p>Wir melden uns schnellstmöglich zurück</p>
+    <p>Wir melden uns schnellstmöglich zurück.</p>
     <a href="{{< ref "/" >}}">Zurück zur Startseite</a>
 </div>
diff --git a/content/success.en.html b/content/success/index.en.html
similarity index 62%
rename from content/success.en.html
rename to content/success/index.en.html
index eaa8a276..a79f1358 100644
--- a/content/success.en.html
+++ b/content/success/index.en.html
@@ -3,7 +3,7 @@
 ---
 
 <div>
-    <p>We will get back to you as soon as possible</p>
+    <p>We will get back to you as soon as possible.</p>
     <a href="{{< ref "/" >}}">Back to start page</a>
 
 </div>