diff --git a/frontend/app/components/modules/collection/components/details/filters.vue b/frontend/app/components/modules/collection/components/details/filters.vue
index ad385b3af..043afdfed 100644
--- a/frontend/app/components/modules/collection/components/details/filters.vue
+++ b/frontend/app/components/modules/collection/components/details/filters.vue
@@ -86,19 +86,19 @@ const sort = computed({
 const sortOptions = [
   {
     label: 'Alphabeticly',
-    value: 'name_ASC'
+    value: 'name_asc'
   },
   {
     label: 'Most contributors',
-    value: 'contributorsCount_DESC'
+    value: 'contributorCount_desc'
   },
   {
     label: 'Most organizations',
-    value: 'organizationsCount_DESC'
+    value: 'organizationCount_desc'
   },
   // {
   //   label: 'Most valuable',
-  //   value: 'softwareValueCount_DESC'
+  //   value: 'softwareValueCount_desc'
   // },
 ];
 </script>
diff --git a/frontend/app/components/modules/collection/components/details/header.vue b/frontend/app/components/modules/collection/components/details/header.vue
index fb1e8b939..28d699853 100644
--- a/frontend/app/components/modules/collection/components/details/header.vue
+++ b/frontend/app/components/modules/collection/components/details/header.vue
@@ -75,7 +75,7 @@
                 class="leading-6 transition-all"
                 :class="scrollTop > 50 ? 'text-xs md:text-sm' : 'text-xs md:text-base'"
               >
-                {{formatNumberShort(props.collection.projectsCount)}} projects
+                {{formatNumberShort(props.collection.projectCount)}} projects
               </p>
             </article>
             <!--<article class="flex items-center gap-2 h-min">-->
@@ -108,9 +108,9 @@
 </template>
 
 <script lang="ts" setup>
+import type {Collection} from "~~/types/collection";
 import LfxIconButton from "~/components/uikit/icon-button/icon-button.vue";
 import LfxBack from "~/components/uikit/back/back.vue";
-import type {Collection} from "~/components/modules/collection/types/Collection";
 import {formatNumberShort} from "~/components/shared/utils/formatter";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
 import useScroll from "~/components/shared/utils/scroll";
diff --git a/frontend/app/components/modules/collection/components/list/collection-list-item.vue b/frontend/app/components/modules/collection/components/list/collection-list-item.vue
index 65ded445c..0fbed3432 100644
--- a/frontend/app/components/modules/collection/components/list/collection-list-item.vue
+++ b/frontend/app/components/modules/collection/components/list/collection-list-item.vue
@@ -21,7 +21,7 @@
               />
             </div>
             <p class="leading-6 transition-all text-sm whitespace-nowrap">
-              {{formatNumberShort(props.collection.projectsCount)}} projects
+              {{formatNumberShort(props.collection.projectCount)}} projects
             </p>
           </article>
           <!--          <article class="flex items-center gap-2">-->
@@ -71,7 +71,7 @@
 </template>
 
 <script setup lang="ts">
-import type {Collection} from "~/components/modules/collection/types/Collection";
+import type {Collection} from "~~/types/collection";
 import LfxCard from "~/components/uikit/card/card.vue";
 import LfxChip from "~/components/uikit/chip/chip.vue";
 import LfxAvatar from "~/components/uikit/avatar/avatar.vue";
diff --git a/frontend/app/components/modules/collection/types/Collection.ts b/frontend/app/components/modules/collection/types/Collection.ts
deleted file mode 100644
index 9e5786135..000000000
--- a/frontend/app/components/modules/collection/types/Collection.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface Collection {
-    id: string;
-    name: string;
-    slug: string;
-    description: string;
-    isLf: number;
-    projectsCount: number;
-    featuredProjects: {
-        name: string;
-        slug: string;
-        logo: string;
-    }[];
-}
diff --git a/frontend/app/components/modules/collection/views/collection-details.vue b/frontend/app/components/modules/collection/views/collection-details.vue
index b28b1c583..574314137 100644
--- a/frontend/app/components/modules/collection/views/collection-details.vue
+++ b/frontend/app/components/modules/collection/views/collection-details.vue
@@ -51,12 +51,13 @@
 </template>
 
 <script setup lang="ts">
-import type {Collection} from "~/components/modules/collection/types/Collection";
+import {useRoute} from 'vue-router';
+import type {Collection} from "~~/types/collection";
+import type {Project} from "~~/types/project";
+import type {Pagination} from "~~/types/shared/pagination";
 import LfxCollectionHeader from "~/components/modules/collection/components/details/header.vue";
 import LfxCollectionFilters from "~/components/modules/collection/components/details/filters.vue";
 import LfxProjectListItem from "~/components/modules/project/components/list/project-list-item.vue";
-import type {Project} from "~/components/modules/project/types/project";
-import type {Pagination} from "~/components/shared/types/pagination";
 import LfxProjectListItemLoading from "~/components/modules/project/components/list/project-list-item-loading.vue";
 import useScroll from "~/components/shared/utils/scroll";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
@@ -66,18 +67,21 @@ const props = defineProps<{
   collection: Collection
 }>()
 
+const route = useRoute();
+const collectionSlug = route.params.slug as string;
+
 const {scrollTopPercentage} = useScroll();
 
-const sort = ref('name_ASC');
+const sort = ref('name_asc');
 const tab = ref('all');
 
-const page = ref(1);
+const page = ref(0);
 const pageSize = ref(50);
 
 const projects = ref([]);
 
 watch([sort, tab], () => {
-  page.value = 1;
+  page.value = 0;
 });
 
 const { data, status } = await useFetch<Pagination<Project>>(
@@ -88,10 +92,11 @@ const { data, status } = await useFetch<Pagination<Project>>(
         page,
         pageSize,
         isLf: tab.value === 'lfx',
+        collectionSlug
       },
       watch: [sort, tab, page],
       transform: (res: Pagination<Project>) => {
-        if (res.page === 1) {
+        if (res.page === 0) {
           projects.value = res.data;
         } else {
           projects.value = [...projects.value, ...res.data];
diff --git a/frontend/app/components/modules/collection/views/collection-list.vue b/frontend/app/components/modules/collection/views/collection-list.vue
index 5f826e27c..1bebd63be 100644
--- a/frontend/app/components/modules/collection/views/collection-list.vue
+++ b/frontend/app/components/modules/collection/views/collection-list.vue
@@ -91,12 +91,12 @@
 <script setup lang="ts">
 import {useFetch} from "nuxt/app";
 import {watch} from "vue";
+import type {Pagination} from "~~/types/shared/pagination";
+import type {Collection} from "~~/types/collection";
 import LfxIcon from '~/components/uikit/icon/icon.vue';
 import LfxTag from '~/components/uikit/tag/tag.vue';
 import LfxDropdown from '~/components/uikit/dropdown/dropdown.vue';
 import LfxCollectionListItem from '~/components/modules/collection/components/list/collection-list-item.vue';
-import type {Pagination} from "~/components/shared/types/pagination";
-import type {Collection} from "~/components/modules/collection/types/Collection";
 import {ToastTypesEnum} from "~/components/uikit/toast/types/toast.types";
 import useToastService from "~/components/uikit/toast/toast.service";
 import useResponsive from "~/components/shared/utils/responsive";
@@ -111,7 +111,7 @@ const {scrollTop} = useScroll();
 
 const page = ref(0);
 const pageSize = ref(10);
-const sort = ref('name_ASC');
+const sort = ref('name_asc');
 
 // const stack = ref('');
 // const industry = ref('');
@@ -167,15 +167,15 @@ watch(error, (err) => {
 const sortOptions = [
   {
     label: 'Alphabetically',
-    value: 'name_ASC'
+    value: 'name_asc'
   },
   {
     label: 'Most projects',
-    value: 'projectCount_DESC'
+    value: 'projectCount_desc'
   },
   // {
   //   label: 'Most valuable',
-  //   value: 'softwareValueCount_DESC'
+  //   value: 'softwareValueCount_desc'
   // },
 ];
 
diff --git a/frontend/app/components/modules/project/components/list/project-list-item.vue b/frontend/app/components/modules/project/components/list/project-list-item.vue
index 00419f0a8..0cad49430 100644
--- a/frontend/app/components/modules/project/components/list/project-list-item.vue
+++ b/frontend/app/components/modules/project/components/list/project-list-item.vue
@@ -29,7 +29,7 @@
             Contributors
           </lfx-tag>
           <p class="text-body-1">
-            {{formatNumber(props.project.contributorsCount)}}
+            {{formatNumber(props.project.contributorCount)}}
           </p>
         </article>
         <article class="flex justify-between items-center">
@@ -44,7 +44,7 @@
             Organizations
           </lfx-tag>
           <p class="text-body-1">
-            {{formatNumber(props.project.organizationsCount)}}
+            {{formatNumber(props.project.organizationCount)}}
           </p>
         </article>
         <!--<article class="flex justify-between items-center">-->
@@ -68,12 +68,12 @@
 </template>
 
 <script lang="ts" setup>
+import type {Project} from "~~/types/project";
 import {formatNumber} from "~/components/shared/utils/formatter";
 import LfxCard from "~/components/uikit/card/card.vue";
 import LfxAvatar from "~/components/uikit/avatar/avatar.vue";
 import LfxTag from "~/components/uikit/tag/tag.vue";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
-import type {Project} from "~/components/modules/project/types/project";
 import {LfxRoutes} from "~/components/shared/types/routes";
 
 const props = defineProps<{
diff --git a/frontend/app/components/modules/project/components/shared/header.vue b/frontend/app/components/modules/project/components/shared/header.vue
index 6e13ffbb7..3a0363cba 100644
--- a/frontend/app/components/modules/project/components/shared/header.vue
+++ b/frontend/app/components/modules/project/components/shared/header.vue
@@ -127,6 +127,7 @@
 <script lang="ts" setup>
 import {useRoute} from 'nuxt/app';
 import {computed} from 'vue';
+import type {Project} from "~~/types/project";
 import {LfxRoutes} from '~/components/shared/types/routes';
 import LfxIcon from '~/components/uikit/icon/icon.vue';
 import LfxMenuButton from '~/components/uikit/menu-button/menu-button.vue';
@@ -136,7 +137,6 @@ import useScroll from "~/components/shared/utils/scroll";
 import LfxIconButton from "~/components/uikit/icon-button/icon-button.vue";
 import LfxShare from "~/components/uikit/share/share.vue";
 import LfxProjectRepositorySwitch from "~/components/modules/project/components/shared/header/repository-switch.vue";
-import type {Project} from "~/components/modules/project/types/project";
 import LfxBack from "~/components/uikit/back/back.vue";
 import LfxProjectDateRangePicker from "~/components/modules/project/components/shared/header/date-range-picker.vue";
 import LfxMaintainHeight from "~/components/uikit/maintain-height/maintain-height.vue";
diff --git a/frontend/app/components/modules/project/components/shared/header/repository-switch.vue b/frontend/app/components/modules/project/components/shared/header/repository-switch.vue
index 7b59e5052..595d4ef44 100644
--- a/frontend/app/components/modules/project/components/shared/header/repository-switch.vue
+++ b/frontend/app/components/modules/project/components/shared/header/repository-switch.vue
@@ -73,9 +73,9 @@ import {
 computed, onMounted, ref, watch
 } from "vue";
 import {storeToRefs} from "pinia";
+import type {ProjectRepository} from "~~/types/project";
 import LfxModal from "~/components/uikit/modal/modal.vue";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
-import type {ProjectRepository} from "~/components/modules/project/types/project";
 import LfxProjectRepositorySwitchItem
   from "~/components/modules/project/components/shared/header/repository-switch-item.vue";
 import {LfxRoutes} from "~/components/shared/types/routes";
diff --git a/frontend/app/components/modules/project/store/project.store.ts b/frontend/app/components/modules/project/store/project.store.ts
index c7db9c892..f460de598 100644
--- a/frontend/app/components/modules/project/store/project.store.ts
+++ b/frontend/app/components/modules/project/store/project.store.ts
@@ -5,10 +5,7 @@ import {
   dateOptKeys,
   lfxProjectDateOptions
 } from '~/components/modules/project/config/date-options';
-import type {
-  Project,
-  ProjectRepository
-} from '~/components/modules/project/types/project';
+import type {Project, ProjectRepository} from "~~/types/project";
 import { getRepoNameFromUrl } from '~/components/modules/repository/utils/repository.helpers';
 
 export const useProjectStore = defineStore('project', () => {
diff --git a/frontend/app/components/shared/layout/navbar.vue b/frontend/app/components/shared/layout/navbar.vue
index 30c725ef4..dfb06c515 100644
--- a/frontend/app/components/shared/layout/navbar.vue
+++ b/frontend/app/components/shared/layout/navbar.vue
@@ -4,7 +4,7 @@
       <div class="h-14 lg:h-17 flex justify-between items-center gap-4 lg:gap-5">
         <div class="flex items-center gap-6 flex-grow min-w-0">
           <div>
-            <nuxt-link :to="{ name: LfxRoutes.EXPLORE }">
+            <nuxt-link :to="{ name: LfxRoutes.COLLECTIONS }">
               <img
                 src="~/assets/images/logo.svg"
                 alt="LFX Insights"
diff --git a/frontend/app/components/shared/layout/search/search-modal.vue b/frontend/app/components/shared/layout/search/search-modal.vue
index 49531d058..2ca69b42c 100644
--- a/frontend/app/components/shared/layout/search/search-modal.vue
+++ b/frontend/app/components/shared/layout/search/search-modal.vue
@@ -54,12 +54,12 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from "vue";
 import { debounce } from "lodash";
+import type {
+  SearchCollection, SearchProject, SearchRepository, SearchResults
+} from "~~/types/search";
 import LfxModal from "~/components/uikit/modal/modal.vue";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
 import LfxSearchResult from "~/components/shared/layout/search/search-result.vue";
-import type {
-  SearchCollection, SearchProject, SearchRepository, SearchResults
-} from "~/components/shared/types/search";
 import LfxSpinner from "~/components/uikit/spinner/spinner.vue";
 
 const props = defineProps<{ modelValue: boolean }>();
diff --git a/frontend/app/components/shared/layout/search/search-result.vue b/frontend/app/components/shared/layout/search/search-result.vue
index d489004bb..84b1aefa3 100644
--- a/frontend/app/components/shared/layout/search/search-result.vue
+++ b/frontend/app/components/shared/layout/search/search-result.vue
@@ -151,11 +151,11 @@
 
 <script setup lang="ts">
 import {useRoute} from "nuxt/app";
+import type {SearchCollection, SearchProject, SearchRepository} from "~~/types/search";
 import LfxTabs from "~/components/uikit/tabs/tabs.vue";
 import LfxAvatar from "~/components/uikit/avatar/avatar.vue";
 import LfxIcon from "~/components/uikit/icon/icon.vue";
 import {LfxRoutes} from "~/components/shared/types/routes";
-import type {SearchCollection, SearchProject, SearchRepository} from "~/components/shared/types/search";
 import {getRepoNameFromUrl} from "~/components/modules/repository/utils/repository.helpers";
 
 const props = defineProps<{
diff --git a/frontend/app/pages/collection/[slug].vue b/frontend/app/pages/collection/[slug].vue
index b6e8400d1..ee8a4c624 100644
--- a/frontend/app/pages/collection/[slug].vue
+++ b/frontend/app/pages/collection/[slug].vue
@@ -9,8 +9,8 @@
 import {
 useFetch, useRoute, createError, showError
 } from "nuxt/app";
+import type {Collection} from "~~/types/collection";
 import LfxCollectionDetailsView from "~/components/modules/collection/views/collection-details.vue";
-import type {Collection} from "~/components/modules/collection/types/Collection";
 
 const route = useRoute();
 const {slug} = route.params;
diff --git a/frontend/app/pages/project/[slug].vue b/frontend/app/pages/project/[slug].vue
index 1f58965c1..fa73b54f0 100644
--- a/frontend/app/pages/project/[slug].vue
+++ b/frontend/app/pages/project/[slug].vue
@@ -16,8 +16,8 @@ import {
   useRoute,
 } from "nuxt/app";
 import {storeToRefs} from "pinia";
+import type {Project} from "~~/types/project";
 import LfxProjectHeader from "~/components/modules/project/components/shared/header.vue";
-import type {Project} from "~/components/modules/project/types/project";
 import {useProjectStore} from "~/components/modules/project/store/project.store";
 
 const route = useRoute();
diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index 1dc769b57..3cdcc82fa 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -1,6 +1,6 @@
 import path from 'path';
-import { fileURLToPath } from 'url';
-import { FlatCompat } from '@eslint/eslintrc';
+import {fileURLToPath} from 'url';
+import {FlatCompat} from '@eslint/eslintrc';
 import withNuxt from './.nuxt/eslint.config.mjs';
 
 const filename = fileURLToPath(import.meta.url);
@@ -11,9 +11,9 @@ const compat = new FlatCompat({
 });
 const getRules = (extendedRules, excludeKeys = null) => {
   const rules = extendedRules
-    .filter((rule) => rule.rules)
-    .map((rule) => rule.rules)
-    .reduce((r, c) => Object.assign(r, c), {});
+      .filter((rule) => rule.rules)
+      .map((rule) => rule.rules)
+      .reduce((r, c) => Object.assign(r, c), {});
 
   if (excludeKeys) {
     // remove all the properties from the rules object that matches the excludeKeys string
@@ -37,12 +37,18 @@ export default withNuxt({
         extensions: ['.js', '.jsx', '.ts', '.tsx'],
         map: [
           ['@', './app'],
-          ['~', './app']
+          ['~', './app'],
+          ['~~', '.']
         ]
       },
-      typescript: {}
+      typescript: {
+        paths: {
+          '~/*': ['./app/*'],
+          '@/*': ['./app/*'],
+          '~~/*': ['./*']
+        }
+      }
     }
-    // extends: [...compat.extends('airbnb-base'), ...compat.extends('airbnb-typescript/base')],
   },
   ignores: ['*.config.*js', '.tailwind/*'],
   rules: {
diff --git a/frontend/package.json b/frontend/package.json
index 964cee532..ea1162cb9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,7 +19,6 @@
     "@nuxt/eslint": "^0.7.5",
     "@pinia/nuxt": "0.9.0",
     "@primevue/themes": "^4.2.5",
-    "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
     "eslint": "^9.18.0",
     "lodash": "^4.17.21",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 5dc7117df..4dfbb4f4b 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -17,9 +17,6 @@ importers:
       '@primevue/themes':
         specifier: ^4.2.5
         version: 4.2.5
-      dayjs:
-        specifier: ^1.11.13
-        version: 1.11.13
       echarts:
         specifier: ^5.6.0
         version: 5.6.0
@@ -2324,9 +2321,6 @@ packages:
     resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
     engines: {node: '>= 0.4'}
 
-  dayjs@1.11.13:
-    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
-
   db0@0.2.3:
     resolution: {integrity: sha512-PunuHESDNefmwVy1LDpY663uWwKt2ogLGoB6NOz2sflGREWqDreMwDgF8gfkXxgNXW+dqviyiJGm924H1BaGiw==}
     peerDependencies:
@@ -8495,8 +8489,6 @@ snapshots:
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
-  dayjs@1.11.13: {}
-
   db0@0.2.3: {}
 
   de-indent@1.0.2: {}
diff --git a/frontend/server/api/collection/[slug].ts b/frontend/server/api/collection/[slug].ts
index 12118adee..3d1fde052 100644
--- a/frontend/server/api/collection/[slug].ts
+++ b/frontend/server/api/collection/[slug].ts
@@ -1,18 +1,5 @@
 import {fetchFromTinybird} from "~~/server/data/tinybird/tinybird";
-
-interface CollectionDetailsResponse {
-    id: string;
-    name: string;
-    slug: string;
-    description: string;
-    isLf: number;
-    projectsCount: number;
-    featuredProjects: {
-        name: string;
-        slug: string;
-        logo: string;
-    }[];
-}
+import type {Collection} from "~~/types/collection";
 
 /**
  * API Endpoint: Fetch Collection Details by Slug
@@ -34,7 +21,7 @@ interface CollectionDetailsResponse {
  *     slug: string;
  *     description: string;
  *     isLf: number;
- *     projectsCount: number;
+ *     projectCount: number;
  *     featuredProjects: {
  *       name: string;
  *       slug: string;
@@ -54,10 +41,10 @@ interface CollectionDetailsResponse {
  *     statusMessage: "Internal server error"
  *   }
  */
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event): Promise<Collection | Error> => {
     const {slug} = event.context.params as Record<string, string>;
     try {
-        const res = await fetchFromTinybird<CollectionDetailsResponse[]>('/v0/pipes/collections_list.json', {
+        const res = await fetchFromTinybird<Collection[]>('/v0/pipes/collections_list.json', {
             slug,
         });
         if (!res.data || res.data.length === 0) {
diff --git a/frontend/server/api/collection/index.ts b/frontend/server/api/collection/index.ts
index f29a6b78d..7f37ee38d 100644
--- a/frontend/server/api/collection/index.ts
+++ b/frontend/server/api/collection/index.ts
@@ -1,18 +1,6 @@
 import {fetchFromTinybird} from "~~/server/data/tinybird/tinybird";
-
-interface CollectionResponse {
-    id: string;
-    name: string;
-    slug: string;
-    description: string;
-    isLf: number;
-    projectsCount: number;
-    featuredProjects: {
-        name: string;
-        slug: string;
-        logo: string;
-    }[];
-}
+import type {Pagination} from "~~/types/shared/pagination";
+import type {Collection} from "~~/types/collection";
 
 /**
  * API Endpoint: /api/collection
@@ -29,14 +17,15 @@ interface CollectionResponse {
  * - page (number): The current page number.
  * - pageSize (number): The number of items returned per page.
  * - total (number): The total number of items (if count is true).
- * - data (Array<CollectionResponse>): The list of collections.
+ * - data (Array<Collection>): The list of collections.
  *
  * Errors:
  * - 500: Internal Server Error
  */
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event): Promise<Pagination<Collection> | Error> => {
     const query = getQuery(event);
-    const sort: string = (query?.sort as string) || 'name_ASC';
+    const sort: string = (query?.sort as string) || 'name_asc';
+    const [orderByField, orderByDirection] = sort.split('_');
 
     // Pagination parameters
     const page: number = +(query?.page ?? 0);
@@ -44,19 +33,22 @@ export default defineEventHandler(async (event) => {
     const count: boolean = !!query?.count;
 
     try {
-        const res = await fetchFromTinybird<CollectionResponse[]>('/v0/pipes/collections_list.json', {
+        const res = await fetchFromTinybird<Collection[]>('/v0/pipes/collections_list.json', {
             count,
             page,
             pageSize,
-            sort,
+            orderByField,
+            orderByDirection,
         });
 
-        return {
+        const data: Pagination<Collection> = {
             page,
             pageSize,
             total: res.rows,
             data: res.data,
-        };
+        }
+
+        return data
     } catch (error) {
         console.error('Error collection list:', error);
         throw createError({statusCode: 500, statusMessage: 'Internal Server Error'});
diff --git a/frontend/server/api/project/[slug]/index.ts b/frontend/server/api/project/[slug]/index.ts
index 6d80d7514..b723be49f 100644
--- a/frontend/server/api/project/[slug]/index.ts
+++ b/frontend/server/api/project/[slug]/index.ts
@@ -1,22 +1,5 @@
 import {fetchFromTinybird} from "~~/server/data/tinybird/tinybird";
-
-interface ProjectRepository {
-    projectId: string;
-    projectName: string;
-    projectSlug: string;
-    repo: string;
-}
-
-interface ProjectDetailsResponse {
-    id: string;
-    name: string;
-    slug: string;
-    description: string;
-    logo: string;
-    contributorsCount: number;
-    organizationsCount: number;
-    repositories: ProjectRepository[];
-}
+import type {Project} from "~~/types/project";
 
 /**
  * API Endpoint: /api/projects/{slug}
@@ -32,8 +15,8 @@ interface ProjectDetailsResponse {
  * - slug (string): The slug of the project.
  * - description (string): A brief description of the project.
  * - logo (string): URL to the logo of the project.
- * - contributorsCount (number): The count of contributors involved in the project.
- * - organizationsCount (number): The count of organizations associated with the project.
+ * - contributorCount (number): The count of contributors involved in the project.
+ * - organizationCount (number): The count of organizations associated with the project.
  * - repositories (Array<ProjectRepository>): List of associated repositories for the project.
  *
  * Repository Object (ProjectRepository):
@@ -46,10 +29,10 @@ interface ProjectDetailsResponse {
  * - 404: Project not found.
  * - 500: Internal Server Error.
  */
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event): Promise<Project | Error> => {
     const {slug} = event.context.params as Record<string, string>;
     try {
-        const res = await fetchFromTinybird<ProjectDetailsResponse[]>('/v0/pipes/projects_list.json', {
+        const res = await fetchFromTinybird<Project[]>('/v0/pipes/projects_list.json', {
             slug,
         });
         if (!res.data || res.data.length === 0) {
diff --git a/frontend/server/api/project/index.ts b/frontend/server/api/project/index.ts
index f512f4eb3..b61aa2949 100644
--- a/frontend/server/api/project/index.ts
+++ b/frontend/server/api/project/index.ts
@@ -1,14 +1,6 @@
 import {fetchFromTinybird} from "~~/server/data/tinybird/tinybird";
-
-interface ProjectResponse {
-    id: string;
-    name: string;
-    slug: string;
-    description: string;
-    logo: string;
-    contributorsCount: number;
-    organizationsCount: number;
-}
+import type {Pagination} from "~~/types/shared/pagination";
+import type {Project} from "~~/types/project";
 
 /**
  * API Endpoint: /api/project
@@ -16,55 +8,62 @@ interface ProjectResponse {
  * Description: Fetches a paginated list of projects with sorting options and additional metadata.
  *
  * Query Parameters:
- * - sort (string, optional): Specifies the sorting order for the projects (default: "name_ASC").
+ * - sort (string, optional): Specifies the sorting order for the projects (default: "name_asc").
  * - page (number, optional): The page number for pagination (default: 0).
  * - pageSize (number, optional): The number of projects per page (default: 10).
  * - count (boolean, optional): Whether to include the total count of projects (default: false).
  * - isLf (boolean, optional): If a project belongs to lf (default: false).
+ * - collectionSlug (string, optional): The slug of the collection to filter projects by.
  *
  * Response:
  * - page (number): The current page number in the response.
  * - pageSize (number): The number of projects returned in the response.
  * - total (number): The total number of projects available (if `count` is true).
- * - data (Array<ProjectResponse>): The list of projects in the current page.
+ * - data (Array<Project>): The list of projects in the current page.
  *
- * Project Response Object (ProjectResponse):
+ * Project Response Object (Project):
  * - id (string): The unique identifier of the project.
  * - name (string): The name of the project.
  * - slug (string): The slug of the project.
  * - description (string): A brief description of the project.
  * - logo (string): URL to the logo of the project.
- * - contributorsCount (number): The count of contributors involved in the project.
- * - organizationsCount (number): The count of organizations associated with the project.
+ * - contributorCount (number): The count of contributors involved in the project.
+ * - organizationCount (number): The count of organizations associated with the project.
  *
  * Errors:
  * - 500: Internal Server Error.
  */
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event): Promise<Pagination<Project> | Error> => {
     const query = getQuery(event);
-    const sort: string = (query?.sort as string) || 'name_ASC';
+    const sort: string = (query?.sort as string) || 'name_asc';
+    const [orderByField, orderByDirection] = sort.split('_');
 
     // Pagination parameters
     const page: number = +(query?.page ?? 0);
     const pageSize: number = +(query?.pageSize ?? 10);
     const count: boolean = !!query?.count;
+    const collectionSlug: string | undefined = query?.collectionSlug as string || undefined;
     const isLf: boolean = !!query?.isLf;
 
     try {
-        const res = await fetchFromTinybird<ProjectResponse[]>('/v0/pipes/projects_list.json', {
+        const res = await fetchFromTinybird<Project[]>('/v0/pipes/projects_list.json', {
             count,
             page,
             pageSize,
-            sort,
+            collectionSlug,
             isLf,
+            orderByField,
+            orderByDirection,
         });
 
-        return {
+        const data: Pagination<Project> = {
             page,
             pageSize,
             total: res.rows,
             data: res.data,
-        };
+        }
+
+        return data;
     } catch (error) {
         console.error('Error fetching project list:', error);
         throw createError({statusCode: 500, statusMessage: 'Internal Server Error'});
diff --git a/frontend/server/api/search.ts b/frontend/server/api/search.ts
index 89bbab25c..a9fb9bcaa 100644
--- a/frontend/server/api/search.ts
+++ b/frontend/server/api/search.ts
@@ -1,18 +1,8 @@
 import {fetchFromTinybird} from "~~/server/data/tinybird/tinybird";
+import type {SearchCollection, SearchProject, SearchRepository} from "~~/types/search";
 
-/**
- * Represents the response object for a search operation.
- *
- * @interface SearchResponse
- *
- * @property {string} type - The type identifier for the search result.
- * @property {string} slug - A unique slug identifier for the search result.
- * @property {string | null} logo - The logo URL associated with the search result or null if unavailable.
- * @property {string | null} projectSlug - The project slug associated with the result or null if absent.
- * @property {string | null} name - The name or title of the search result or null if not provided.
- */
 export interface SearchResponse {
-    type: string;
+    type: 'project' | 'repository' | 'collection';
     slug: string;
     logo: string | null;
     projectSlug: string | null;
@@ -47,24 +37,36 @@ export default defineEventHandler(async (event) => {
     const query: Record<string, string | number> = getQuery(event);
     const searchQuery = query?.query || '';
 
-    const projects: SearchResponse[] = [];
-    const repositories: SearchResponse[] = [];
-    const collections: SearchResponse[] = [];
+    const projects: SearchProject[] = [];
+    const repositories: SearchRepository[] = [];
+    const collections: SearchCollection[] = [];
+
+    const limit: number = 10;
 
     try {
         const res = await fetchFromTinybird<SearchResponse[]>('/v0/pipes/search_collections_projects_repos.json', {
-            limit: 10,
+            limit,
             search: searchQuery,
         })
 
         if (res.data?.length > 0) {
             res.data.forEach((item) => {
                 if (item.type === 'project') {
-                    projects.push(item)
+                    projects.push({
+                        name: item.name as string,
+                        slug: item.slug,
+                        logo: item.logo,
+                    })
                 } else if (item.type === 'repository') {
-                    repositories.push(item)
+                    repositories.push({
+                        slug: item.slug,
+                        projectSlug: item.projectSlug || '',
+                    })
                 } else if (item.type === 'collection') {
-                    collections.push(item)
+                    collections.push({
+                        slug: item.slug,
+                        name: item.name || '',
+                    })
                 }
             })
         }
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 21a8e64c1..7687cb3cf 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -17,7 +17,9 @@
     "strict": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./app/*"],
+      "@/*": ["./app/*"],
+      "~~/*": ["./*"]
     }
   }
 }
diff --git a/frontend/types/collection.ts b/frontend/types/collection.ts
new file mode 100644
index 000000000..4297b52da
--- /dev/null
+++ b/frontend/types/collection.ts
@@ -0,0 +1,15 @@
+export interface CollectionFeaturedProject {
+    name: string;
+    slug: string;
+    logo: string;
+}
+
+export interface Collection {
+    id: string;
+    name: string;
+    slug: string;
+    description: string;
+    isLf: number;
+    projectCount: number;
+    featuredProjects: CollectionFeaturedProject[];
+}
diff --git a/frontend/app/components/modules/project/types/project.ts b/frontend/types/project.ts
similarity index 83%
rename from frontend/app/components/modules/project/types/project.ts
rename to frontend/types/project.ts
index 91f592d13..b60ab649b 100644
--- a/frontend/app/components/modules/project/types/project.ts
+++ b/frontend/types/project.ts
@@ -11,7 +11,7 @@ export interface Project{
     slug: string;
     description: string;
     logo: string;
-    contributorsCount: number;
-    organizationsCount: number;
+    contributorCount: number;
+    organizationCount: number;
     repositories: ProjectRepository[];
 }
diff --git a/frontend/app/components/shared/types/search.ts b/frontend/types/search.ts
similarity index 93%
rename from frontend/app/components/shared/types/search.ts
rename to frontend/types/search.ts
index d26915a12..98632eb6d 100644
--- a/frontend/app/components/shared/types/search.ts
+++ b/frontend/types/search.ts
@@ -6,7 +6,7 @@ export interface SearchCollection {
 export interface SearchProject {
     name: string;
     slug: string;
-    logo: string;
+    logo: string | null;
 }
 
 export interface SearchRepository {
diff --git a/frontend/app/components/shared/types/pagination.ts b/frontend/types/shared/pagination.ts
similarity index 100%
rename from frontend/app/components/shared/types/pagination.ts
rename to frontend/types/shared/pagination.ts