diff --git a/src/app/api/course-list/route.ts b/src/app/api/course-list/route.ts
index 09d171ae..31ef5c0a 100644
--- a/src/app/api/course-list/route.ts
+++ b/src/app/api/course-list/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import { Course } from "@/db/course";
 
 export const dynamic = "force-dynamic";
diff --git a/src/app/api/paper-by-id/[id]/route.ts b/src/app/api/paper-by-id/[id]/route.ts
index 09a0ebbb..aced225c 100644
--- a/src/app/api/paper-by-id/[id]/route.ts
+++ b/src/app/api/paper-by-id/[id]/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import Paper from "@/db/papers";
 import { Types } from "mongoose";
 
diff --git a/src/app/api/papers/count/route.ts b/src/app/api/papers/count/route.ts
index 2849c825..2225ff3a 100644
--- a/src/app/api/papers/count/route.ts
+++ b/src/app/api/papers/count/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import CourseCount from "@/db/course";
 
 export const dynamic = "force-dynamic";
diff --git a/src/app/api/papers/route.ts b/src/app/api/papers/route.ts
index fc4aa808..5b2ae2fc 100644
--- a/src/app/api/papers/route.ts
+++ b/src/app/api/papers/route.ts
@@ -1,7 +1,9 @@
 import { NextResponse, type NextRequest } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import Paper from "@/db/papers";
 import { type IPaper } from "@/interface";
+import { escapeRegExp } from "@/lib/utils/regex";
+import { extractUniqueValues } from "@/lib/utils/paper-aggregation";
 
 export const dynamic = "force-dynamic";
 
