diff --git a/client/src/views/404View.vue b/client/src/pages/404Page.vue
similarity index 100%
rename from client/src/views/404View.vue
rename to client/src/pages/404Page.vue
diff --git a/client/src/views/CircleView.vue b/client/src/pages/CircleView.vue
similarity index 100%
rename from client/src/views/CircleView.vue
rename to client/src/pages/CircleView.vue
diff --git a/client/src/views/CockpitView.vue b/client/src/pages/CockpitView.vue
similarity index 100%
rename from client/src/views/CockpitView.vue
rename to client/src/pages/CockpitView.vue
diff --git a/client/src/views/LearningContentView.vue b/client/src/pages/LearningContentView.vue
similarity index 100%
rename from client/src/views/LearningContentView.vue
rename to client/src/pages/LearningContentView.vue
diff --git a/client/src/views/LearningPathView.vue b/client/src/pages/LearningPathView.vue
similarity index 98%
rename from client/src/views/LearningPathView.vue
rename to client/src/pages/LearningPathView.vue
index b2e0cc68..afe187fc 100644
--- a/client/src/views/LearningPathView.vue
+++ b/client/src/pages/LearningPathView.vue
@@ -6,8 +6,8 @@ import { useUserStore } from "@/stores/user";
 import { onMounted } from "vue";
 
 import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
+import LearningPathViewVertical from "@/pages/LearningPathViewVertical.vue";
 import type { LearningPath } from "@/services/learningPath";
-import LearningPathViewVertical from "@/views/LearningPathViewVertical.vue";
 
 log.debug("LearningPathView created");
 
diff --git a/client/src/views/LearningPathViewVertical.vue b/client/src/pages/LearningPathViewVertical.vue
similarity index 100%
rename from client/src/views/LearningPathViewVertical.vue
rename to client/src/pages/LearningPathViewVertical.vue
diff --git a/client/src/views/LearningUnitSelfEvaluationView.vue b/client/src/pages/LearningUnitSelfEvaluationView.vue
similarity index 100%
rename from client/src/views/LearningUnitSelfEvaluationView.vue
rename to client/src/pages/LearningUnitSelfEvaluationView.vue
diff --git a/client/src/views/LoginView.vue b/client/src/pages/LoginView.vue
similarity index 100%
rename from client/src/views/LoginView.vue
rename to client/src/pages/LoginView.vue
diff --git a/client/src/views/MessagesView.vue b/client/src/pages/MessagesView.vue
similarity index 100%
rename from client/src/views/MessagesView.vue
rename to client/src/pages/MessagesView.vue
diff --git a/client/src/views/ProfileView.vue b/client/src/pages/ProfileView.vue
similarity index 100%
rename from client/src/views/ProfileView.vue
rename to client/src/pages/ProfileView.vue
diff --git a/client/src/views/ShopView.vue b/client/src/pages/ShopView.vue
similarity index 100%
rename from client/src/views/ShopView.vue
rename to client/src/pages/ShopView.vue
diff --git a/client/src/views/StyleGuideView.vue b/client/src/pages/StyleGuideView.vue
similarity index 100%
rename from client/src/views/StyleGuideView.vue
rename to client/src/pages/StyleGuideView.vue
diff --git a/client/src/views/media_library/MediaCategoryDetailView.vue b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
similarity index 98%
rename from client/src/views/media_library/MediaCategoryDetailView.vue
rename to client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
index fd7cfb44..9ede191e 100644
--- a/client/src/views/media_library/MediaCategoryDetailView.vue
+++ b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import LinkCard from "@/components/mediaLibrary/LinkCard.vue";
 import MediaLink from "@/components/mediaLibrary/MediaLink.vue";
+import HandlungsfeldLayout from "@/pages/mediaLibrary/MLCategoryLayout.vue";
 import { useMediaLibraryStore } from "@/stores/mediaLibrary";
-import HandlungsfeldLayout from "@/views/HandlungsfeldLayout.vue";
 import * as log from "loglevel";
 import { computed } from "vue";
 
@@ -281,7 +281,7 @@ const hasMoreItemsForType = (itemType: string, items: object[]) => {
                   content_collection.value.contents
                 )
               "
-              to="/media/handlungsfeldlist"
+              :to="`${mediaCategory.frontend_url}/media`"
               class="flex items-center"
             >
               <span>Alle anschauen</span>
diff --git a/client/src/views/media_library/MediaLibraryCategoryOverview.vue b/client/src/pages/mediaLibrary/MLCategoryIndexPage.vue
similarity index 100%
rename from client/src/views/media_library/MediaLibraryCategoryOverview.vue
rename to client/src/pages/mediaLibrary/MLCategoryIndexPage.vue
diff --git a/client/src/views/HandlungsfeldLayout.vue b/client/src/pages/mediaLibrary/MLCategoryLayout.vue
similarity index 100%
rename from client/src/views/HandlungsfeldLayout.vue
rename to client/src/pages/mediaLibrary/MLCategoryLayout.vue
diff --git a/client/src/views/media_library/MediaLibraryIndexView.vue b/client/src/pages/mediaLibrary/MLIndexPage.vue
similarity index 95%
rename from client/src/views/media_library/MediaLibraryIndexView.vue
rename to client/src/pages/mediaLibrary/MLIndexPage.vue
index d3358d94..9eb31d52 100644
--- a/client/src/views/media_library/MediaLibraryIndexView.vue
+++ b/client/src/pages/mediaLibrary/MLIndexPage.vue
@@ -28,7 +28,7 @@ watch(dropdownSelected, (newValue) =>
       v-if="mediaStore.mediaLibraryPage"
       title="Handlungsfelder"
       call2-action="Anschauen"
-      :link="`/media/${mediaStore.mediaLibraryPage.slug}/handlungsfelder`"
+      :link="`${mediaStore.mediaLibraryPage.frontend_url}/category`"
       description="Finde alle Ressourcen der Handlungsfelder wie Lernmedien, Links und andere nützliche Informationen."
       icon="handlungsfelder-overview"
       class="mb-6"
diff --git a/client/src/views/MediaList.vue b/client/src/pages/mediaLibrary/MLMediaList.vue
similarity index 97%
rename from client/src/views/MediaList.vue
rename to client/src/pages/mediaLibrary/MLMediaList.vue
index 6844ac71..b98ac5da 100644
--- a/client/src/views/MediaList.vue
+++ b/client/src/pages/mediaLibrary/MLMediaList.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import MediaLink from "@/components/mediaLibrary/MediaLink.vue";
-import HandlungsfeldLayout from "@/views/HandlungsfeldLayout.vue";
+import HandlungsfeldLayout from "@/pages/mediaLibrary/MLCategoryLayout.vue";
 
 const data = {
   title: "Fahrzeug: Lernmedien",
diff --git a/client/src/views/media_library/MediaLibraryParentView.vue b/client/src/pages/mediaLibrary/MLParentPage.vue
similarity index 100%
rename from client/src/views/media_library/MediaLibraryParentView.vue
rename to client/src/pages/mediaLibrary/MLParentPage.vue
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index a7d7ab7c..1c63b7bf 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -1,7 +1,7 @@
 import { redirectToLoginIfRequired, updateLoggedIn } from "@/router/guards";
 import { useAppStore } from "@/stores/app";
-import CockpitView from "@/views/CockpitView.vue";
-import LoginView from "@/views/LoginView.vue";
+import CockpitView from "@/pages/CockpitView.vue";
+import LoginView from "@/pages/LoginView.vue";
 import { createRouter, createWebHistory } from "vue-router";
 
 const router = createRouter({
@@ -22,71 +22,71 @@ const router = createRouter({
     },
     {
       path: "/shop",
-      component: () => import("@/views/ShopView.vue"),
+      component: () => import("@/pages/ShopView.vue"),
     },
     {
       path: "/media/:mediaLibraryPageSlug",
       props: true,
-      component: () => import("@/views/media_library/MediaLibraryParentView.vue"),
+      component: () => import("@/pages/mediaLibrary/MLParentPage.vue"),
       children: [
         {
           path: "",
-          component: () => import("@/views/media_library/MediaLibraryIndexView.vue"),
+          component: () => import("@/pages/mediaLibrary/MLIndexPage.vue"),
         },
         {
-          path: "handlungsfelder/:mediaCategorySlug",
+          path: "category/:mediaCategorySlug/media",
+          component: () => import("@/pages/mediaLibrary/MLMediaList.vue"),
+        },
+        {
+          path: "category/:mediaCategorySlug",
           props: true,
-          component: () => import("@/views/media_library/MediaCategoryDetailView.vue"),
+          component: () => import("@/pages/mediaLibrary/MLCategoryDetailPage.vue"),
         },
         {
-          path: "handlungsfelder",
+          path: "category",
           component: () =>
-            import("@/views/media_library/MediaLibraryCategoryOverview.vue"),
-        },
-        {
-          path: "handlungsfeldlist",
-          component: () => import("@/views/MediaList.vue"),
+            import("@/pages/mediaLibrary/MLCategoryIndexPage.vue"),
         },
       ],
     },
     {
       path: "/messages",
-      component: () => import("@/views/MessagesView.vue"),
+      component: () => import("@/pages/MessagesView.vue"),
     },
     {
       path: "/profile",
-      component: () => import("@/views/ProfileView.vue"),
+      component: () => import("@/pages/ProfileView.vue"),
     },
     {
       path: "/learn/:learningPathSlug",
-      component: () => import("../views/LearningPathView.vue"),
+      component: () => import("../pages/LearningPathView.vue"),
       props: true,
     },
     {
       path: "/learn/:learningPathSlug/:circleSlug",
-      component: () => import("../views/CircleView.vue"),
+      component: () => import("../pages/CircleView.vue"),
       props: true,
     },
     {
       path: "/learn/:learningPathSlug/:circleSlug/evaluate/:learningUnitSlug",
-      component: () => import("../views/LearningUnitSelfEvaluationView.vue"),
+      component: () => import("../pages/LearningUnitSelfEvaluationView.vue"),
       props: true,
     },
     {
       path: "/learn/:learningPathSlug/:circleSlug/:contentSlug",
-      component: () => import("../views/LearningContentView.vue"),
+      component: () => import("../pages/LearningContentView.vue"),
       props: true,
     },
     {
       path: "/styleguide",
-      component: () => import("../views/StyleGuideView.vue"),
+      component: () => import("../pages/StyleGuideView.vue"),
       meta: {
         public: true,
       },
     },
     {
       path: "/:pathMatch(.*)*",
-      component: () => import("../views/404View.vue"),
+      component: () => import("../pages/404Page.vue"),
     },
   ],
 });
diff --git a/server/vbv_lernwelt/course/views.py b/server/vbv_lernwelt/course/views.py
index bd480b6f..cebb2961 100644
--- a/server/vbv_lernwelt/course/views.py
+++ b/server/vbv_lernwelt/course/views.py
@@ -1,5 +1,4 @@
 import structlog
-from django.views.decorators.cache import cache_page
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from wagtail.models import Page
@@ -12,7 +11,8 @@ logger = structlog.get_logger(__name__)
 
 
 @api_view(["GET"])
-@cache_page(60 * 60 * 8, cache="api_page_cache")
+# TODO readd
+# @cache_page(60 * 60 * 8, cache="api_page_cache")
 def page_api_view(request, slug):
     try:
         page = Page.objects.get(slug=slug, locale__language_code="de-CH")
diff --git a/server/vbv_lernwelt/media_library/create_default_media_library.py b/server/vbv_lernwelt/media_library/create_default_media_library.py
index 2ffd1324..c08f44a8 100644
--- a/server/vbv_lernwelt/media_library/create_default_media_library.py
+++ b/server/vbv_lernwelt/media_library/create_default_media_library.py
@@ -56,6 +56,10 @@ welche Aspekte du bei einer Offerte beachten musst und wie du dem Kunden die Lö
                         create_learn_media_block(LearnMediaBlockFactory()),
                         create_learn_media_block(LearnMediaBlockFactory()),
                         create_learn_media_block(LearnMediaBlockFactory()),
+                        create_learn_media_block(LearnMediaBlockFactory()),
+                        create_learn_media_block(LearnMediaBlockFactory()),
+                        create_learn_media_block(LearnMediaBlockFactory()),
+                        create_learn_media_block(LearnMediaBlockFactory()),
                     ],
                 ),
                 create_media_collection(
diff --git a/server/vbv_lernwelt/media_library/models.py b/server/vbv_lernwelt/media_library/models.py
index 7fac08d7..0a0a5f9c 100644
--- a/server/vbv_lernwelt/media_library/models.py
+++ b/server/vbv_lernwelt/media_library/models.py
@@ -86,7 +86,7 @@ class MediaCategoryPage(Page):
 
     def get_frontend_url(self):
         short_slug = self.slug.replace(f"{self.get_parent().slug}-cat-", "")
-        return f"{self.get_parent().specific.get_frontend_url()}/handlungsfelder/{short_slug}"
+        return f"{self.get_parent().specific.get_frontend_url()}/category/{short_slug}"
 
     @classmethod
     def get_serializer_class(cls):