diff --git a/mkbsd.js b/mkbsd.js
index 466aa5a..d45c542 100644
--- a/mkbsd.js
+++ b/mkbsd.js
@@ -4,7 +4,7 @@ const path = require('path');
 async function main() {
     const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s';
     const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-    
+
     try {
         const response = await fetch(url);
         if (!response.ok) {
@@ -15,11 +15,6 @@ async function main() {
         if (!data) {
             throw new Error('⛔ JSON does not have a "data" property at its root.');
         }
-        const downloadDir = path.join(__dirname, 'downloads');
-        if (!fs.existsSync(downloadDir)) {
-            fs.mkdirSync(downloadDir);
-            console.info(`📁 Created directory: ${downloadDir}`);
-        }
 
         for (const key in data) {
             const subproperty = data[key];
@@ -27,10 +22,20 @@ async function main() {
                 const imageUrl = subproperty.dhd;
                 console.info(`🔍 Found image URL!`);
 
-                // Extrahiere den Dateinamen aus der URL
+                // Extrahiere den Künstlernamen vor dem Unterstrich
+                const artistNameMatch = imageUrl.match(/a~([^_/]+)/);
+                const artistName = artistNameMatch ? artistNameMatch[1] : 'unknown_artist';
+                const artistDir = path.join(__dirname, 'downloads', artistName);
+
+                if (!fs.existsSync(artistDir)) {
+                    fs.mkdirSync(artistDir, { recursive: true });
+                    console.info(`📁 Created directory: ${artistDir}`);
+                }
+
+                // Extrahiere den Dateinamen und die Endung
                 const urlPath = new URL(imageUrl).pathname;
-                const fileName = path.basename(urlPath, '.jpg'); // Name ohne '.jpg'
-                const filePath = path.join(downloadDir, `${fileName}.jpg`);
+                const fileName = path.basename(urlPath); // Name inklusive Endung (z.B. .jpg oder .png)
+                const filePath = path.join(artistDir, fileName);
 
                 await downloadImage(imageUrl, filePath);
                 console.info(`🖼️ Saved image to ${filePath}`);
diff --git a/mkbsd.py b/mkbsd.py
index 6b2db59..4b8977e 100644
--- a/mkbsd.py
+++ b/mkbsd.py
@@ -1,5 +1,3 @@
-# Licensed under the WTFPL License
-
 import os
 import time
 import aiohttp
@@ -34,24 +32,27 @@ async def main():
                 if not data:
                     raise Exception('⛔ JSON does not have a "data" property at its root.')
 
-                download_dir = os.path.join(os.getcwd(), 'downloads')
-                if not os.path.exists(download_dir):
-                    os.makedirs(download_dir)
-                    print(f"📁 Created directory: {download_dir}")
-
-                for file_index, (key, subproperty) in enumerate(data.items(), start=1):
+                for key, subproperty in data.items():
                     if subproperty and subproperty.get('dhd'):
                         image_url = subproperty['dhd']
                         print(f"🔍 Found image URL!")
-                        parsed_url = urlparse(image_url)
                         
-                        # Extrahiere den Dateinamen ohne .jpg
-                        filename = os.path.basename(parsed_url.path).replace('.jpg', '') or f'image_{file_index}'
-                        file_path = os.path.join(download_dir, f"{filename}.jpg")
+                        # Extrahiere den Künstlernamen vor dem Unterstrich
+                        parsed_url = urlparse(image_url)
+                        artist_name = image_url.split('a~')[1].split('_')[0]
+                        artist_dir = os.path.join(os.getcwd(), 'downloads', artist_name)
+
+                        if not os.path.exists(artist_dir):
+                            os.makedirs(artist_dir)
+                            print(f"📁 Created directory: {artist_dir}")
+
+                        # Extrahiere den Dateinamen und die Endung
+                        filename = os.path.basename(parsed_url.path)  # Name inklusive Endung
+                        file_path = os.path.join(artist_dir, filename)
 
                         await download_image(session, image_url, file_path)
                         print(f"🖼️ Saved image to {file_path}")
-
+                        
                         await delay(250)
 
     except Exception as e: