diff --git a/.eleventy.js b/.eleventy.js
index 9a02e4b..f6a5ba6 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -1,20 +1,20 @@
 const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
 
 module.exports = function(eleventyConfig) {
-    eleventyConfig.addWatchTarget("./src/scss/");
+    eleventyConfig.addWatchTarget("./scss/");
 
     eleventyConfig.addPlugin(eleventyNavigationPlugin);
     eleventyConfig.setUseGitIgnore(false);
     eleventyConfig.addPassthroughCopy({
-        "src/img": "img",
-        "src/font": "font",
+        "img": "img",
+        "font": "font",
         "node_modules/@fortawesome/fontawesome-free/webfonts/": "font",
         "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags"
     });
 
     return {
         dir: {
-            input: "src",
+            input: "sites",
             includes: "_includes",
             layouts: "_includes/layouts",
             output: "dist"
diff --git a/src/img/bg.png b/img/bg.png
similarity index 100%
rename from src/img/bg.png
rename to img/bg.png
diff --git a/src/img/matrix.png b/img/matrix.png
similarity index 100%
rename from src/img/matrix.png
rename to img/matrix.png
diff --git a/src/img/samuel.png b/img/samuel.png
similarity index 100%
rename from src/img/samuel.png
rename to img/samuel.png
diff --git a/src/img/sp-codes.jpg b/img/sp-codes.jpg
similarity index 100%
rename from src/img/sp-codes.jpg
rename to img/sp-codes.jpg
diff --git a/package.json b/package.json
index 3124934..6e45a8d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "website for sp-codes.de",
   "scripts": {
-    "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer src/scss/main.scss dist/css/main.css",
+    "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer scss/main.scss dist/css/main.css",
     "watch:eleventy": "eleventy --serve",
     "watch:sass": "npm run compile-sass -- --watch",
     "start": "npm-run-all compile-sass --parallel watch:*",
@@ -16,7 +16,7 @@
     "url": "https://git.sp-codes.de/samuel-p/sp-codes.de"
   },
   "optionalDependencies": {
-    "browser-sync": "^2.26.12"
+    "browser-sync": "^2.26.10"
   },
   "devDependencies": {
     "@11ty/eleventy": "^0.11.0",
diff --git a/src/scss/main.scss b/scss/main.scss
similarity index 75%
rename from src/scss/main.scss
rename to scss/main.scss
index 7dadb3e..2c51c5e 100644
--- a/src/scss/main.scss
+++ b/scss/main.scss
@@ -1,18 +1,18 @@
-@import "node_modules/bootstrap/scss/bootstrap-grid";
-@import "node_modules/bootstrap/scss/bootstrap-reboot";
-@import "node_modules/bootstrap/scss/utilities/align";
-@import "node_modules/bootstrap/scss/utilities/spacing";
-@import "node_modules/bootstrap/scss/utilities/display";
-@import "node_modules/bootstrap/scss/utilities/text";
-@import "node_modules/bootstrap/scss/utilities/float";
+@import "~bootstrap/scss/bootstrap-grid";
+@import "~bootstrap/scss/bootstrap-reboot";
+@import "~bootstrap/scss/utilities/align";
+@import "~bootstrap/scss/utilities/spacing";
+@import "~bootstrap/scss/utilities/display";
+@import "~bootstrap/scss/utilities/text";
+@import "~bootstrap/scss/utilities/float";
 
 $fa-font-path: "../font";
-@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
-@import "node_modules/@fortawesome/fontawesome-free/scss/solid";
-@import "node_modules/@fortawesome/fontawesome-free/scss/brands";
-@import "node_modules/@fortawesome/fontawesome-free/scss/regular";
+@import "~@fortawesome/fontawesome-free/scss/fontawesome";
+@import "~@fortawesome/fontawesome-free/scss/solid";
+@import "~@fortawesome/fontawesome-free/scss/brands";
+@import "~@fortawesome/fontawesome-free/scss/regular";
 $flag-icon-rect-path: '';
-@import "node_modules/flag-icon-css/sass/flag-icon";
+@import "~flag-icon-css/sass/flag-icon";
 
 html, body {
   height: 100%;
@@ -64,6 +64,19 @@ a {
   }
 }
 
+.menu-top {
+  border-bottom: 1px solid #ffffff;
+}
+
+.menu-bottom {
+  border-top: 1px solid #ffffff;
+}
+
+.border-top-bottom {
+  border-top: 1px solid #ffffff;
+  border-bottom: 1px solid #ffffff;
+}
+
 .border-top {
   border-top: 1px solid #ffffff;
 }
@@ -84,6 +97,19 @@ a {
   flex: 1;
 }
 
+@media (max-width: 767.98px) {
+  .sp-codes {
+    font-size: 3rem;
+  }
+  .logo {
+    max-width: 128px;
+    max-height: 128px;
+  }
+  .fa-4x {
+    font-size: 2em;
+  }
+}
+
 .service {
   background-color: #222;
   border: 1px solid #fff;
@@ -153,6 +179,19 @@ a {
   color: #ffffff !important;
 }
 
+.matrix-icon {
+  margin: 0 8px;
+  width: 4em;
+  height: 4em;
+}
+
+@media (max-width: 767.98px) {
+  .matrix-icon {
+    width: 2em;
+    height: 2em;
+  }
+}
+
 code {
   background-color: #fea500;
   color: #000000;
@@ -172,26 +211,3 @@ pre {
     border-radius: initial;
   }
 }
-
-@media (max-width: 767.98px) {
-  .logo {
-    max-width: 128px;
-    max-height: 128px;
-  }
-  .fa-4x {
-    font-size: 2em;
-  }
-}
-
-.matrix-icon {
-  margin: 0 8px;
-  width: 4em;
-  height: 4em;
-}
-
-@media (max-width: 767.98px) {
-  .matrix-icon {
-    width: 2em;
-    height: 2em;
-  }
-}
diff --git a/src/_data/services.json b/sites/_data/services.json
similarity index 100%
rename from src/_data/services.json
rename to sites/_data/services.json
diff --git a/src/_data/site.js b/sites/_data/site.js
similarity index 100%
rename from src/_data/site.js
rename to sites/_data/site.js
diff --git a/src/_data/strings.json b/sites/_data/strings.json
similarity index 100%
rename from src/_data/strings.json
rename to sites/_data/strings.json
diff --git a/src/_includes/layouts/base.njk b/sites/_includes/layouts/base.njk
similarity index 99%
rename from src/_includes/layouts/base.njk
rename to sites/_includes/layouts/base.njk
index 26cad56..90e0f64 100644
--- a/src/_includes/layouts/base.njk
+++ b/sites/_includes/layouts/base.njk
@@ -36,7 +36,7 @@ title: sp-codes
     <script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.js"></script>
 </head>
   <body>
-    <div class="d-flex justify-content-start flex-wrap p-2 menu border-bottom">
+    <div class="d-flex justify-content-start flex-wrap p-2 menu menu-top">
     {%- for entry in collections.all | eleventyNavigation %}
       {% if entry.url.includes(locale) %}
         <div {% if entry.url == page.url %} class="active"{% endif %}>
@@ -66,7 +66,7 @@ title: sp-codes
         {{ content | safe }}
       </div>
     </div>
-    <div class="d-flex justify-content-start flex-wrap p-2 menu border-top">
+    <div class="d-flex justify-content-start flex-wrap p-2 menu menu-bottom">
         <div class="d-flex justify-content-start flex-wrap">
             <div class="mr-3">Made with <span class="fas fa-heart highlight"></span> in Germany</div>
             <div class="mr-3"><span class="far fa-copyright mr-2"></span>Samuel Philipp</div>
diff --git a/src/_includes/layouts/home.njk b/sites/_includes/layouts/home.njk
similarity index 70%
rename from src/_includes/layouts/home.njk
rename to sites/_includes/layouts/home.njk
index 246a92a..0d2d5a8 100644
--- a/src/_includes/layouts/home.njk
+++ b/sites/_includes/layouts/home.njk
@@ -3,7 +3,7 @@ layout: base.njk
 ---
 <div class="row py-5">
   <div class="col">
-    <img class="logo" src="img/samuel.png">
+    <img class="logo" src="/img/samuel.png">
   </div>
 </div>
 
diff --git a/src/_includes/layouts/services.njk b/sites/_includes/layouts/services.njk
similarity index 100%
rename from src/_includes/layouts/services.njk
rename to sites/_includes/layouts/services.njk
diff --git a/src/_includes/profiles.html b/sites/_includes/profiles.html
similarity index 93%
rename from src/_includes/profiles.html
rename to sites/_includes/profiles.html
index c7d9e9f..1d1da51 100644
--- a/src/_includes/profiles.html
+++ b/sites/_includes/profiles.html
@@ -2,7 +2,7 @@
     <div class="m-2"><a href="mailto:mail@sp-codes.de"><span
             class="fas fa-fw fa-4x fa-envelope"></span></a></div>
     <div class="m-2"><a href="https://matrix.to/#/@samuel-p:matrix.sp-codes.de">
-        <img class="matrix-icon" src="../img/matrix.png" alt=""></a></div>
+        <img class="matrix-icon" src="img/matrix.png" alt=""></a></div>
     <div class="m-2"><a rel="me" href="https://social.tchncs.de/@samuel_p"><span
             class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
     <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"><span
diff --git a/src/_includes/services-extended.html b/sites/_includes/services-extended.html
similarity index 100%
rename from src/_includes/services-extended.html
rename to sites/_includes/services-extended.html
diff --git a/src/_includes/services-simple.html b/sites/_includes/services-simple.html
similarity index 100%
rename from src/_includes/services-simple.html
rename to sites/_includes/services-simple.html
diff --git a/sites/de/404.md b/sites/de/404.md
new file mode 100644
index 0000000..6c7444c
--- /dev/null
+++ b/sites/de/404.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: 404
+title: Nicht gefunden
+---
+# Nicht gefunden
+
+Diese Seite existiert (noch) nicht. Schau später nochmal vorbei, oder fang von vorne an: [Home](/{{locale}}/)
diff --git a/src/de/de.json b/sites/de/de.json
similarity index 100%
rename from src/de/de.json
rename to sites/de/de.json
diff --git a/src/de/imprint.html b/sites/de/imprint.html
similarity index 100%
rename from src/de/imprint.html
rename to sites/de/imprint.html
diff --git a/src/de/index.html b/sites/de/index.html
similarity index 100%
rename from src/de/index.html
rename to sites/de/index.html
diff --git a/src/de/privacy.html b/sites/de/privacy.html
similarity index 100%
rename from src/de/privacy.html
rename to sites/de/privacy.html
diff --git a/src/de/services.html b/sites/de/services.html
similarity index 100%
rename from src/de/services.html
rename to sites/de/services.html
diff --git a/src/de/services/connectivitycheck.md b/sites/de/services/connectivitycheck.md
similarity index 100%
rename from src/de/services/connectivitycheck.md
rename to sites/de/services/connectivitycheck.md
diff --git a/src/de/services/firefox-sync.md b/sites/de/services/firefox-sync.md
similarity index 100%
rename from src/de/services/firefox-sync.md
rename to sites/de/services/firefox-sync.md
diff --git a/src/de/services/gitea.md b/sites/de/services/gitea.md
similarity index 100%
rename from src/de/services/gitea.md
rename to sites/de/services/gitea.md
diff --git a/src/de/services/invidious.md b/sites/de/services/invidious.md
similarity index 100%
rename from src/de/services/invidious.md
rename to sites/de/services/invidious.md
diff --git a/src/de/services/matrix.md b/sites/de/services/matrix.md
similarity index 100%
rename from src/de/services/matrix.md
rename to sites/de/services/matrix.md
diff --git a/src/de/services/searx.md b/sites/de/services/searx.md
similarity index 100%
rename from src/de/services/searx.md
rename to sites/de/services/searx.md
diff --git a/sites/en/404.md b/sites/en/404.md
new file mode 100644
index 0000000..dafed38
--- /dev/null
+++ b/sites/en/404.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: 404
+title: Not Found
+---
+# Not Found
+
+This page does not exist (yet). Come back later or take a look at the beginning: [Home](/{{locale}}/)
diff --git a/src/en/en.json b/sites/en/en.json
similarity index 100%
rename from src/en/en.json
rename to sites/en/en.json
diff --git a/src/en/imprint.html b/sites/en/imprint.html
similarity index 100%
rename from src/en/imprint.html
rename to sites/en/imprint.html
diff --git a/src/en/index.html b/sites/en/index.html
similarity index 100%
rename from src/en/index.html
rename to sites/en/index.html
diff --git a/src/en/privacy.html b/sites/en/privacy.html
similarity index 100%
rename from src/en/privacy.html
rename to sites/en/privacy.html
diff --git a/src/en/services.html b/sites/en/services.html
similarity index 100%
rename from src/en/services.html
rename to sites/en/services.html
diff --git a/src/en/services/connectivitycheck.md b/sites/en/services/connectivitycheck.md
similarity index 100%
rename from src/en/services/connectivitycheck.md
rename to sites/en/services/connectivitycheck.md
diff --git a/src/en/services/firefox-sync.md b/sites/en/services/firefox-sync.md
similarity index 100%
rename from src/en/services/firefox-sync.md
rename to sites/en/services/firefox-sync.md
diff --git a/src/en/services/gitea.md b/sites/en/services/gitea.md
similarity index 100%
rename from src/en/services/gitea.md
rename to sites/en/services/gitea.md
diff --git a/src/en/services/invidious.md b/sites/en/services/invidious.md
similarity index 100%
rename from src/en/services/invidious.md
rename to sites/en/services/invidious.md
diff --git a/src/en/services/matrix.md b/sites/en/services/matrix.md
similarity index 100%
rename from src/en/services/matrix.md
rename to sites/en/services/matrix.md
diff --git a/src/en/services/searx.md b/sites/en/services/searx.md
similarity index 100%
rename from src/en/services/searx.md
rename to sites/en/services/searx.md