@@ -10,10 +12,6 @@ export async function GET(req: NextRequest) {
     await connectToDatabase();
     const url = req.nextUrl.searchParams;
     const subject = url.get("subject");
-    const escapeRegExp = (text: string) => {
-      return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    };
-    const escapedSubject = escapeRegExp(subject ?? "");
 
     if (!subject) {
       return NextResponse.json(
@@ -22,42 +20,17 @@ export async function GET(req: NextRequest) {
       );
     }
 
+    const escapedSubject = escapeRegExp(subject);
     const papers: IPaper[] = await Paper.find({
       subject: { $regex: new RegExp(`${escapedSubject}`, "i") },
     });
 
-    if (papers.length === 0) {
-      return NextResponse.json(
-        {
-          papers,
-          unique_years: [],
-          unique_slots: [],
-          unique_exams: [],
-          unique_campuses: [],
-          unique_semesters: [],
-        },
-        { status: 200 },
-      );
-    }
-
-    const unique_years = Array.from(new Set(papers.map((paper) => paper.year)));
-    const unique_slots = Array.from(new Set(papers.map((paper) => paper.slot)));
-    const unique_exams = Array.from(new Set(papers.map((paper) => paper.exam)));
-    const unique_campuses = Array.from(
-      new Set(papers.map((paper) => paper.campus)),
-    );
-    const unique_semesters = Array.from(
-      new Set(papers.map((paper) => paper.semester)),
-    );
+    const uniqueValues = extractUniqueValues(papers);
 
     return NextResponse.json(
       {
         papers,
-        unique_years,
-        unique_slots,
-        unique_exams,
-        unique_campuses,
-        unique_semesters,
+        ...uniqueValues,
       },
       { status: 200 },
     );
@@ -67,4 +40,4 @@ export async function GET(req: NextRequest) {
       { status: 500 },
     );
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/related-subject/route.ts b/src/app/api/related-subject/route.ts
index 1640f9ec..77800cbf 100644
--- a/src/app/api/related-subject/route.ts
+++ b/src/app/api/related-subject/route.ts
@@ -1,7 +1,8 @@
 import { NextResponse, type NextRequest } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import { IRelatedSubject } from "@/interface";
 import RelatedSubject from "@/db/relatedSubjects";
+import { escapeRegExp } from "@/lib/utils/regex";
 
 export const dynamic = "force-dynamic";
 
@@ -10,10 +11,6 @@ export async function GET(req: NextRequest) {
     await connectToDatabase();
     const url = req.nextUrl.searchParams;
     const subject = url.get("subject");
-    const escapeRegExp = (text: string) => {
-      return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    };
-    const escapedSubject = escapeRegExp(subject ?? "");
 
     if (!subject) {
       return NextResponse.json(
@@ -21,9 +18,12 @@ export async function GET(req: NextRequest) {
         { status: 400 },
       );
     }
+
+    const escapedSubject = escapeRegExp(subject);
     const subjects: IRelatedSubject[] = await RelatedSubject.find({
       subject: { $regex: new RegExp(`${escapedSubject}`, "i") },
     });
+    
     console.log("realted", subjects);
 
     return NextResponse.json(
@@ -38,4 +38,4 @@ export async function GET(req: NextRequest) {
       { status: 500 },
     );
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/request/route.ts b/src/app/api/request/route.ts
index 3c5920d5..48c93022 100644
--- a/src/app/api/request/route.ts
+++ b/src/app/api/request/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import PaperRequest from "@/db/paperRequest";
 
 export async function POST(req: Request) {
diff --git a/src/app/api/selected-papers/route.ts b/src/app/api/selected-papers/route.ts
index fd972d25..5c822f6b 100644
--- a/src/app/api/selected-papers/route.ts
+++ b/src/app/api/selected-papers/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import Paper from "@/db/papers";
 
 export const dynamic = "force-dynamic";
diff --git a/src/app/api/subscribe/route.ts b/src/app/api/subscribe/route.ts
index cc08c95e..2848b59f 100644
--- a/src/app/api/subscribe/route.ts
+++ b/src/app/api/subscribe/route.ts
@@ -1,34 +1,5 @@
 import { NextResponse } from "next/server";
-import { google, sheets_v4 } from "googleapis";
-import { JWT } from "google-auth-library";
-
-const SCOPES = ["https://www.googleapis.com/auth/spreadsheets"];
-const SHEET_ID = process.env.SHEET_ID;
-
-async function getAuth(): Promise<JWT> {
-  return new google.auth.JWT({
-    email: process.env.GOOGLE_CLIENT_EMAIL,
-    key: process.env.GOOGLE_PRIVATE_KEY?.replace(/\\n/g, "\n"),
-    scopes: SCOPES,
-  });
-}
-
-async function appendEmailToSheet(email: string) {
-  const authClient = await getAuth();
-  const sheets: sheets_v4.Sheets = google.sheets({
-    version: "v4",
-    auth: authClient,
-  });
-
-  await sheets.spreadsheets.values.append({
-    spreadsheetId: SHEET_ID,
-    range: "Sheet1!A:A",
-    valueInputOption: "RAW",
-    requestBody: {
-      values: [[email]],
-    },
-  });
-}
+import { appendEmailToSheet } from "@/lib/services/google-sheets";
 
 export async function POST(req: Request) {
   try {
@@ -44,4 +15,4 @@ export async function POST(req: Request) {
     console.error("Error adding email:", error);
     return NextResponse.json({ error: "Failed to add email" }, { status: 500 });
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/upcoming-papers/route.ts b/src/app/api/upcoming-papers/route.ts
index 8b426fab..72d52e9a 100644
--- a/src/app/api/upcoming-papers/route.ts
+++ b/src/app/api/upcoming-papers/route.ts
@@ -1,7 +1,8 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import UpcomingSlot from "@/db/upcoming-slot";
 import UpcomingSubject from "@/db/upcoming-paper";
+import { calculateCorrespondingSlots } from "@/lib/utils/slot-calculation";
 
 export const dynamic = "force-dynamic";
 
@@ -10,6 +11,7 @@ export async function GET() {
     await connectToDatabase();
     const upcomingSlot = await UpcomingSlot.find();
     const slot = upcomingSlot[0]?.slot;
+    
     if (!slot) {
       return NextResponse.json(
         {
@@ -18,16 +20,12 @@ export async function GET() {
         { status: 404 },
       );
     }
-    const nextSlot = String.fromCharCode(slot.charCodeAt(0) + 1);
-    const correspondingSlots = [
-      slot + "1",
-      slot + "2",
-      nextSlot + "1",
-      nextSlot + "2",
-    ];
+
+    const correspondingSlots = calculateCorrespondingSlots(slot);
     const selectedSubjects = await UpcomingSubject.find({
       slots: { $in: correspondingSlots },
     });
+    
     if (selectedSubjects.length === 0) {
       return NextResponse.json(
         {
@@ -49,4 +47,4 @@ export async function GET() {
       { status: 500 },
     );
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/upload/route.ts b/src/app/api/upload/route.ts
index 4164ebe4..2fad98e7 100644
--- a/src/app/api/upload/route.ts
+++ b/src/app/api/upload/route.ts
@@ -1,8 +1,8 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import { PaperAdmin } from "@/db/papers";
-import { createPDFfromImages } from "@/lib/pdf";
-import { uploadPDF, uploadThumbnail } from "@/lib/storage";
+import { createPDFfromImages } from "@/lib/storage/pdf";
+import { uploadPDF, uploadThumbnail } from "@/lib/storage/gcp";
 
 export const runtime = "nodejs";
 
diff --git a/src/app/api/user-papers/route.ts b/src/app/api/user-papers/route.ts
index 9f1ba6b3..f3a9c674 100644
--- a/src/app/api/user-papers/route.ts
+++ b/src/app/api/user-papers/route.ts
@@ -1,11 +1,11 @@
 import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/mongoose";
+import { connectToDatabase } from "@/lib/database/mongoose";
 import Paper from "@/db/papers";
-import { StoredSubjects, TransformedPaper } from "@/interface";
+import { StoredSubjects } from "@/interface";
+import { transformPapersToSubjectSlots } from "@/lib/services/paper-transform";
 
 export const dynamic = "force-dynamic";
 
-
 export async function POST(req: Request) {
   try {
     await connectToDatabase();
@@ -17,22 +17,7 @@ export async function POST(req: Request) {
 
     console.log("Fetched user papers:", usersPapers);
 
-    const transformedPapers = usersPapers.reduce<TransformedPaper[]>(
-      (acc, paper) => {
-        const existing = acc.find((item) => item.subject === paper.subject);
-
-        if (existing) {
-          if (!existing.slots.includes(paper.slot)) {
-            existing.slots.push(paper.slot);
-          }
-        } else {
-          acc.push({ subject: paper.subject, slots: [paper.slot] });
-        }
-
-        return acc;
-      },
-      [],
-    );
+    const transformedPapers = transformPapersToSubjectSlots(usersPapers);
 
     return NextResponse.json(transformedPapers, {
       status: 200,
@@ -46,4 +31,4 @@ export async function POST(req: Request) {
       { status: 500 },
     );
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/paper/[id]/page.tsx b/src/app/paper/[id]/page.tsx
index 8161ccf2..fb720f77 100644
--- a/src/app/paper/[id]/page.tsx
+++ b/src/app/paper/[id]/page.tsx
@@ -3,7 +3,7 @@ import PdfViewer from "@/components/pdfViewer";
 import RelatedPapers from "@/components/RelatedPaper";
 import Loader from "@/components/ui/loader";
 import { type ErrorResponse, type PaperResponse } from "@/interface";
-import { extractBracketContent } from "@/util/utils";
+import { extractBracketContent } from "@/lib/utils/string";
 import axios, { type AxiosResponse } from "axios";
 import { type Metadata } from "next";
 import { redirect } from "next/navigation";
diff --git a/src/app/upload/page.tsx b/src/app/upload/page.tsx
index 1260f84f..d5cf150a 100644
--- a/src/app/upload/page.tsx
+++ b/src/app/upload/page.tsx
@@ -26,7 +26,7 @@ import Dropzone from "react-dropzone";
 import { Upload, XIcon } from "lucide-react";
 import { getDocument, GlobalWorkerOptions } from "pdfjs-dist";
 
-GlobalWorkerOptions.workerSrc = 
+GlobalWorkerOptions.workerSrc =
   "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.worker.min.mjs";
 
 interface APIResponse {
@@ -288,7 +288,7 @@ export default function Page() {
       setIsUploading(false);
     }
   };
-  
+
   return (
     <main className="mx-auto max-w-3xl px-4 py-8">
       <div className="flex h-[calc(100vh-90px)] flex-col justify-center px-6 font-play">
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 6a64f276..c32c1f99 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -5,15 +5,15 @@ import { type IPaper } from "@/interface";
 import Image from "next/image";
 import { Eye, Download, Check } from "lucide-react";
 import {
-  capsule,
   extractBracketContent,
   extractWithoutBracketContent,
-} from "@/util/utils";
+} from "@/lib/utils/string";
 import {
   getSecureUrl,
   generateFileName,
   downloadFile,
-} from "@/util/download_paper";
+} from "@/lib/utils/download";
+import { Capsule } from "@/components/ui/capsule";
 import Link from "next/link";
 import { cn } from "@/lib/utils";
 
@@ -88,10 +88,10 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
               {extractWithoutBracketContent(paper.subject)}
             </div>
             <div className="flex flex-wrap gap-2">
-              {capsule(paper.exam)}
-              {capsule(paper.slot)}
-              {capsule(paper.year)}
-              {capsule(paper.semester)}
+              <Capsule>{paper.exam}</Capsule>
+              <Capsule>{paper.slot}</Capsule>
+              <Capsule>{paper.year}</Capsule>
+              <Capsule>{paper.semester}</Capsule>
             </div>
           </div>
         </div>
diff --git a/src/components/CatalogueContent.tsx b/src/components/CatalogueContent.tsx
index 327be364..90250139 100644
--- a/src/components/CatalogueContent.tsx
+++ b/src/components/CatalogueContent.tsx
@@ -20,7 +20,7 @@ import {
   getSecureUrl,
   generateFileName,
   downloadFile,
-} from "@/util/download_paper";
+} from "@/lib/utils/download";
 import type { ICourses } from "@/interface";
 import JSZip from "jszip";
 import { toast } from "react-hot-toast";
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 3b4d2fd3..9a9ac763 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -48,13 +48,13 @@ function Navbar() {
 
       <div className="flex h-8 items-center gap-1 rounded-full border border-[#3A3745] bg-[#e8e9ff] px-2.5 py-1 text-xs font-semibold text-gray-700 transition hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] sm:h-9 sm:gap-2 sm:px-3.5 sm:py-1.5 sm:text-sm md:h-10 md:px-4 md:py-2 md:text-base">
         <span className="truncate">
-          <PinnedModal/>
+          <PinnedModal />
         </span>
       </div>
 
       <div className="flex h-8 items-center gap-1 rounded-full border border-[#3A3745] bg-[#e8e9ff] px-2.5 py-1 text-xs font-semibold text-gray-700 transition hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] sm:h-9 sm:gap-2 sm:px-3.5 sm:py-1.5 sm:text-sm md:h-10 md:px-4 md:py-2 md:text-base">
         <span className="truncate">
-          <RequestModal/>
+          <RequestModal />
         </span>
       </div>
     </>
@@ -95,7 +95,7 @@ function Navbar() {
               <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
                 <DropdownMenuTrigger asChild>
                   <button
-                    className="flex h-10 w-10 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] shadow-lg transition-transform duration-200 hover:scale-105 active:scale-95"
+                    className="flex h-10 w-10 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 shadow-lg transition-transform duration-200 hover:scale-105 hover:bg-slate-50 active:scale-95 dark:bg-black dark:text-white dark:hover:bg-[#1A1823]"
                     aria-label="Toggle dropdown"
                   >
                     <ChevronDown
@@ -105,14 +105,20 @@ function Navbar() {
                 </DropdownMenuTrigger>
 
                 <DropdownMenuContent
-                  className="w-56 rounded-2xl border border-[rgba(255,255,255,0.1)] border-[#3A3745] bg-[#e8e9ff] text-gray-700 hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] shadow-2xl backdrop-blur-sm"
+                  className="w-56 rounded-2xl border border-[#3A3745] border-[rgba(255,255,255,0.1)] bg-[#e8e9ff] text-gray-700 shadow-2xl backdrop-blur-sm hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823]"
                   align="start"
                 >
-                  <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-                    <PinnedModal/>
+                  <DropdownMenuItem
+                    asChild
+                    onSelect={(e) => e.preventDefault()}
+                  >
+                    <PinnedModal />
                   </DropdownMenuItem>
-                  <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-                    <RequestModal/>
+                  <DropdownMenuItem
+                    asChild
+                    onSelect={(e) => e.preventDefault()}
+                  >
+                    <RequestModal />
                   </DropdownMenuItem>
                 </DropdownMenuContent>
               </DropdownMenu>
@@ -126,7 +132,7 @@ function Navbar() {
                 >
                   <DropdownMenuTrigger asChild>
                     <button
-                      className="flex h-10 w-10 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] shadow-lg transition-transform duration-200 hover:scale-105 active:scale-95"
+                      className="flex h-10 w-10 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 shadow-lg transition-transform duration-200 hover:scale-105 hover:bg-slate-50 active:scale-95 dark:bg-black dark:text-white dark:hover:bg-[#1A1823]"
                       aria-label="Toggle dropdown"
                     >
                       <ChevronDown
@@ -136,22 +142,25 @@ function Navbar() {
                   </DropdownMenuTrigger>
 
                   <DropdownMenuContent
-                  className="xl:hidden flex flex-col gap-1 py-3 w-72 space-y-1 rounded-3xl px-4
-                  border border-[#3A3745] shadow-lg backdrop-blur-sm transition-colors
-                  bg-[#e8e9ff] text-gray-700 
-                  dark:bg-black dark:text-white dark:border-[#3A3745]"
-                  align="end"
-                >
-                    <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-                      <PinnedModal/>
+                    className="flex w-72 flex-col gap-1 space-y-1 rounded-3xl border border-[#3A3745] bg-[#e8e9ff] px-4 py-3 text-gray-700 shadow-lg backdrop-blur-sm transition-colors dark:border-[#3A3745] dark:bg-black dark:text-white xl:hidden"
+                    align="end"
+                  >
+                    <DropdownMenuItem
+                      asChild
+                      onSelect={(e) => e.preventDefault()}
+                    >
+                      <PinnedModal />
                     </DropdownMenuItem>
-                    <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-                      <RequestModal/>
+                    <DropdownMenuItem
+                      asChild
+                      onSelect={(e) => e.preventDefault()}
+                    >
+                      <RequestModal />
                     </DropdownMenuItem>
                   </DropdownMenuContent>
                 </DropdownMenu>
               </div>
-              <div className="hidden h-10 items-center xl:flex gap-2">
+              <div className="hidden h-10 items-center gap-2 xl:flex">
                 {renderHomePageButtons()}
               </div>
             </>
diff --git a/src/components/PapersCarousel.tsx b/src/components/PapersCarousel.tsx
index a7100139..961c302a 100644
--- a/src/components/PapersCarousel.tsx
+++ b/src/components/PapersCarousel.tsx
@@ -12,7 +12,7 @@ import {
   CarouselPrevious,
 } from "@/components/ui/carousel";
 import Autoplay from "embla-carousel-autoplay";
-import { chunkArray } from "@/util/utils";
+import { chunkArray } from "@/lib/utils/array";
 import { Skeleton } from "@/components/ui/skeleton";
 import SkeletonPaperCard from "@/components/SkeletonPaperCard";
 
diff --git a/src/components/PinnedPapersCarousel.tsx b/src/components/PinnedPapersCarousel.tsx
index 9da57ae1..3bd80ead 100644
--- a/src/components/PinnedPapersCarousel.tsx
+++ b/src/components/PinnedPapersCarousel.tsx
@@ -16,7 +16,7 @@ import {
 import { Skeleton } from "./ui/skeleton";
 import AddPapers from "./AddPapers";
 import Autoplay from "embla-carousel-autoplay";
-import { chunkArray } from "@/util/utils";
+import { chunkArray } from "@/lib/utils/array";
 import { StoredSubjects } from "@/interface";
 import SkeletonPaperCard from "./SkeletonPaperCard";
 import PinnedModal from "./ui/PinnedModal";
diff --git a/src/components/UpcomingPaper.tsx b/src/components/UpcomingPaper.tsx
index 2a24380a..4da6923c 100644
--- a/src/components/UpcomingPaper.tsx
+++ b/src/components/UpcomingPaper.tsx
@@ -1,13 +1,14 @@
 import {
-  capsule,
   extractBracketContent,
   extractWithoutBracketContent,
-} from "@/util/utils";
+} from "@/lib/utils/string";
+
 import { useRouter } from "next/navigation";
 import { Pin } from "lucide-react";
 import React, { useContext, useEffect, useState } from "react";
 import { StoredSubjects } from "@/interface";
 import { useCourses } from "@/context/courseContext";
+import { Capsule } from "@/components/ui/capsule";
 
 interface PaperCardProps {
   subject: string;
@@ -34,8 +35,7 @@ export default function PaperCard({ subject, slots }: PaperCardProps) {
 
     localStorage.setItem("userSubjects", JSON.stringify(updated));
     window.dispatchEvent(new Event("userSubjectsChanged"));
-    if(!current)
-      window.dispatchEvent(new Event("updatePapers"));
+    if (!current) window.dispatchEvent(new Event("updatePapers"));
   };
 
   useEffect(() => {
@@ -105,7 +105,9 @@ export default function PaperCard({ subject, slots }: PaperCardProps) {
 
         {
           <div className="mt-4 flex flex-wrap gap-2 font-play">
-            {slots?.map((slotValue) => capsule(slotValue))}
+            {slots?.map((slotValue, index) => (
+              <Capsule key={index}>{slotValue}</Capsule>
+            ))}
           </div>
         }
       </div>
diff --git a/src/components/pdfViewer.tsx b/src/components/pdfViewer.tsx
index 9a8d767b..2d340ceb 100644
--- a/src/components/pdfViewer.tsx
+++ b/src/components/pdfViewer.tsx
@@ -6,7 +6,7 @@ import { useState, useRef, useCallback, useEffect } from "react";
 import { Document, Page, pdfjs } from "react-pdf";
 import { Download, ZoomIn, ZoomOut, Maximize2, Minimize2 } from "lucide-react";
 import { Button } from "./ui/button";
-import { downloadFile } from "@/util/download_paper";
+import { downloadFile } from "../lib/utils/download";
 import ShareButton from "./ShareButton";
 import Loader from "./ui/loader";
 import { FaGreaterThan, FaLessThan } from "react-icons/fa6";
diff --git a/src/components/ui/capsule.tsx b/src/components/ui/capsule.tsx
new file mode 100644
index 00000000..edb1eb99
--- /dev/null
+++ b/src/components/ui/capsule.tsx
@@ -0,0 +1,28 @@
+import { cva, type VariantProps } from "class-variance-authority";
+
+const capsule = cva(
+  "rounded-md p-1 px-3 text-sm",
+  {
+    variants: {
+      theme: {
+        blue: "rounded-sm bg-[#B2B8FF] dark:bg-[#7480FFCC]",
+        green: "bg-[#3cc923]",
+      },
+    },
+    defaultVariants: {
+      theme: "blue",
+    },
+  }
+);
+
+export interface CapsuleProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    VariantProps<typeof capsule> {}
+
+export function Capsule({ children, theme, ...props }: CapsuleProps) {
+  return (
+    <div className={capsule({ theme })} {...props}>
+      {children}
+    </div>
+  );
+}
diff --git a/src/lib/mongoose.ts b/src/lib/database/mongoose.ts
similarity index 99%
rename from src/lib/mongoose.ts
rename to src/lib/database/mongoose.ts
index 6030ba14..5e3b2e7f 100644
--- a/src/lib/mongoose.ts
+++ b/src/lib/database/mongoose.ts
@@ -39,4 +39,4 @@ export async function connectToDatabase() {
   }
 
   return cached?.conn;
-}
+}
\ No newline at end of file
diff --git a/src/lib/services/google-sheets.ts b/src/lib/services/google-sheets.ts
new file mode 100644
index 00000000..0adb583b
--- /dev/null
+++ b/src/lib/services/google-sheets.ts
@@ -0,0 +1,30 @@
+import { google, sheets_v4 } from "googleapis";
+import { JWT } from "google-auth-library";
+
+const SCOPES = ["https://www.googleapis.com/auth/spreadsheets"];
+const SHEET_ID = process.env.SHEET_ID;
+
+export async function getGoogleSheetsAuth(): Promise<JWT> {
+  return new google.auth.JWT({
+    email: process.env.GOOGLE_CLIENT_EMAIL,
+    key: process.env.GOOGLE_PRIVATE_KEY?.replace(/\\n/g, "\n"),
+    scopes: SCOPES,
+  });
+}
+
+export async function appendEmailToSheet(email: string): Promise<void> {
+  const authClient = await getGoogleSheetsAuth();
+  const sheets: sheets_v4.Sheets = google.sheets({
+    version: "v4",
+    auth: authClient,
+  });
+
+  await sheets.spreadsheets.values.append({
+    spreadsheetId: SHEET_ID,
+    range: "Sheet1!A:A",
+    valueInputOption: "RAW",
+    requestBody: {
+      values: [[email]],
+    },
+  });
+}
\ No newline at end of file
diff --git a/src/lib/services/paper-transform.ts b/src/lib/services/paper-transform.ts
new file mode 100644
index 00000000..268a0a07
--- /dev/null
+++ b/src/lib/services/paper-transform.ts
@@ -0,0 +1,17 @@
+import { type IPaper, type TransformedPaper } from "../../interface";
+
+export function transformPapersToSubjectSlots(papers: IPaper[]): TransformedPaper[] {
+  return papers.reduce<TransformedPaper[]>((acc, paper) => {
+    const existing = acc.find((item) => item.subject === paper.subject);
+
+    if (existing) {
+      if (!existing.slots.includes(paper.slot)) {
+        existing.slots.push(paper.slot);
+      }
+    } else {
+      acc.push({ subject: paper.subject, slots: [paper.slot] });
+    }
+
+    return acc;
+  }, []);
+}
\ No newline at end of file
diff --git a/src/lib/storage.ts b/src/lib/storage/gcp.ts
similarity index 97%
rename from src/lib/storage.ts
rename to src/lib/storage/gcp.ts
index dbaa98fe..a8dd058a 100644
--- a/src/lib/storage.ts
+++ b/src/lib/storage/gcp.ts
@@ -3,7 +3,6 @@ import { Storage, StorageOptions } from "@google-cloud/storage";
 interface GCPCredentials {
   type: string;
   project_id: string;
-  private_key_id: string;
   private_key: string;
   client_email: string;
   client_id: string;
@@ -36,4 +35,4 @@ export async function uploadThumbnail(buffer: Buffer, pdfFilename: string) {
   const thumbFilename = pdfFilename.replace(".pdf", ".png");
   await bucket.file(thumbFilename).save(buffer, { resumable: false, contentType: "image/png" });
   return `https://storage.googleapis.com/${bucketName}/${thumbFilename}`;
-}
+}
\ No newline at end of file
diff --git a/src/lib/pdf.ts b/src/lib/storage/pdf.ts
similarity index 96%
rename from src/lib/pdf.ts
rename to src/lib/storage/pdf.ts
index 48c9f769..2904bbff 100644
--- a/src/lib/pdf.ts
+++ b/src/lib/storage/pdf.ts
@@ -16,5 +16,5 @@ export async function createPDFfromImages(files: File[]): Promise<Uint8Array> {
     page.drawImage(img, { x: 0, y: 0, width: img.width, height: img.height });
   }
 
-  return pdfDoc.save(); 
+  return pdfDoc.save();
 }
diff --git a/src/lib/utils/array.ts b/src/lib/utils/array.ts
new file mode 100644
index 00000000..cd3d1b1f
--- /dev/null
+++ b/src/lib/utils/array.ts
@@ -0,0 +1,7 @@
+export function chunkArray<T>(array: T[], size: number): T[][] {
+  const result: T[][] = [];
+  for (let i = 0; i < array.length; i += size) {
+    result.push(array.slice(i, i + size));
+  }
+  return result;
+}
\ No newline at end of file
diff --git a/src/util/download_paper.tsx b/src/lib/utils/download.ts
similarity index 90%
rename from src/util/download_paper.tsx
rename to src/lib/utils/download.ts
index c33cbef3..d8fe573e 100644
--- a/src/util/download_paper.tsx
+++ b/src/lib/utils/download.ts
@@ -1,5 +1,5 @@
-import { IPaper } from "@/interface";
-import { extractBracketContent } from "./utils";
+import { IPaper } from "../../interface";
+import { extractBracketContent } from "./string";
 import axios from "axios";
 
 export const getSecureUrl = (url: string): string =>
@@ -25,4 +25,4 @@ export const downloadFile = async (
   } catch (error) {
     console.error("Download failed:", error);
   }
-};
+};
\ No newline at end of file
diff --git a/src/util/error.tsx b/src/lib/utils/error.ts
similarity index 92%
rename from src/util/error.tsx
rename to src/lib/utils/error.ts
index 0ba254cf..01c8d0de 100644
--- a/src/util/error.tsx
+++ b/src/lib/utils/error.ts
@@ -1,6 +1,6 @@
 import axios, { type AxiosError } from "axios";
 import { ApiError } from "next/dist/server/api-utils";
-import { toSentenceCase } from "./utils";
+import { toSentenceCase } from "./string";
 
 export function handleAPIError(err: unknown): ApiError {
   if (axios.isAxiosError(err)) {
@@ -16,4 +16,4 @@ export function handleAPIError(err: unknown): ApiError {
     }
   }
   return new ApiError(500, "Something went wrong");
-}
+}
\ No newline at end of file
diff --git a/src/lib/utils.ts b/src/lib/utils/index.ts
similarity index 98%
rename from src/lib/utils.ts
rename to src/lib/utils/index.ts
index bd0c391d..a7dc3a13 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils/index.ts
@@ -3,4 +3,4 @@ import { twMerge } from "tailwind-merge"
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
-}
+}
\ No newline at end of file
diff --git a/src/lib/utils/paper-aggregation.ts b/src/lib/utils/paper-aggregation.ts
new file mode 100644
index 00000000..7bab7540
--- /dev/null
+++ b/src/lib/utils/paper-aggregation.ts
@@ -0,0 +1,28 @@
+import { type IPaper } from "../../interface";
+
+
+export function extractUniqueValues(papers: IPaper[]) {
+  if (papers.length === 0) {
+    return {
+      unique_years: [],
+      unique_slots: [],
+      unique_exams: [],
+      unique_campuses: [],
+      unique_semesters: [],
+    };
+  }
+
+  const unique_years = Array.from(new Set(papers.map((paper) => paper.year)));
+  const unique_slots = Array.from(new Set(papers.map((paper) => paper.slot)));
+  const unique_exams = Array.from(new Set(papers.map((paper) => paper.exam)));
+  const unique_campuses = Array.from(new Set(papers.map((paper) => paper.campus)));
+  const unique_semesters = Array.from(new Set(papers.map((paper) => paper.semester)));
+
+  return {
+    unique_years,
+    unique_slots,
+    unique_exams,
+    unique_campuses,
+    unique_semesters,
+  };
+}
\ No newline at end of file
diff --git a/src/lib/utils/regex.ts b/src/lib/utils/regex.ts
new file mode 100644
index 00000000..23177109
--- /dev/null
+++ b/src/lib/utils/regex.ts
@@ -0,0 +1,3 @@
+export function escapeRegExp(text: string): string {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
\ No newline at end of file
diff --git a/src/lib/utils/slot-calculation.ts b/src/lib/utils/slot-calculation.ts
new file mode 100644
index 00000000..284ef5ef
--- /dev/null
+++ b/src/lib/utils/slot-calculation.ts
@@ -0,0 +1,10 @@
+export function calculateCorrespondingSlots(currentSlot: string): string[] {
+  const nextSlot = String.fromCharCode(currentSlot.charCodeAt(0) + 1);
+  
+  return [
+    currentSlot + "1",
+    currentSlot + "2", 
+    nextSlot + "1",
+    nextSlot + "2",
+  ];
+}
\ No newline at end of file
diff --git a/src/lib/utils/string.ts b/src/lib/utils/string.ts
new file mode 100644
index 00000000..63daa3c7
--- /dev/null
+++ b/src/lib/utils/string.ts
@@ -0,0 +1,24 @@
+export function toSentenceCase(input: string): string {
+  const trimmedInput = input.trim();
+  if (trimmedInput.length === 0) {
+    return "";
+  }
+
+  const sentences = trimmedInput.split(/(?<=[.!?])\s+/);
+
+  const sentenceCased = sentences.map((sentence) => {
+    return sentence.charAt(0).toUpperCase() + sentence.slice(1);
+  });
+
+  return sentenceCased.join(" ");
+}
+
+export function extractBracketContent(subject: string): string | null {
+  const regex = /\[(.*?)\]/;
+  const match = regex.exec(subject);
+  return match?.[1] ?? "BMAT102L";
+}
+
+export function extractWithoutBracketContent(subject: string): string {
+  return subject.replace(/\s*\[.*?\]\s*/g, "").trim();
+}
\ No newline at end of file
diff --git a/src/util/utils.tsx b/src/util/utils.tsx
deleted file mode 100644
index 49ab0c26..00000000
--- a/src/util/utils.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-export function toSentenceCase(input: string): string {
-  const trimmedInput = input.trim();
-  if (trimmedInput.length === 0) {
-    return "";
-  }
-
-  const sentences = trimmedInput.split(/(?<=[.!?])\s+/);
-
-  const sentenceCased = sentences.map((sentence) => {
-    return sentence.charAt(0).toUpperCase() + sentence.slice(1);
-  });
-
-  return sentenceCased.join(" ");
-}
-
-export function extractBracketContent(subject: string): string | null {
-  const regex = /\[(.*?)\]/;
-  const match = regex.exec(subject);
-  return match?.[1] ?? "BMAT102L"; // Make sure it works when URL is done from the backend
-}
-
-export function extractWithoutBracketContent(subject: string): string {
-  return subject.replace(/\s*\[.*?\]\s*/g, "").trim();
-}
-
-export function capsule(data: string) {
-  return (
-    <div className="rounded-sm bg-[#B2B8FF] p-1 px-3 text-sm dark:bg-[#7480FFCC]">
-      {data}
-    </div>
-  );
-}
-export function capsuleGreen(data: string) {
-  return <div className="rounded-md bg-[#3cc923] p-1 px-3 text-sm">{data}</div>;
-}
-
-export function chunkArray<T>(array: T[], size: number): T[][] {
-  const result: T[][] = [];
-  for (let i = 0; i < array.length; i += size) {
-    result.push(array.slice(i, i + size));
-  }
-  return result;
-}