diff --git a/public/images/pub_quiz.jpg b/public/images/events/Event1.jpg
similarity index 100%
rename from public/images/pub_quiz.jpg
rename to public/images/events/Event1.jpg
diff --git a/public/images/Event2.png b/public/images/events/Event2.png
similarity index 100%
rename from public/images/Event2.png
rename to public/images/events/Event2.png
diff --git a/public/images/Event3.png b/public/images/events/Event3.png
similarity index 100%
rename from public/images/Event3.png
rename to public/images/events/Event3.png
diff --git a/public/images/Event4.png b/public/images/events/Event4.png
similarity index 100%
rename from public/images/Event4.png
rename to public/images/events/Event4.png
diff --git a/public/images/karaoke.jpg b/public/images/events/Event5.jpg
similarity index 100%
rename from public/images/karaoke.jpg
rename to public/images/events/Event5.jpg
diff --git a/public/images/Gallery1.png b/public/images/gallery/Gallery1.png
similarity index 100%
rename from public/images/Gallery1.png
rename to public/images/gallery/Gallery1.png
diff --git a/public/images/Gallery2.png b/public/images/gallery/Gallery2.png
similarity index 100%
rename from public/images/Gallery2.png
rename to public/images/gallery/Gallery2.png
diff --git a/public/images/Gallery3.png b/public/images/gallery/Gallery3.png
similarity index 100%
rename from public/images/Gallery3.png
rename to public/images/gallery/Gallery3.png
diff --git a/public/images/Gallery4.png b/public/images/gallery/Gallery4.png
similarity index 100%
rename from public/images/Gallery4.png
rename to public/images/gallery/Gallery4.png
diff --git a/public/images/Gallery5.png b/public/images/gallery/Gallery5.png
similarity index 100%
rename from public/images/Gallery5.png
rename to public/images/gallery/Gallery5.png
diff --git a/public/images/Gallery6.png b/public/images/gallery/Gallery6.png
similarity index 100%
rename from public/images/Gallery6.png
rename to public/images/gallery/Gallery6.png
diff --git a/public/images/Gallery7.png b/public/images/gallery/Gallery7.png
similarity index 100%
rename from public/images/Gallery7.png
rename to public/images/gallery/Gallery7.png
diff --git a/public/images/Gallery8.png b/public/images/gallery/Gallery8.png
similarity index 100%
rename from public/images/Gallery8.png
rename to public/images/gallery/Gallery8.png
diff --git a/public/images/Gallery9.png b/public/images/gallery/Gallery9.png
similarity index 100%
rename from public/images/Gallery9.png
rename to public/images/gallery/Gallery9.png
diff --git a/public/images/Whiskey1.png b/public/images/whiskey/Whiskey1.png
similarity index 100%
rename from public/images/Whiskey1.png
rename to public/images/whiskey/Whiskey1.png
diff --git a/public/images/Whiskey2.png b/public/images/whiskey/Whiskey2.png
similarity index 100%
rename from public/images/Whiskey2.png
rename to public/images/whiskey/Whiskey2.png
diff --git a/public/images/Whiskey3.png b/public/images/whiskey/Whiskey3.png
similarity index 100%
rename from public/images/Whiskey3.png
rename to public/images/whiskey/Whiskey3.png
diff --git a/src/components/Drinks.astro b/src/components/Drinks.astro
index 92c1ff9..ab0834c 100644
--- a/src/components/Drinks.astro
+++ b/src/components/Drinks.astro
@@ -29,15 +29,15 @@ const { id } = Astro.props;
 
     <div class="circle-row">
         <div class="circle whiskey-circle" title="Whiskey 1">
-            <img src="/images/Whiskey1.png" alt="Whiskey 1" class="circle-image" />
+            <img src="/images/whiskey/Whiskey1.png" alt="Whiskey 1" class="circle-image" />
             <span class="circle-label"></span>
         </div>
         <div class="circle whiskey-circle" title="Whiskey 2">
-            <img src="/images/Whiskey2.png" alt="Whiskey 2" class="circle-image" />
+            <img src="/images/whiskey/Whiskey2.png" alt="Whiskey 2" class="circle-image" />
             <span class="circle-label"></span>
         </div>
         <div class="circle whiskey-circle" title="Whiskey 3">
-            <img src="/images/Whiskey3.png" alt="Whiskey 3" class="circle-image" />
+            <img src="/images/whiskey/Whiskey3.png" alt="Whiskey 3" class="circle-image" />
             <span class="circle-label"></span>
         </div>
     </div>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index d6a071c..246b3ef 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -10,7 +10,7 @@ import About from "../components/About.astro";
 
 const events = [
 	{
-		image: "/images/karaoke.jpg",
+		image: "/images/events/Event5.jpg",
 		title: "Karaoke",
 		date: "Mittwoch - Samstag",
 		description: `
@@ -20,7 +20,7 @@ const events = [
 		`,
 	},
 	{
-		image: "/images/pub_quiz.jpg",
+		image: "/images/events/Event1.jpg",
 		title: "Pub Quiz",
 		date: "Jeden Freitag",
 		description: `
@@ -31,7 +31,7 @@ const events = [
 		`,
 	},
     {
-        image: "/images/Event4.png",
+        image: "/images/events/Event4.png",
         title: "Kevin McFlannigan <br> Live Music im Gallus Pub!",
         date: "Sa, 27. September 2025",
         description: `
@@ -43,15 +43,15 @@ const events = [
 ];
 
 const images = [
-	{ src: "/images/Gallery7.png", alt: "Siebtes Bild" },
-	{ src: "/images/Gallery8.png", alt: "Achtes Bild" },
-	{ src: "/images/Gallery9.png", alt: "Neuntes Bild" },
-	{ src: "/images/Gallery6.png", alt: "Sechstes Bild" },
-	{ src: "/images/Gallery1.png", alt: "Erstes Bild" },
-	{ src: "/images/Gallery2.png", alt: "Zweites Bild" },
-	{ src: "/images/Gallery3.png", alt: "Drittes Bild" },
-	{ src: "/images/Gallery4.png", alt: "Viertes Bild" },
-	{ src: "/images/Gallery5.png", alt: "Fünftes Bild" },
+	{ src: "/images/gallery/Gallery7.png", alt: "Siebtes Bild" },
+	{ src: "/images/gallery/Gallery8.png", alt: "Achtes Bild" },
+	{ src: "/images/gallery/Gallery9.png", alt: "Neuntes Bild" },
+	{ src: "/images/gallery/Gallery6.png", alt: "Sechstes Bild" },
+	{ src: "/images/gallery/Gallery1.png", alt: "Erstes Bild" },
+	{ src: "/images/gallery/Gallery2.png", alt: "Zweites Bild" },
+	{ src: "/images/gallery/Gallery3.png", alt: "Drittes Bild" },
+	{ src: "/images/gallery/Gallery4.png", alt: "Viertes Bild" },
+	{ src: "/images/gallery/Gallery5.png", alt: "Fünftes Bild" },
 ];
 ---