diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py
index 6afe2e8..dafcfa1 100644
--- a/Whatsapp_Chat_Exporter/__main__.py
+++ b/Whatsapp_Chat_Exporter/__main__.py
@@ -242,7 +242,7 @@ def main():
         vcard = extract_iphone.vcard
         create_html = extract_iphone.create_html
         if args.media is None:
-            args.media = "Message"
+            args.media = "AppDomainGroup-group.net.whatsapp.WhatsApp.shared"
         if args.backup is not None:
             if not os.path.isdir(args.media):
                 extract_iphone_media.extract_media(args.backup)
diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py
index b5aee26..ac085ca 100644
--- a/Whatsapp_Chat_Exporter/extract_iphone.py
+++ b/Whatsapp_Chat_Exporter/extract_iphone.py
@@ -152,12 +152,11 @@ def media(db, data, media_folder):
     content = c.fetchone()
     mime = MimeTypes()
     while content is not None:
-        file_path = f"{media_folder}/{content['ZMEDIALOCALPATH']}"
+        file_path = f"{media_folder}/Message/{content['ZMEDIALOCALPATH']}"
         _id = content["_id"]
         ZMESSAGE = content["ZMESSAGE"]
         message = data[_id].messages[ZMESSAGE]
         message.media = True
-
         if os.path.isfile(file_path):
             message.data = file_path
             if content["ZVCARDSTRING"] is None:
@@ -207,7 +206,7 @@ def vcard(db, data):
     contents = c.fetchall()
     total_row_number = len(contents)
     print(f"\nProcessing vCards...(0/{total_row_number})", end="\r")
-    base = "Message/vCards"
+    base = "AppDomainGroup-group.net.whatsapp.WhatsApp.shared/Message/vCards"
     if not os.path.isdir(base):
         Path(base).mkdir(parents=True, exist_ok=True)
     for index, content in enumerate(contents):
diff --git a/Whatsapp_Chat_Exporter/extract_iphone_media.py b/Whatsapp_Chat_Exporter/extract_iphone_media.py
index 87d0848..7697db8 100644
--- a/Whatsapp_Chat_Exporter/extract_iphone_media.py
+++ b/Whatsapp_Chat_Exporter/extract_iphone_media.py
@@ -113,14 +113,14 @@ def extract_media(base_dir):
                         FROM Files
                         WHERE domain = '{_wts_id}'
                         ORDER BY relativePath""")
-            if not os.path.isdir("WhatsApp"):
-                os.mkdir("WhatsApp")
+            if not os.path.isdir(_wts_id):
+                os.mkdir(_wts_id)
             row = c.fetchone()
             while row is not None:
                 if row["relativePath"] == "":
                     row = c.fetchone()
                     continue
-                destination = os.path.join("WhatsApp/", row["relativePath"])
+                destination = os.path.join(_wts_id, row["relativePath"])
                 hashes = row["fileID"]
                 folder = hashes[:2]
                 flags = row["flags"]