diff --git a/app/Helpers/Misc.php b/app/Helpers/Misc.php
index efb9e36..3cd8932 100644
--- a/app/Helpers/Misc.php
+++ b/app/Helpers/Misc.php
@@ -22,6 +22,6 @@ class Misc {
      * Returns absolute path for view
      */
     static public function getView(string $template): string {
-        return __DIR__ . "/../../views/{$template}.latte";
+        return __DIR__ . "/../../templates/views/{$template}.latte";
     }
 }
diff --git a/site.webmanifest b/site.webmanifest
index 7151210..3041e67 100644
--- a/site.webmanifest
+++ b/site.webmanifest
@@ -5,12 +5,12 @@
   "orientation": "portrait-primary",
   "icons": [
     {
-      "src": "./android-chrome-192x192.png",
+      "src": "android-chrome-192x192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "./android-chrome-512x512.png",
+      "src": "android-chrome-512x512.png",
       "sizes": "512x512",
       "type": "image/png"
     }
diff --git a/components/card.latte b/templates/components/card.latte
similarity index 100%
rename from components/card.latte
rename to templates/components/card.latte
diff --git a/components/feed.latte b/templates/components/feed.latte
similarity index 100%
rename from components/feed.latte
rename to templates/components/feed.latte
diff --git a/components/form.latte b/templates/components/form.latte
similarity index 100%
rename from components/form.latte
rename to templates/components/form.latte
diff --git a/components/head.latte b/templates/components/head.latte
similarity index 100%
rename from components/head.latte
rename to templates/components/head.latte
diff --git a/components/icon.latte b/templates/components/icon.latte
similarity index 100%
rename from components/icon.latte
rename to templates/components/icon.latte
diff --git a/components/navbar.latte b/templates/components/navbar.latte
similarity index 100%
rename from components/navbar.latte
rename to templates/components/navbar.latte
diff --git a/components/rss.latte b/templates/components/rss.latte
similarity index 100%
rename from components/rss.latte
rename to templates/components/rss.latte
diff --git a/components/settings/api.latte b/templates/components/settings/api.latte
similarity index 100%
rename from components/settings/api.latte
rename to templates/components/settings/api.latte
diff --git a/components/settings/general.latte b/templates/components/settings/general.latte
similarity index 100%
rename from components/settings/general.latte
rename to templates/components/settings/general.latte
diff --git a/components/settings/misc.latte b/templates/components/settings/misc.latte
similarity index 100%
rename from components/settings/misc.latte
rename to templates/components/settings/misc.latte
diff --git a/components/themes/card.latte b/templates/components/themes/card.latte
similarity index 100%
rename from components/themes/card.latte
rename to templates/components/themes/card.latte
diff --git a/components/themes/common/controls.latte b/templates/components/themes/common/controls.latte
similarity index 100%
rename from components/themes/common/controls.latte
rename to templates/components/themes/common/controls.latte
diff --git a/components/themes/common/download.latte b/templates/components/themes/common/download.latte
similarity index 100%
rename from components/themes/common/download.latte
rename to templates/components/themes/common/download.latte
diff --git a/components/themes/common/share.latte b/templates/components/themes/common/share.latte
similarity index 100%
rename from components/themes/common/share.latte
rename to templates/components/themes/common/share.latte
diff --git a/components/themes/common/stats.latte b/templates/components/themes/common/stats.latte
similarity index 100%
rename from components/themes/common/stats.latte
rename to templates/components/themes/common/stats.latte
diff --git a/components/themes/common/tags.latte b/templates/components/themes/common/tags.latte
similarity index 100%
rename from components/themes/common/tags.latte
rename to templates/components/themes/common/tags.latte
diff --git a/components/themes/default.latte b/templates/components/themes/default.latte
similarity index 100%
rename from components/themes/default.latte
rename to templates/components/themes/default.latte
diff --git a/layouts/default.latte b/templates/layouts/default.latte
similarity index 100%
rename from layouts/default.latte
rename to templates/layouts/default.latte
diff --git a/layouts/embed.latte b/templates/layouts/embed.latte
similarity index 100%
rename from layouts/embed.latte
rename to templates/layouts/embed.latte
diff --git a/layouts/hero.latte b/templates/layouts/hero.latte
similarity index 100%
rename from layouts/hero.latte
rename to templates/layouts/hero.latte
diff --git a/views/about.latte b/templates/views/about.latte
similarity index 100%
rename from views/about.latte
rename to templates/views/about.latte
diff --git a/views/discover.latte b/templates/views/discover.latte
similarity index 100%
rename from views/discover.latte
rename to templates/views/discover.latte
diff --git a/views/error.latte b/templates/views/error.latte
similarity index 100%
rename from views/error.latte
rename to templates/views/error.latte
diff --git a/views/home.latte b/templates/views/home.latte
similarity index 100%
rename from views/home.latte
rename to templates/views/home.latte
diff --git a/views/music.latte b/templates/views/music.latte
similarity index 100%
rename from views/music.latte
rename to templates/views/music.latte
diff --git a/views/rss.latte b/templates/views/rss.latte
similarity index 100%
rename from views/rss.latte
rename to templates/views/rss.latte
diff --git a/views/settings.latte b/templates/views/settings.latte
similarity index 100%
rename from views/settings.latte
rename to templates/views/settings.latte
diff --git a/views/tag.latte b/templates/views/tag.latte
similarity index 100%
rename from views/tag.latte
rename to templates/views/tag.latte
diff --git a/views/trending.latte b/templates/views/trending.latte
similarity index 100%
rename from views/trending.latte
rename to templates/views/trending.latte
diff --git a/views/user.latte b/templates/views/user.latte
similarity index 100%
rename from views/user.latte
rename to templates/views/user.latte
diff --git a/views/verify.latte b/templates/views/verify.latte
similarity index 100%
rename from views/verify.latte
rename to templates/views/verify.latte
diff --git a/views/video.latte b/templates/views/video.latte
similarity index 100%
rename from views/video.latte
rename to templates/views/video.latte