diff --git a/app/page.tsx b/app/page.tsx
index 05ac1f5..c1a6672 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,4 +1,4 @@
-import logo from '../images/logo.svg';
+import logo from '@/assets/images/logo.svg';
 import Image from 'next/image';
 import { LoginForm } from '@/components/forms/LoginForm';
 import { getAuthServerSession } from '@/lib/authenticate';
diff --git a/app/play/page.tsx b/app/play/page.tsx
index ed9a862..623d8fe 100644
--- a/app/play/page.tsx
+++ b/app/play/page.tsx
@@ -1,5 +1,5 @@
 import Image from 'next/image';
-import Logo from '/images/logo.svg';
+import Logo from '@images/logo.svg';
 import { getAuthServerSession } from '@/lib/authenticate';
 import { redirect } from 'next/navigation';
 import { getFirstActiveTest } from '@/actions/mangeTest';
diff --git a/images/date.svg b/assets/images/date.svg
similarity index 100%
rename from images/date.svg
rename to assets/images/date.svg
diff --git a/images/ginger.png b/assets/images/ginger.png
similarity index 100%
rename from images/ginger.png
rename to assets/images/ginger.png
diff --git a/images/logo.svg b/assets/images/logo.svg
similarity index 100%
rename from images/logo.svg
rename to assets/images/logo.svg
diff --git a/images/logout.svg b/assets/images/logout.svg
similarity index 100%
rename from images/logout.svg
rename to assets/images/logout.svg
diff --git a/images/santa/index.ts b/assets/images/santa/index.ts
similarity index 100%
rename from images/santa/index.ts
rename to assets/images/santa/index.ts
diff --git a/images/santa/santa-1.svg b/assets/images/santa/santa-1.svg
similarity index 100%
rename from images/santa/santa-1.svg
rename to assets/images/santa/santa-1.svg
diff --git a/images/santa/santa-10.svg b/assets/images/santa/santa-10.svg
similarity index 100%
rename from images/santa/santa-10.svg
rename to assets/images/santa/santa-10.svg
diff --git a/images/santa/santa-11.svg b/assets/images/santa/santa-11.svg
similarity index 100%
rename from images/santa/santa-11.svg
rename to assets/images/santa/santa-11.svg
diff --git a/images/santa/santa-12.svg b/assets/images/santa/santa-12.svg
similarity index 100%
rename from images/santa/santa-12.svg
rename to assets/images/santa/santa-12.svg
diff --git a/images/santa/santa-13.svg b/assets/images/santa/santa-13.svg
similarity index 100%
rename from images/santa/santa-13.svg
rename to assets/images/santa/santa-13.svg
diff --git a/images/santa/santa-14.svg b/assets/images/santa/santa-14.svg
similarity index 100%
rename from images/santa/santa-14.svg
rename to assets/images/santa/santa-14.svg
diff --git a/images/santa/santa-15.svg b/assets/images/santa/santa-15.svg
similarity index 100%
rename from images/santa/santa-15.svg
rename to assets/images/santa/santa-15.svg
diff --git a/images/santa/santa-16.svg b/assets/images/santa/santa-16.svg
similarity index 100%
rename from images/santa/santa-16.svg
rename to assets/images/santa/santa-16.svg
diff --git a/images/santa/santa-17.svg b/assets/images/santa/santa-17.svg
similarity index 100%
rename from images/santa/santa-17.svg
rename to assets/images/santa/santa-17.svg
diff --git a/images/santa/santa-18.svg b/assets/images/santa/santa-18.svg
similarity index 100%
rename from images/santa/santa-18.svg
rename to assets/images/santa/santa-18.svg
diff --git a/images/santa/santa-19.svg b/assets/images/santa/santa-19.svg
similarity index 100%
rename from images/santa/santa-19.svg
rename to assets/images/santa/santa-19.svg
diff --git a/images/santa/santa-2.svg b/assets/images/santa/santa-2.svg
similarity index 100%
rename from images/santa/santa-2.svg
rename to assets/images/santa/santa-2.svg
diff --git a/images/santa/santa-20.svg b/assets/images/santa/santa-20.svg
similarity index 100%
rename from images/santa/santa-20.svg
rename to assets/images/santa/santa-20.svg
diff --git a/images/santa/santa-21.svg b/assets/images/santa/santa-21.svg
similarity index 100%
rename from images/santa/santa-21.svg
rename to assets/images/santa/santa-21.svg
diff --git a/images/santa/santa-22.svg b/assets/images/santa/santa-22.svg
similarity index 100%
rename from images/santa/santa-22.svg
rename to assets/images/santa/santa-22.svg
diff --git a/images/santa/santa-23.svg b/assets/images/santa/santa-23.svg
similarity index 100%
rename from images/santa/santa-23.svg
rename to assets/images/santa/santa-23.svg
diff --git a/images/santa/santa-24.svg b/assets/images/santa/santa-24.svg
similarity index 100%
rename from images/santa/santa-24.svg
rename to assets/images/santa/santa-24.svg
diff --git a/images/santa/santa-3.svg b/assets/images/santa/santa-3.svg
similarity index 100%
rename from images/santa/santa-3.svg
rename to assets/images/santa/santa-3.svg
diff --git a/images/santa/santa-4.svg b/assets/images/santa/santa-4.svg
similarity index 100%
rename from images/santa/santa-4.svg
rename to assets/images/santa/santa-4.svg
diff --git a/images/santa/santa-5.svg b/assets/images/santa/santa-5.svg
similarity index 100%
rename from images/santa/santa-5.svg
rename to assets/images/santa/santa-5.svg
diff --git a/images/santa/santa-6.svg b/assets/images/santa/santa-6.svg
similarity index 100%
rename from images/santa/santa-6.svg
rename to assets/images/santa/santa-6.svg
diff --git a/images/santa/santa-7.svg b/assets/images/santa/santa-7.svg
similarity index 100%
rename from images/santa/santa-7.svg
rename to assets/images/santa/santa-7.svg
diff --git a/images/santa/santa-8.svg b/assets/images/santa/santa-8.svg
similarity index 100%
rename from images/santa/santa-8.svg
rename to assets/images/santa/santa-8.svg
diff --git a/images/santa/santa-9.svg b/assets/images/santa/santa-9.svg
similarity index 100%
rename from images/santa/santa-9.svg
rename to assets/images/santa/santa-9.svg
diff --git a/images/your-grade.svg b/assets/images/your-grade.svg
similarity index 100%
rename from images/your-grade.svg
rename to assets/images/your-grade.svg
diff --git a/components/custom/santa.tsx b/components/custom/santa.tsx
index f9e386e..d60c8a2 100644
--- a/components/custom/santa.tsx
+++ b/components/custom/santa.tsx
@@ -1,17 +1,17 @@
-import Image from "next/image";
+import Image from 'next/image';
 
