diff --git a/exampleSite/content/basics/configuration/_index.en.md b/exampleSite/content/basics/configuration/_index.en.md
index a2fcf964c7..9b03835a06 100644
--- a/exampleSite/content/basics/configuration/_index.en.md
+++ b/exampleSite/content/basics/configuration/_index.en.md
@@ -175,4 +175,4 @@ landingPageName = "<i class='fas fa-home'></i> Home"
 
 The home button is going to look like this:
 
-![Default Home Button](images/home_button_defaults.png?classes=shadow&width=300px)
+![Default Home Button](home_button_defaults.png?classes=shadow&width=300px)
diff --git a/exampleSite/content/basics/configuration/images/home_button_defaults.png b/exampleSite/content/basics/configuration/home_button_defaults.png
similarity index 100%
rename from exampleSite/content/basics/configuration/images/home_button_defaults.png
rename to exampleSite/content/basics/configuration/home_button_defaults.png
diff --git a/exampleSite/content/basics/installation/_index.en.md b/exampleSite/content/basics/installation/_index.en.md
index e540e30f21..884b306dfa 100644
--- a/exampleSite/content/basics/installation/_index.en.md
+++ b/exampleSite/content/basics/installation/_index.en.md
@@ -48,7 +48,7 @@ Discover what this Hugo theme is all about and the core concepts behind it.
 
 renders as
 
-![A Chapter](images/chapter.png?classes=shadow&width=60pc)
+![A Chapter](chapter.png?classes=shadow&width=60pc)
 
 The Relearn theme provides archetypes to create skeletons for your website. Begin by creating your first chapter page with the following command
 
