diff --git a/src/invidious/routes/feeds.cr b/src/invidious/routes/feeds.cr
index c7de90d0..de83d3f2 100644
--- a/src/invidious/routes/feeds.cr
+++ b/src/invidious/routes/feeds.cr
@@ -25,14 +25,14 @@ module Invidious::Routes::Feeds
       item
     end
 
-    templated "view_all_playlists"
+    templated "feeds/playlists"
   end
 
   def self.popular(env)
     locale = LOCALES[env.get("preferences").as(Preferences).locale]?
 
     if CONFIG.popular_enabled
-      templated "popular"
+      templated "feeds/popular"
     else
       message = translate(locale, "The Popular feed has been disabled by the administrator.")
       templated "message"
@@ -54,7 +54,7 @@ module Invidious::Routes::Feeds
       return error_template(500, ex)
     end
 
-    templated "trending"
+    templated "feeds/trending"
   end
 
   def self.subscriptions(env)
@@ -102,7 +102,7 @@ module Invidious::Routes::Feeds
     user.notifications = [] of String
     env.set "user", user
 
-    templated "subscriptions"
+    templated "feeds/subscriptions"
   end
 
   def self.history(env)
@@ -129,7 +129,7 @@ module Invidious::Routes::Feeds
     end
     watched ||= [] of String
 
-    templated "history"
+    templated "feeds/history"
   end
 
   # RSS feeds
diff --git a/src/invidious/views/history.ecr b/src/invidious/views/feeds/history.ecr
similarity index 100%
rename from src/invidious/views/history.ecr
rename to src/invidious/views/feeds/history.ecr
diff --git a/src/invidious/views/view_all_playlists.ecr b/src/invidious/views/feeds/playlists.ecr
similarity index 100%
rename from src/invidious/views/view_all_playlists.ecr
rename to src/invidious/views/feeds/playlists.ecr
diff --git a/src/invidious/views/popular.ecr b/src/invidious/views/feeds/popular.ecr
similarity index 100%
rename from src/invidious/views/popular.ecr
rename to src/invidious/views/feeds/popular.ecr
diff --git a/src/invidious/views/subscriptions.ecr b/src/invidious/views/feeds/subscriptions.ecr
similarity index 100%
rename from src/invidious/views/subscriptions.ecr
rename to src/invidious/views/feeds/subscriptions.ecr
diff --git a/src/invidious/views/trending.ecr b/src/invidious/views/feeds/trending.ecr
similarity index 100%
rename from src/invidious/views/trending.ecr
rename to src/invidious/views/feeds/trending.ecr