diff --git a/package.json b/package.json
index 3409b9c..67a8b40 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
     "autoprefixer": "10.4.20",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
-    "encoding": "^0.1.13",
     "eslint": "8.56.0",
     "eslint-config-next": "15.0.3",
     "eslint-config-prettier": "^8.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd42042..592ff54 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -138,9 +138,6 @@ importers:
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
-      encoding:
-        specifier: ^0.1.13
-        version: 0.1.13
       eslint:
         specifier: 8.56.0
         version: 8.56.0
@@ -2670,9 +2667,6 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
-  encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
-
   engine.io-parser@5.2.3:
     resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==}
     engines: {node: '>=10.0.0'}
@@ -3229,10 +3223,6 @@ packages:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
 
-  iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-
   idb@8.0.0:
     resolution: {integrity: sha512-l//qvlAKGmQO31Qn7xdzagVPPaHTxXx199MhrAFuVBTPqydcPYBWjkrbv4Y0ktB+GmWOiwHl237UUOrLmQxLvw==}
 
@@ -7746,10 +7736,6 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
-  encoding@0.1.13:
-    dependencies:
-      iconv-lite: 0.6.3
-
   engine.io-parser@5.2.3: {}
 
   engine.io@6.6.2:
@@ -8640,10 +8626,6 @@ snapshots:
     dependencies:
       safer-buffer: 2.1.2
 
-  iconv-lite@0.6.3:
-    dependencies:
-      safer-buffer: 2.1.2
-
   idb@8.0.0: {}
 
   ieee754@1.2.1: {}
diff --git a/src/actions/auth.ts b/src/actions/auth.ts
index 52ff450..84548aa 100644
--- a/src/actions/auth.ts
+++ b/src/actions/auth.ts
@@ -3,13 +3,12 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { alphabet, generateRandomString } from "oslo/crypto";
-import { deleteSessionTokenCookie } from "~/lib/cookies";
-import prisma from "~/lib/prisma";
-import { getCurrentSession, invalidateSession } from "~/lib/session";
+import { deleteSessionTokenCookie } from "~/lib/server/cookies";
+import prisma from "~/lib/server/prisma";
+import { getCurrentSession, invalidateSession } from "~/lib/server/session";
 
 export async function logout() {
   const { session } = await getCurrentSession();
-
   if (!session) {
     return {
       message: "Unauthorized",
diff --git a/src/actions/mail.ts b/src/actions/mail.ts
index d08a504..7b07ccf 100644
--- a/src/actions/mail.ts
+++ b/src/actions/mail.ts
@@ -3,7 +3,7 @@
 import ThanksTemp from "emails/thanks";
 import VerificationTemp from "emails/verification";
 import { nanoid } from "nanoid";
-import { resend } from "~/lib/resend";
+import { resend } from "~/lib/server/resend";
 import { type SendOTPProps, type SendWelcomeEmailProps } from "~/types";
 
 export const sendWelcomeEmail = async ({
diff --git a/src/actions/subscription.ts b/src/actions/subscription.ts
index 9654d1d..b93b4ea 100644
--- a/src/actions/subscription.ts
+++ b/src/actions/subscription.ts
@@ -1,7 +1,7 @@
 "use server";
 
 import { freePlan, proPlan } from "~/config/subscription";
-import prisma from "~/lib/prisma";
+import prisma from "~/lib/server/prisma";
 import { type UserSubscriptionPlan } from "~/types";
 
 export async function getUserSubscriptionPlan(
diff --git a/src/app/[locale]/login/page.tsx b/src/app/[locale]/(auth)/login/page.tsx
similarity index 92%
rename from src/app/[locale]/login/page.tsx
rename to src/app/[locale]/(auth)/login/page.tsx
index cd515d2..e3abbf6 100644
--- a/src/app/[locale]/login/page.tsx
+++ b/src/app/[locale]/(auth)/login/page.tsx
@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation";
 import AuthForm from "~/components/layout/auth-form";
 import { Card } from "~/components/ui/card";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 export default async function Login() {
   const { session } = await getCurrentSession();
diff --git a/src/app/[locale]/about/page.tsx b/src/app/[locale]/(marketing)/about/page.tsx
similarity index 97%
rename from src/app/[locale]/about/page.tsx
rename to src/app/[locale]/(marketing)/about/page.tsx
index b2af27d..6f8484b 100644
--- a/src/app/[locale]/about/page.tsx
+++ b/src/app/[locale]/(marketing)/about/page.tsx
@@ -4,7 +4,7 @@ import { type Metadata } from "next";
 function AboutCard(about: About) {
   return (
     <article className="prose prose-slate mb-8 dark:prose-invert">
-      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors ">
+      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors">
         {about.title}
       </h2>
       <div dangerouslySetInnerHTML={{ __html: about.content }} />
diff --git a/src/app/[locale]/changelog/page.tsx b/src/app/[locale]/(marketing)/changelog/page.tsx
similarity index 87%
rename from src/app/[locale]/changelog/page.tsx
rename to src/app/[locale]/(marketing)/changelog/page.tsx
index 315e6f2..285a166 100644
--- a/src/app/[locale]/changelog/page.tsx
+++ b/src/app/[locale]/(marketing)/changelog/page.tsx
@@ -5,10 +5,10 @@ import { type Metadata } from "next";
 function ChangeCard(change: Change) {
   return (
     <article className="prose prose-slate mb-8 dark:prose-invert">
-      <h2 className=" mb-0 text-3xl font-semibold tracking-tight transition-colors">
+      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors">
         {change.title}
       </h2>
-      <time className=" text-sm text-muted-foreground" dateTime={change.date}>
+      <time className="text-sm text-muted-foreground" dateTime={change.date}>
         {dayjs(change.date).format("MMM DD YYYY")}
       </time>
       <div dangerouslySetInnerHTML={{ __html: change.content }} />
diff --git a/src/app/[locale]/@loginDialog/(.)login/page.tsx b/src/app/[locale]/@loginDialog/(.)login/page.tsx
index c8a59dd..0df6544 100644
--- a/src/app/[locale]/@loginDialog/(.)login/page.tsx
+++ b/src/app/[locale]/@loginDialog/(.)login/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import LoginModal from "~/components/layout/login-modal";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 export default async function Login() {
   const { session } = await getCurrentSession();
diff --git a/src/app/[locale]/dashboard/billing/page.tsx b/src/app/[locale]/dashboard/billing/page.tsx
index ff6ab6b..774e8d6 100644
--- a/src/app/[locale]/dashboard/billing/page.tsx
+++ b/src/app/[locale]/dashboard/billing/page.tsx
@@ -2,8 +2,8 @@ import { AlertTriangleIcon } from "lucide-react";
 import { getUserSubscriptionPlan } from "~/actions/subscription";
 import { BillingForm } from "~/components/billing-form";
 import { Alert, AlertDescription } from "~/components/ui/alert";
-import { getCurrentSession } from "~/lib/session";
-import { stripe } from "~/lib/stripe";
+import { getCurrentSession } from "~/lib/server/session";
+import { stripe } from "~/lib/server/stripe";
 
 export const revalidate = 0;
 export const dynamic = "force-dynamic";
diff --git a/src/app/[locale]/dashboard/error.tsx b/src/app/[locale]/dashboard/error.tsx
index 9f9ec4f..bbc6fee 100644
--- a/src/app/[locale]/dashboard/error.tsx
+++ b/src/app/[locale]/dashboard/error.tsx
@@ -12,12 +12,12 @@ export default function Error({
 }) {
   useEffect(() => {
     // Log the error to an error reporting service
-    console.error(error);
+    console.log(error);
   }, [error]);
 
   return (
     <div className="flex h-[calc(100vh-160px)] w-full flex-col items-center justify-center gap-y-4">
-      <h2 className=" text-5xl font-bold text-destructive">
+      <h2 className="text-5xl font-bold text-destructive">
         Oops, Something Went Wrong!
       </h2>
       <Button onClick={() => reset()}>Try Again</Button>
diff --git a/src/app/[locale]/dashboard/layout.tsx b/src/app/[locale]/dashboard/layout.tsx
index 93ebe40..5a76cc4 100644
--- a/src/app/[locale]/dashboard/layout.tsx
+++ b/src/app/[locale]/dashboard/layout.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import SidebarNav from "~/components/layout/sidebar-nav";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 interface DashboardLayoutProps {
   children: React.ReactNode;
diff --git a/src/app/[locale]/dashboard/projects/[projectId]/delete-card.tsx b/src/app/[locale]/dashboard/projects/[projectId]/delete-card.tsx
index df216e8..612999d 100644
--- a/src/app/[locale]/dashboard/projects/[projectId]/delete-card.tsx
+++ b/src/app/[locale]/dashboard/projects/[projectId]/delete-card.tsx
@@ -14,6 +14,7 @@ import {
 import { Button } from "~/components/ui/button";
 import { Card, CardDescription, CardTitle } from "~/components/ui/card";
 import { toast } from "~/hooks/use-toast";
+import { isRedirectError } from "~/lib/utils";
 import { deleteProjectById } from "../action";
 
 export default function DeleteCard({ id }: { id: string }) {
@@ -27,12 +28,14 @@ export default function DeleteCard({ id }: { id: string }) {
           });
         })
         .catch((error) => {
-          console.error(error);
-          toast({
-            title: "Error deleting project.",
-            description: "Please try again.",
-            variant: "destructive",
-          });
+          console.log(error);
+          if (!isRedirectError(error)) {
+            toast({
+              title: "Error deleting project.",
+              description: "Please try again.",
+              variant: "destructive",
+            });
+          }
         })
     );
   };
diff --git a/src/app/[locale]/dashboard/projects/[projectId]/editable-details.tsx b/src/app/[locale]/dashboard/projects/[projectId]/editable-details.tsx
index 4e1a92a..32db918 100644
--- a/src/app/[locale]/dashboard/projects/[projectId]/editable-details.tsx
+++ b/src/app/[locale]/dashboard/projects/[projectId]/editable-details.tsx
@@ -18,12 +18,6 @@ import { toast } from "~/hooks/use-toast";
 import { updateProjectById } from "../action";
 import { projectSchema, type ProjectFormValues } from "../create-project-modal";
 
-// const projectEditSchema = projectSchema.extend({
-//   id: z.string().readonly(),
-// });
-
-// type ProjectEditValues = z.infer<typeof projectEditSchema>;
-
 export default function EditableDetails({
   initialValues,
 }: {
@@ -42,7 +36,7 @@ export default function EditableDetails({
       });
       form.reset();
     } catch (error) {
-      console.error(error);
+      console.log(error);
       toast({
         title: "Error creating project.",
         description: "Please try again.",
diff --git a/src/app/[locale]/dashboard/projects/action.ts b/src/app/[locale]/dashboard/projects/action.ts
index e39c216..deb0833 100644
--- a/src/app/[locale]/dashboard/projects/action.ts
+++ b/src/app/[locale]/dashboard/projects/action.ts
@@ -4,8 +4,8 @@ import { type Project } from "@prisma/client";
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { getUserSubscriptionPlan } from "~/actions/subscription";
-import prisma from "~/lib/prisma";
-import { getCurrentSession } from "~/lib/session";
+import prisma from "~/lib/server/prisma";
+import { getCurrentSession } from "~/lib/server/session";
 
 interface Payload {
   name: string;
diff --git a/src/app/[locale]/dashboard/projects/create-project-modal.tsx b/src/app/[locale]/dashboard/projects/create-project-modal.tsx
index c653d07..2a00ca1 100644
--- a/src/app/[locale]/dashboard/projects/create-project-modal.tsx
+++ b/src/app/[locale]/dashboard/projects/create-project-modal.tsx
@@ -58,7 +58,7 @@ export default function CreateProjectModal() {
       form.reset();
       setIsOpen(false);
     } catch (error) {
-      console.error({ error });
+      console.log(error);
       if (error instanceof FreePlanLimitError) {
         return toast({
           title: "Free plan limit reached. Please upgrade your plan.",
diff --git a/src/app/[locale]/dashboard/settings/actions.ts b/src/app/[locale]/dashboard/settings/actions.ts
index 75c43cf..5c2c12c 100644
--- a/src/app/[locale]/dashboard/settings/actions.ts
+++ b/src/app/[locale]/dashboard/settings/actions.ts
@@ -1,8 +1,8 @@
 "use server";
 
-import { revalidatePath, revalidateTag } from "next/cache";
-import prisma from "~/lib/prisma";
-import { utapi } from "~/lib/uploadthing-server";
+import { revalidatePath } from "next/cache";
+import prisma from "~/lib/server/prisma";
+import { utapi } from "~/lib/server/uploadthing";
 import { getImageKeyFromUrl, isOurCdnUrl } from "~/lib/utils";
 import { type payload } from "~/types";
 
@@ -26,7 +26,7 @@ export async function removeUserOldImageFromCDN(
       await utapi.deleteFiles(currentImageFileKey as string);
     }
   } catch (e) {
-    console.error(e);
+    console.log(e);
     const newImageFileKey = getImageKeyFromUrl(newImageUrl);
     await utapi.deleteFiles(newImageFileKey as string);
   }
diff --git a/src/app/[locale]/dashboard/settings/error.tsx b/src/app/[locale]/dashboard/settings/error.tsx
index 49e1b42..b886bcc 100644
--- a/src/app/[locale]/dashboard/settings/error.tsx
+++ b/src/app/[locale]/dashboard/settings/error.tsx
@@ -12,12 +12,12 @@ export default function Error({
 }) {
   useEffect(() => {
     // Log the error to an error reporting service
-    console.error(error);
+    console.log(error);
   }, [error]);
 
   return (
     <div className="flex h-full w-full flex-col items-center justify-center gap-y-4">
-      <h2 className=" text-4xl font-bold text-destructive">
+      <h2 className="text-4xl font-bold text-destructive">
         Something Went Wrong!
       </h2>
       <Button onClick={() => reset()}>Try Again</Button>
diff --git a/src/app/[locale]/dashboard/settings/page.tsx b/src/app/[locale]/dashboard/settings/page.tsx
index 10b093d..465a9eb 100644
--- a/src/app/[locale]/dashboard/settings/page.tsx
+++ b/src/app/[locale]/dashboard/settings/page.tsx
@@ -1,5 +1,5 @@
 import { type Metadata } from "next";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 import SettingsForm from "./settings-form";
 
 export const metadata: Metadata = {
diff --git a/src/app/[locale]/dashboard/settings/settings-form.tsx b/src/app/[locale]/dashboard/settings/settings-form.tsx
index f327ece..2d5cb7b 100644
--- a/src/app/[locale]/dashboard/settings/settings-form.tsx
+++ b/src/app/[locale]/dashboard/settings/settings-form.tsx
@@ -85,7 +85,7 @@ export default function SettingsForm({ currentUser }: { currentUser: User }) {
       try {
         await removeNewImageFromCDN(getValues().picture);
       } catch (error) {
-        console.error(error);
+        console.log(error);
       }
     }
     reset();
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index d11bd20..6dbafa4 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -111,7 +111,7 @@ const fontHeading = localFont({
   variable: "--font-heading",
 });
 
-export default async function SubLayout({
+export default async function RootLayout({
   children,
   loginDialog,
   params,
@@ -122,7 +122,7 @@ export default async function SubLayout({
 }) {
   const { locale } = await params;
   return (
-    <html lang={locale} suppressHydrationWarning>
+    <html lang={locale}>
       <body
         className={cn(
           "font-sans antialiased",
diff --git a/src/app/api/auth/login/github/callback/route.ts b/src/app/api/auth/login/github/callback/route.ts
index 2a965ae..2f41988 100644
--- a/src/app/api/auth/login/github/callback/route.ts
+++ b/src/app/api/auth/login/github/callback/route.ts
@@ -3,10 +3,10 @@ import { ArcticFetchError, OAuth2RequestError } from "arctic";
 import { revalidatePath } from "next/cache";
 import { cookies } from "next/headers";
 import { sendWelcomeEmail } from "~/actions/mail";
-import { setSessionTokenCookie } from "~/lib/cookies";
-import { github } from "~/lib/github";
-import prisma from "~/lib/prisma";
-import { createSession, generateSessionToken } from "~/lib/session";
+import { setSessionTokenCookie } from "~/lib/server/cookies";
+import { github } from "~/lib/server/github";
+import prisma from "~/lib/server/prisma";
+import { createSession, generateSessionToken } from "~/lib/server/session";
 
 export const GET = async (request: Request) => {
   const url = new URL(request.url);
diff --git a/src/app/api/auth/login/github/route.ts b/src/app/api/auth/login/github/route.ts
index fee3acc..cdd01d4 100644
--- a/src/app/api/auth/login/github/route.ts
+++ b/src/app/api/auth/login/github/route.ts
@@ -1,6 +1,6 @@
 import { generateState } from "arctic";
 import { cookies } from "next/headers";
-import { github } from "~/lib/github";
+import { github } from "~/lib/server/github";
 
 export const GET = async () => {
   const state = generateState();
diff --git a/src/app/api/auth/login/send-otp/route.ts b/src/app/api/auth/login/send-otp/route.ts
index 3dea65b..f3e253a 100644
--- a/src/app/api/auth/login/send-otp/route.ts
+++ b/src/app/api/auth/login/send-otp/route.ts
@@ -1,6 +1,6 @@
 import { generateEmailVerificationCode } from "~/actions/auth";
 import { sendOTP } from "~/actions/mail";
-import prisma from "~/lib/prisma";
+import prisma from "~/lib/server/prisma";
 
 export const POST = async (req: Request) => {
   const body = await req.json();
diff --git a/src/app/api/auth/login/verify-otp/route.ts b/src/app/api/auth/login/verify-otp/route.ts
index ef2a758..f8ad695 100644
--- a/src/app/api/auth/login/verify-otp/route.ts
+++ b/src/app/api/auth/login/verify-otp/route.ts
@@ -1,12 +1,12 @@
 import { revalidatePath } from "next/cache";
 import { verifyVerificationCode } from "~/actions/auth";
-import { setSessionTokenCookie } from "~/lib/cookies";
-import prisma from "~/lib/prisma";
+import { setSessionTokenCookie } from "~/lib/server/cookies";
+import prisma from "~/lib/server/prisma";
 import {
   createSession,
   generateSessionToken,
   invalidateAllSessions,
-} from "~/lib/session";
+} from "~/lib/server/session";
 
 export const POST = async (req: Request, response: Response) => {
   const body = await req.json();
diff --git a/src/app/api/stripe/route.ts b/src/app/api/stripe/route.ts
index add5549..7fca2e0 100644
--- a/src/app/api/stripe/route.ts
+++ b/src/app/api/stripe/route.ts
@@ -3,8 +3,8 @@ import { z } from "zod";
 import { getUserSubscriptionPlan } from "~/actions/subscription";
 import { siteConfig } from "~/config/site";
 import { proPlan } from "~/config/subscription";
-import { getCurrentSession } from "~/lib/session";
-import { stripe } from "~/lib/stripe";
+import { getCurrentSession } from "~/lib/server/session";
+import { stripe } from "~/lib/server/stripe";
 
 export async function GET(req: NextRequest) {
   const locale = req.cookies.get("Next-Locale")?.value || "en";
diff --git a/src/app/api/uploadthing/core.ts b/src/app/api/uploadthing/core.ts
index e062229..c4d2868 100644
--- a/src/app/api/uploadthing/core.ts
+++ b/src/app/api/uploadthing/core.ts
@@ -1,6 +1,6 @@
 import { createUploadthing, type FileRouter } from "uploadthing/next";
 import { UploadThingError } from "uploadthing/server";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 const f = createUploadthing();
 
diff --git a/src/app/api/webhooks/stripe/route.ts b/src/app/api/webhooks/stripe/route.ts
index da6288e..555149a 100644
--- a/src/app/api/webhooks/stripe/route.ts
+++ b/src/app/api/webhooks/stripe/route.ts
@@ -1,8 +1,8 @@
 import { type NextRequest } from "next/server";
 import { buffer } from "node:stream/consumers";
 import type Stripe from "stripe";
-import prisma from "~/lib/prisma";
-import { stripe } from "~/lib/stripe";
+import prisma from "~/lib/server/prisma";
+import { stripe } from "~/lib/server/stripe";
 
 export async function POST(req: NextRequest) {
   //@ts-expect-error Argument of type 'ReadableStream<any>' is not assignable to parameter of type 'ReadableStream | Readable | AsyncIterable<any>'
diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx
index 5b30cb4..6186d72 100644
--- a/src/app/global-error.tsx
+++ b/src/app/global-error.tsx
@@ -12,12 +12,12 @@ export default function GlobalError({
 }) {
   useEffect(() => {
     // Log the error to an error reporting service
-    console.error(error);
+    console.log(error);
   }, [error]);
 
   return (
     <div className="flex h-[calc(100vh-160px)] w-full flex-col items-center justify-center gap-y-4">
-      <h2 className=" text-5xl font-bold text-destructive">
+      <h2 className="text-5xl font-bold text-destructive">
         Oops, Something Went Wrong!
       </h2>
       <Button onClick={() => reset()}>Try Again</Button>
diff --git a/src/components/layout/header/index.tsx b/src/components/layout/header/index.tsx
index 747caef..70a9f92 100644
--- a/src/components/layout/header/index.tsx
+++ b/src/components/layout/header/index.tsx
@@ -1,7 +1,7 @@
-import { getCurrentSession } from "~/lib/session";
+import { connection } from "next/server";
+import { getCurrentSession } from "~/lib/server/session";
 import { getScopedI18n } from "~/locales/server";
 import Navbar from "./navbar";
-import { connection } from "next/server";
 
 export default async function Header() {
   await connection();
diff --git a/src/components/layout/image-upload-modal.tsx b/src/components/layout/image-upload-modal.tsx
index 16a29e8..55caf98 100644
--- a/src/components/layout/image-upload-modal.tsx
+++ b/src/components/layout/image-upload-modal.tsx
@@ -15,7 +15,7 @@ import {
   DialogTrigger,
 } from "~/components/ui/dialog";
 import { toast } from "~/hooks/use-toast";
-import { useUploadThing } from "~/lib/uploadthing";
+import { useUploadThing } from "~/lib/client/uploadthing";
 import Icons from "../shared/icons";
 import { Button } from "../ui/button";
 
@@ -47,7 +47,7 @@ export default function ImageUploadModal({
         }
       },
       onUploadError: (e) => {
-        console.error(e);
+        console.log(e);
         toast({
           title: "Error occurred while uploading!",
           variant: "destructive",
diff --git a/src/components/sections/pricing.tsx b/src/components/sections/pricing.tsx
index c97979b..166a134 100644
--- a/src/components/sections/pricing.tsx
+++ b/src/components/sections/pricing.tsx
@@ -1,6 +1,6 @@
 import Link from "next/link";
 import { getUserSubscriptionPlan } from "~/actions/subscription";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 import { cn } from "~/lib/utils";
 import { Badge } from "../ui/badge";
 import { buttonVariants } from "../ui/button";
diff --git a/src/lib/uploadthing.ts b/src/lib/client/uploadthing.ts
similarity index 100%
rename from src/lib/uploadthing.ts
rename to src/lib/client/uploadthing.ts
diff --git a/src/lib/cookies.ts b/src/lib/server/cookies.ts
similarity index 100%
rename from src/lib/cookies.ts
rename to src/lib/server/cookies.ts
diff --git a/src/lib/github.ts b/src/lib/server/github.ts
similarity index 100%
rename from src/lib/github.ts
rename to src/lib/server/github.ts
diff --git a/src/lib/prisma.ts b/src/lib/server/prisma.ts
similarity index 100%
rename from src/lib/prisma.ts
rename to src/lib/server/prisma.ts
diff --git a/src/lib/resend.ts b/src/lib/server/resend.ts
similarity index 100%
rename from src/lib/resend.ts
rename to src/lib/server/resend.ts
diff --git a/src/lib/session.ts b/src/lib/server/session.ts
similarity index 100%
rename from src/lib/session.ts
rename to src/lib/server/session.ts
diff --git a/src/lib/stripe.ts b/src/lib/server/stripe.ts
similarity index 100%
rename from src/lib/stripe.ts
rename to src/lib/server/stripe.ts
diff --git a/src/lib/uploadthing-server.ts b/src/lib/server/uploadthing.ts
similarity index 100%
rename from src/lib/uploadthing-server.ts
rename to src/lib/server/uploadthing.ts
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index c61dbd2..e9fbd21 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -53,3 +53,13 @@ export class FreePlanLimitError extends Error {
     super(message);
   }
 }
+
+export function isRedirectError(error: unknown): boolean {
+  return (
+    error !== null &&
+    typeof error === "object" &&
+    "digest" in error &&
+    typeof error.digest === "string" &&
+    error.digest.includes("NEXT_REDIRECT")
+  );
+}
diff --git a/src/types/lucia.d.ts b/src/types/lucia.d.ts
deleted file mode 100644
index 1b4d398..0000000
--- a/src/types/lucia.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { lucia } from "~/lib/lucia";
-
-declare module "lucia" {
-  interface Register {
-    Lucia: typeof lucia;
-    DatabaseUserAttributes: DatabaseUserAttributes;
-  }
-  interface DatabaseUserAttributes {
-    name: string;
-    email: string;
-    picture: string;
-  }
-}