diff --git a/README.md b/README.md
index 7b019de..e51051a 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,6 @@ docker-compose up
## Supporters
-[](http://www.browserstack.com/)
+[](http://www.browserstack.com/)
Browserstack enables us to test our designs on a multitude of devices. This helps us designing our homepage in a truly responsive way.
diff --git a/_drafts/2016-10-07-first-milestone-funded.md b/_drafts/2016-10-07-first-milestone-funded.md
index eda4488..8e7095c 100644
--- a/_drafts/2016-10-07-first-milestone-funded.md
+++ b/_drafts/2016-10-07-first-milestone-funded.md
@@ -7,4 +7,4 @@ This gives us the opportunity to kick-start Safing, batteries (hardware and serv
We are looking forward to next year and the great time we will have implementing Safing.
-{: .blog-image }
+{: .blog-image }
diff --git a/_podcasts/2019-11-29-hiring-a-designer-from-the-privacy-community.md b/_podcasts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
index 8ab3223..e6646f2 100644
--- a/_podcasts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
+++ b/_podcasts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
@@ -23,8 +23,8 @@ summary: "
<h4>Old and new designs</h4>
-- Old: <a href='https://safing.io/assets/img/designs/homepage_v2.png'>https://safing.io/assets/img/designs/homepage_v2.png</a><br/>
-- New: <a href='https://safing.io/assets/img/designs/homepage_current.png'>https://safing.io/assets/img/designs/homepage_current.png</a><br/>
+- Old: <a href='https://safing.io/assets/img/archive/previous_designs/homepage_v2.png'>https://safing.io/assets/img/archive/previous_designs/homepage_v2.png</a><br/>
+- New: <a href='https://safing.io/assets/img/archive/previous_designs/homepage_v3.png'>https://safing.io/assets/img/archive/previous_designs/homepage_v3.png</a><br/>
<h4>Shoutout to The Hated One!</h4>
diff --git a/_podcasts/2020-03-16-moving-to-a-new-office.md b/_podcasts/2020-03-16-moving-to-a-new-office.md
index 13a11ac..a4faec9 100644
--- a/_podcasts/2020-03-16-moving-to-a-new-office.md
+++ b/_podcasts/2020-03-16-moving-to-a-new-office.md
@@ -21,7 +21,7 @@ summary: "
<h4>Links</h4>
-- First day at the office in 2018: <a href='https://safing.io/assets/img/team/first_day_in_first_office.jpg'>https://safing.io/assets/img/team/first_day_in_first_office.jpg</a><br/>
+- First day at the office in 2018: <a href='https://safing.io/assets/img/archive/first_day_in_first_office.jpg'>https://safing.io/assets/img/archive/first_day_in_first_office.jpg</a><br/>
- Celebration post from the new office: <a href='https://www.kickstarter.com/projects/safingio/spn/posts/2768665'>https://www.kickstarter.com/projects/safingio/spn/posts/2768665</a><br/>
- Video & COVID-19 Update: <a href='https://www.kickstarter.com/projects/safingio/spn/posts/2786638/'>https://www.kickstarter.com/projects/safingio/spn/posts/2786638/</a>
diff --git a/_posts/2019-11-29-hiring-a-designer-from-the-privacy-community.md b/_posts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
index 8303341..2cd7a1c 100644
--- a/_posts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
+++ b/_posts/2019-11-29-hiring-a-designer-from-the-privacy-community.md
@@ -58,7 +58,7 @@ It is rather obvious by now that we decided to hire Luke. But both candidates we
It took Luke a few weeks to pack up his things and move to Austria, but soon enough, at the beginning of October he became our lead designer. We are very grateful for his work so far and see him as a perfect fit for the job.
-He made us reconsider [our old designs]({{ site.img_url }}/designs/homepage_v2.png) and revamped everything to [look more professional]({{ site.img_url }}/designs/homepage_current.png), while still being approachable.
+He made us reconsider [our old designs]({{ site.img_url }}/archive/previous_designs/homepage_v2.png) and revamped everything to [look more professional]({{ site.img_url }}/archive/previous_designs/homepage_v3.png), while still being approachable.
_Sidenote: [Luke talks all about his side of the story in the podcast]({{ site.podcast_url }}2019/11/29/hiring-a-designer-from-the-privacy-community/). Also, you can [follow him on Twitter.](https://twitter.com/LukeSeers/)_
diff --git a/about/index.md b/about/index.md
index 9ff4244..9965e2a 100644
--- a/about/index.md
+++ b/about/index.md
@@ -260,7 +260,7 @@ As a result we openly share how we are funded. All our funding (and partnerships
<!-- FFG card -->
<div class="ui card">
<div class="image">
- <img src="{{ site.img_url }}external-logos/ffg_color.png">
+ <img src="{{ site.img_url }}external/logos/ffg_color.png">
</div>
<div class="content">
<a class="header" href="https://www.ffg.at/">FFG</a>
@@ -286,7 +286,7 @@ As a result we openly share how we are funded. All our funding (and partnerships
<!-- Netidee card -->
<div class="ui card">
<div class="image">
- <img src="{{ site.img_url }}external-logos/netidee.png">
+ <img src="{{ site.img_url }}external/logos/netidee.png">
</div>
<div class="content">
<a class="header" href="https://www.netidee.at/">Netidee</a>
@@ -309,7 +309,7 @@ As a result we openly share how we are funded. All our funding (and partnerships
<!-- ESA-BIC card -->
<div class="ui card">
<div class="image" style="padding: 20px; background-color: white;">
- <img src="{{ site.img_url }}external-logos/esa-bic_austria.svg">
+ <img src="{{ site.img_url }}external/logos/esa-bic_austria.svg">
</div>
<div class="content">
<a class="header" href="/esa-bic/">ESA-BIC Austria</a>
diff --git a/assets/img/contact_img.jpg b/assets/img/archive/contact_img.jpg
similarity index 100%
rename from assets/img/contact_img.jpg
rename to assets/img/archive/contact_img.jpg
diff --git a/assets/img/team/first_day_in_first_office.jpg b/assets/img/archive/first_day_in_first_office.jpg
similarity index 100%
rename from assets/img/team/first_day_in_first_office.jpg
rename to assets/img/archive/first_day_in_first_office.jpg
diff --git a/assets/img/kickstarter/perk_chart.jpg b/assets/img/archive/kickstarter/perk_chart.jpg
similarity index 100%
rename from assets/img/kickstarter/perk_chart.jpg
rename to assets/img/archive/kickstarter/perk_chart.jpg
diff --git a/assets/img/team/safing_team_january_2020.png b/assets/img/archive/kickstarter/safing_team_january_2020.png
similarity index 100%
rename from assets/img/team/safing_team_january_2020.png
rename to assets/img/archive/kickstarter/safing_team_january_2020.png
diff --git a/assets/img/designs/homepage_retro.jpg b/assets/img/archive/previous_designs/homepage_retro.jpg
similarity index 100%
rename from assets/img/designs/homepage_retro.jpg
rename to assets/img/archive/previous_designs/homepage_retro.jpg
diff --git a/assets/img/designs/homepage_v2.png b/assets/img/archive/previous_designs/homepage_v2.png
similarity index 100%
rename from assets/img/designs/homepage_v2.png
rename to assets/img/archive/previous_designs/homepage_v2.png
diff --git a/assets/img/designs/homepage_current.png b/assets/img/archive/previous_designs/homepage_v3.png
similarity index 100%
rename from assets/img/designs/homepage_current.png
rename to assets/img/archive/previous_designs/homepage_v3.png
diff --git a/assets/img/external-logos/accent.png b/assets/img/external/logos/accent.png
similarity index 100%
rename from assets/img/external-logos/accent.png
rename to assets/img/external/logos/accent.png
diff --git a/assets/img/external-logos/browserstack.svg b/assets/img/external/logos/browserstack.svg
similarity index 100%
rename from assets/img/external-logos/browserstack.svg
rename to assets/img/external/logos/browserstack.svg
diff --git a/assets/img/external-logos/efre.png b/assets/img/external/logos/efre.png
similarity index 100%
rename from assets/img/external-logos/efre.png
rename to assets/img/external/logos/efre.png
diff --git a/assets/img/external-logos/esa-bic_austria.eps b/assets/img/external/logos/esa-bic_austria.eps
similarity index 100%
rename from assets/img/external-logos/esa-bic_austria.eps
rename to assets/img/external/logos/esa-bic_austria.eps
diff --git a/assets/img/external-logos/esa-bic_austria.svg b/assets/img/external/logos/esa-bic_austria.svg
similarity index 100%
rename from assets/img/external-logos/esa-bic_austria.svg
rename to assets/img/external/logos/esa-bic_austria.svg
diff --git a/assets/img/external-logos/esa.png b/assets/img/external/logos/esa.png
similarity index 100%
rename from assets/img/external-logos/esa.png
rename to assets/img/external/logos/esa.png
diff --git a/assets/img/external-logos/excellence.png b/assets/img/external/logos/excellence.png
similarity index 100%
rename from assets/img/external-logos/excellence.png
rename to assets/img/external/logos/excellence.png
diff --git a/assets/img/external-logos/ffg.png b/assets/img/external/logos/ffg.png
similarity index 100%
rename from assets/img/external-logos/ffg.png
rename to assets/img/external/logos/ffg.png
diff --git a/assets/img/external-logos/ffg_color.png b/assets/img/external/logos/ffg_color.png
similarity index 100%
rename from assets/img/external-logos/ffg_color.png
rename to assets/img/external/logos/ffg_color.png
diff --git a/assets/img/external-logos/netidee.png b/assets/img/external/logos/netidee.png
similarity index 100%
rename from assets/img/external-logos/netidee.png
rename to assets/img/external/logos/netidee.png
diff --git a/assets/img/external-logos/netidee_small.png b/assets/img/external/logos/netidee_small.png
similarity index 100%
rename from assets/img/external-logos/netidee_small.png
rename to assets/img/external/logos/netidee_small.png
diff --git a/assets/img/external-logos/sciencepark.png b/assets/img/external/logos/sciencepark.png
similarity index 100%
rename from assets/img/external-logos/sciencepark.png
rename to assets/img/external/logos/sciencepark.png
diff --git a/assets/img/logo.png b/assets/img/logo/logo.png
similarity index 100%
rename from assets/img/logo.png
rename to assets/img/logo/logo.png
diff --git a/assets/img/logo_v3_light.png b/assets/img/logo/logo_v3_light.png
similarity index 100%
rename from assets/img/logo_v3_light.png
rename to assets/img/logo/logo_v3_light.png
diff --git a/assets/img/logo_v3_name_dark.svg b/assets/img/logo/logo_v3_name_dark.svg
similarity index 100%
rename from assets/img/logo_v3_name_dark.svg
rename to assets/img/logo/logo_v3_name_dark.svg
diff --git a/assets/img/logo_v3_name_light.svg b/assets/img/logo/logo_v3_name_light.svg
similarity index 100%
rename from assets/img/logo_v3_name_light.svg
rename to assets/img/logo/logo_v3_name_light.svg
diff --git a/esa-bic/index.md b/esa-bic/index.md
index 144fd74..36119f7 100644
--- a/esa-bic/index.md
+++ b/esa-bic/index.md
@@ -16,14 +16,14 @@ The ESA-BIC is a cooperation between the Science Park Graz, located in Styria, a
<a class="card" href="http://www.accent.at/home.html" target="blank">
<div class="content">
<div class="ui middle aligned image">
- <img src="{{ site.assets_url }}img/external-logos/accent.png">
+ <img src="{{ site.assets_url }}img/external/logos/accent.png">
</div>
</div>
</a>
<a class="card" href="https://www.efre.gv.at/" target="blank">
<div class="content">
<div class="ui middle aligned image">
- <img src="{{ site.assets_url }}img/external-logos/efre.png">
+ <img src="{{ site.assets_url }}img/external/logos/efre.png">
</div>
</div>
</a>
@@ -37,7 +37,7 @@ The ESA-BIC is a cooperation between the Science Park Graz, located in Styria, a
<a class="card" href="http://sciencepark.at/" target="blank">
<div class="content">
<div class="ui middle aligned image">
- <img src="{{ site.assets_url }}img/external-logos/sciencepark.png">
+ <img src="{{ site.assets_url }}img/external/logos/sciencepark.png">
</div>
</div>
</a>