diff --git a/zxdb.py b/zxdb.py
index f9b4de7..f57ecd5 100644
--- a/zxdb.py
+++ b/zxdb.py
@@ -127,7 +127,10 @@ def process_elements():
     global elements
     for i in range(len(elements)):
         # Construye el nombre de la carpeta raiz
-        elements[i]["root_folder"] = f"{elements[i]['title']} ({elements[i]['release_year']})({elements[i]['developer']})"
+        if should_sort_by_developer:
+            elements[i]["root_folder"] = f"{elements[i]['title']} ({elements[i]['release_year']})"
+        else:
+            elements[i]["root_folder"] = f"{elements[i]['title']} ({elements[i]['release_year']})({elements[i]['developer']})"
         elements[i]["root_folder"] = normalize_path(elements[i]["root_folder"])
 
         # Añade el prefijo a la url y normaliza los enlaces de "wos"
@@ -209,6 +212,10 @@ def get_final_destination_folder(developer, year, root_folder):
             folder1 = "modern"
         else:
             folder1 = "classics"
+    elif should_sort_by_developer:
+        folder1 = "by_developer"
+    elif should_sort_by_year:
+        folder1 = "by_year"
 
     # Carpeta basada en el desarrollador
     folder2 = ""