-import { santas } from "@santa/index";
+import { santas } from '@/assets/images/santa/index';
 
 interface SantaProps {
-    height: number
+	height: number;
 }
-export function Santa({ ...props} : SantaProps) {
-    if (props.height <= 0 || props.height > 24) {
-        return <div className={"w-[100px] bg-blue-500"}/>
-    }
-    return (
-        <div className="flex flex-col items-center">
-            <Image src={santas[props.height - 1]} alt={"Santa"} width={100} height={200}/>
-        </div>
-    )
+export function Santa({ ...props }: SantaProps) {
+	if (props.height <= 0 || props.height > 24) {
+		return <div className={'w-[100px] bg-blue-500'} />;
+	}
+	return (
+		<div className="flex flex-col items-center">
+			<Image src={santas[props.height - 1]} alt={'Santa'} width={100} height={200} />
+		</div>
+	);
 }
diff --git a/components/custom/testCard.tsx b/components/custom/testCard.tsx
index 351cb22..f2f8d87 100644
--- a/components/custom/testCard.tsx
+++ b/components/custom/testCard.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import Calendar from '../../images/date.svg';
+import Calendar from '@images/date.svg';
 import Image from 'next/image';
 
 import { Ban, Snowflake, CircleOff } from 'lucide-react';
diff --git a/tsconfig.json b/tsconfig.json
index 66d7499..b093001 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,8 +23,8 @@
       "@components/*": ["./components/*"],
       "@lib/*": ["./lib/*"],
       "@styles/*": ["/styles/*"],
-      "@santa/*": ["./images/santa/*"],
-      "@images/*": ["./images/*"],
+      "@santa/*": ["./assets/images/santa/*"],
+      "@images/*": ["./assets/images/*"],
       "@assets/*": ["./assets/*"],
     }
   },