diff --git a/exampleSite/content/basics/installation/images/chapter.png b/exampleSite/content/basics/installation/chapter.png
similarity index 100%
rename from exampleSite/content/basics/installation/images/chapter.png
rename to exampleSite/content/basics/installation/chapter.png
diff --git a/exampleSite/content/basics/requirements/_index.en.md b/exampleSite/content/basics/requirements/_index.en.md
index 65500c41ed..7fe4e4b1cf 100755
--- a/exampleSite/content/basics/requirements/_index.en.md
+++ b/exampleSite/content/basics/requirements/_index.en.md
@@ -8,4 +8,4 @@ Thanks to the simplicity of Hugo, this page is as empty as this theme needs requ
 
 Just download latest version of [Hugo binary](https://gohugo.io/getting-started/installing/) for your OS (Windows, Linux, Mac) : it's that simple.
 
-![Magic](images/magic.gif?classes=shadow)
+![Magic](magic.gif?classes=shadow)
diff --git a/exampleSite/content/basics/requirements/images/magic.gif b/exampleSite/content/basics/requirements/magic.gif
similarity index 100%
rename from exampleSite/content/basics/requirements/images/magic.gif
rename to exampleSite/content/basics/requirements/magic.gif
diff --git a/exampleSite/content/cont/archetypes/_index.en.md b/exampleSite/content/cont/archetypes/_index.en.md
index 0e8c76a4ad..ae3bb170f0 100644
--- a/exampleSite/content/cont/archetypes/_index.en.md
+++ b/exampleSite/content/cont/archetypes/_index.en.md
@@ -13,7 +13,7 @@ The Relearn theme defines some few archetypes of pages but you are free to defin
 
 A **Home** page is the starting page of your project. It's best to have only one page of this kind in your project.
 
-![Home page](images/pages-home.png?classes=shadow&width=60pc)
+![Home page](pages-home.png?classes=shadow&width=60pc)
 
 To create a home page, run the following command
 
@@ -36,7 +36,7 @@ Lorem Ipsum.
 
 A **Chapter** displays a page meant to be used as introduction for a set of child pages. Commonly, it contains a simple title and a catch line to define content that can be found below it.
 
-![Chapter page](images/pages-chapter.png?classes=shadow&width=60pc)
+![Chapter page](pages-chapter.png?classes=shadow&width=60pc)
 
 To create a chapter page, run the following command
 
@@ -62,7 +62,7 @@ Replace the `X` with a number. Because this number will be used to generate the
 
 A **Default** page is any other content page. If you set an unknown archetype in your frontmatter, this archetype will be used to generate the page.
 
-![Default page](images/pages-default.png?classes=shadow&width=60pc)
+![Default page](pages-default.png?classes=shadow&width=60pc)
 
 To create a default page, run either one of the following commands
 
diff --git a/exampleSite/content/cont/archetypes/images/pages-chapter.png b/exampleSite/content/cont/archetypes/pages-chapter.png
similarity index 100%
rename from exampleSite/content/cont/archetypes/images/pages-chapter.png
rename to exampleSite/content/cont/archetypes/pages-chapter.png
diff --git a/exampleSite/content/cont/archetypes/images/pages-default.png b/exampleSite/content/cont/archetypes/pages-default.png
similarity index 100%
rename from exampleSite/content/cont/archetypes/images/pages-default.png
rename to exampleSite/content/cont/archetypes/pages-default.png
diff --git a/exampleSite/content/cont/archetypes/images/pages-home.png b/exampleSite/content/cont/archetypes/pages-home.png
similarity index 100%
rename from exampleSite/content/cont/archetypes/images/pages-home.png
rename to exampleSite/content/cont/archetypes/pages-home.png
diff --git a/exampleSite/content/cont/i18n/_index.en.md b/exampleSite/content/cont/i18n/_index.en.md
index 086f4e74e8..18960daa78 100644
--- a/exampleSite/content/cont/i18n/_index.en.md
+++ b/exampleSite/content/cont/i18n/_index.en.md
@@ -11,7 +11,7 @@ It provides:
 - Automatic menu generation from multilingual content
 - In-browser language switching
 
-![I18n menu](images/i18n-menu.gif?classes=shadow&width=300px)
+![I18n menu](i18n-menu.gif?classes=shadow&width=300px)
 
 ## Basic configuration
 
diff --git a/exampleSite/content/cont/i18n/images/i18n-menu.gif b/exampleSite/content/cont/i18n/i18n-menu.gif
similarity index 100%
rename from exampleSite/content/cont/i18n/images/i18n-menu.gif
rename to exampleSite/content/cont/i18n/i18n-menu.gif
diff --git a/exampleSite/content/cont/pages/_index.en.md b/exampleSite/content/cont/pages/_index.en.md
index d7c63bd39a..d96dac8306 100644
--- a/exampleSite/content/cont/pages/_index.en.md
+++ b/exampleSite/content/cont/pages/_index.en.md
@@ -96,7 +96,7 @@ menuPre = "<i class='fab fa-github'></i> "
 +++
 ```
 
-![Title with icon](images/frontmatter-icon.png?classes=shadow&width=300px)
+![Title with icon](frontmatter-icon.png?classes=shadow&width=300px)
 
 ### Ordering sibling menu/page entries
 
diff --git a/exampleSite/content/cont/pages/images/frontmatter-icon.png b/exampleSite/content/cont/pages/frontmatter-icon.png
similarity index 100%
rename from exampleSite/content/cont/pages/images/frontmatter-icon.png
rename to exampleSite/content/cont/pages/frontmatter-icon.png
diff --git a/exampleSite/content/more/showcase/_index.en.md b/exampleSite/content/more/showcase/_index.en.md
index e10242413a..d2f778e8ae 100644
--- a/exampleSite/content/more/showcase/_index.en.md
+++ b/exampleSite/content/more/showcase/_index.en.md
@@ -4,12 +4,12 @@ title = "Showcase"
 
 ## [GoboLinux Wiki](https://wiki.gobolinux.org/) by NEONsys.org
 
-![GoboLinux image](images/gobolinux.png?width=60pc&classes=shadow)
+![GoboLinux image](gobolinux.png?width=60pc&classes=shadow)
 
 ## [BITS](https://bits-training.de/training/) by Dr. Lutz Gollan
 
-![BITS image](images/bits-train.png?width=60pc&classes=shadow)
+![BITS image](bits-train.png?width=60pc&classes=shadow)
 
 ## [Pamasol Electrics](https://pamasol.github.io/de/) by Pamasol – Swiss Aerosol Solutions
 
-![Pamasol Electrics](images/pamasol-electrics-portal.png?width=60pc&classes=shadow)
+![Pamasol Electrics](pamasol-electrics-portal.png?width=60pc&classes=shadow)
diff --git a/exampleSite/content/more/showcase/images/bits-train.png b/exampleSite/content/more/showcase/bits-train.png
similarity index 100%
rename from exampleSite/content/more/showcase/images/bits-train.png
rename to exampleSite/content/more/showcase/bits-train.png
diff --git a/exampleSite/content/more/showcase/images/gobolinux.png b/exampleSite/content/more/showcase/gobolinux.png
similarity index 100%
rename from exampleSite/content/more/showcase/images/gobolinux.png
rename to exampleSite/content/more/showcase/gobolinux.png
diff --git a/exampleSite/content/more/showcase/images/pamasol-electrics-portal.png b/exampleSite/content/more/showcase/pamasol-electrics-portal.png
similarity index 100%
rename from exampleSite/content/more/showcase/images/pamasol-electrics-portal.png
rename to exampleSite/content/more/showcase/pamasol-electrics-portal.png
diff --git a/exampleSite/content/tests/images/_index.en.md b/exampleSite/content/tests/images/_index.en.md
index bd2d96fb80..4d54179c68 100644
--- a/exampleSite/content/tests/images/_index.en.md
+++ b/exampleSite/content/tests/images/_index.en.md
@@ -9,11 +9,11 @@ Some testing for different styles of image links.
 
 ### Relative to page
 
-![Magic](images/magic.gif?classes=shadow&height=50px)
+![Magic](magic.gif?classes=shadow&height=50px)
 
 ### Relative to page up level
 
-![Magic](../images/images/magic.gif?classes=shadow&height=50px)
+![Magic](../images/magic.gif?classes=shadow&height=50px)
 
 ### Static
 
@@ -35,11 +35,11 @@ Some testing for different styles of image links.
 
 ### Relative to page
 
-<p><img src="images/magic.gif?classes=shadow&height=50px"></p>
+<p><img src="magic.gif?classes=shadow&height=50px"></p>
 
 ### Relative to page up level
 
-<p><img src="../images/images/magic.gif?classes=shadow&height=50px"></p>
+<p><img src="../images/magic.gif?classes=shadow&height=50px"></p>
 
 ### Static
 
diff --git a/exampleSite/content/tests/images/images/magic.gif b/exampleSite/content/tests/images/magic.gif
similarity index 100%
rename from exampleSite/content/tests/images/images/magic.gif
rename to exampleSite/content/tests/images/magic.gif
diff --git a/exampleSite/content/tests/links/_index.en.md b/exampleSite/content/tests/links/_index.en.md
deleted file mode 100644
index eefc343598..0000000000
--- a/exampleSite/content/tests/links/_index.en.md
+++ /dev/null
@@ -1,20 +0,0 @@
-+++
-description = "Some testing for different styles of links"
-title = "Links"
-+++
-
-Some testing for different styles of links.
-
-## Markdown
-
-### Relative to page:
-
-![Magic](images/magic.gif?classes=shadow)
-
-### Relative to page up level:
-
-![Magic](../images/images/magic.gif?classes=shadow)
-
-### Static:
-
-![Logo](/images/logo.svg?classes=shadow)
diff --git a/exampleSite/content/tests/links/_index.pir.md b/exampleSite/content/tests/links/_index.pir.md
deleted file mode 100644
index 1588583b66..0000000000
--- a/exampleSite/content/tests/links/_index.pir.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-description = "Some test'n fer different styles o' links"
-title = "Links"
-+++
-{{< piratify >}}
\ No newline at end of file