diff --git a/src/aniworld/__main__.py b/src/aniworld/__main__.py
index 4801357..e9c7ebe 100644
--- a/src/aniworld/__main__.py
+++ b/src/aniworld/__main__.py
@@ -309,8 +309,7 @@ def on_ok(self):
         npyscreen.notify_confirm(f"Selected episodes:\n{selected_str}", title="Selection")
 
         if not self.directory_field.hidden:
-            anime_title = format_anime_title(self.parentApp.anime_slug)
-            output_directory = os.path.join(output_directory, anime_title)
+            output_directory = os.path.join(output_directory)
             os.makedirs(output_directory, exist_ok=True)
             logging.debug("Output directory created: %s", output_directory)
 
diff --git a/src/aniworld/execute.py b/src/aniworld/execute.py
index b62c345..7b60f42 100644
--- a/src/aniworld/execute.py
+++ b/src/aniworld/execute.py
@@ -365,20 +365,16 @@ def get_language_from_key(key: int) -> str:
 
     output_directory = os.getenv("OUTPUT_DIRECTORY") or params['output_directory']
 
-    if sanitize_anime_title in output_directory:
-        anime_folder = f"{sanitize_anime_title}"
-    else:
-        anime_folder = f"{sanitize_anime_title}/{sanitize_anime_title}"
-
     file_name = (
-        f"{anime_folder} - S{params['season_number']}E{params['episode_number']}"
+        f"{sanitize_anime_title} - S{params['season_number']}E{params['episode_number']}"
         if params['season_number']
-        else f"{anime_folder} - Movie {params['episode_number']}"
+        else f"{sanitize_anime_title} - Movie {params['episode_number']}"
     )
 
 
     file_path = os.path.join(
         output_directory,
+        sanitize_anime_title,
         f"{file_name} ({get_language_from_key(int(params['language']))}).mp4"
     )