diff --git a/SimulationGraph/Simulation-07-04-2025-11-46-11.json_simulation_analysis.png b/SimulationGraph/Simulation-07-04-2025-11-46-11.json_simulation_analysis.png
deleted file mode 100644
index b3ba976393dd472ff750a851f5cc6b628204e635..0000000000000000000000000000000000000000
Binary files a/SimulationGraph/Simulation-07-04-2025-11-46-11.json_simulation_analysis.png and /dev/null differ
diff --git a/SimulationGraph/Simulation-14-04-2025-10-14-58.json_full_analysis.png b/SimulationGraph/Simulation-14-04-2025-10-14-58/full_analysis.png
similarity index 100%
rename from SimulationGraph/Simulation-14-04-2025-10-14-58.json_full_analysis.png
rename to SimulationGraph/Simulation-14-04-2025-10-14-58/full_analysis.png
diff --git a/SimulationGraph/Simulation-14-04-2025-10-14-58.json_report.md b/SimulationGraph/Simulation-14-04-2025-10-14-58/report.md
similarity index 99%
rename from SimulationGraph/Simulation-14-04-2025-10-14-58.json_report.md
rename to SimulationGraph/Simulation-14-04-2025-10-14-58/report.md
index e8dedf7528c9d86b0a92998c8a59fa48977c059f..d93fb681d4f391f2733e4a8265f8b4b1ff3ffc75 100644
--- a/SimulationGraph/Simulation-14-04-2025-10-14-58.json_report.md
+++ b/SimulationGraph/Simulation-14-04-2025-10-14-58/report.md
@@ -1,6 +1,6 @@
 # Simulation report
 **File**: `Simulation-14-04-2025-10-14-58.json`  
-**Report generation date**: 2025-04-14 10:47:48  
+**Report generation date**: 2025-04-14 10:58:41  
 **Seed**: `723505677`  
 
 ## Resume
diff --git a/SimulationGraph/graphMaker.py b/SimulationGraph/graphMaker.py
index 0369d7899b2b26ef1650f14ba621cefd635fcbc0..b5287c7cce00185b0f0af388d7d1d032f4cf29d9 100644
--- a/SimulationGraph/graphMaker.py
+++ b/SimulationGraph/graphMaker.py
@@ -58,7 +58,12 @@ def plot_all_metrics(file_name):
         axs[j].axis("off")
 
     plt.tight_layout(rect=[0, 0.03, 1, 0.95])
-    output_path = os.path.join(OUTPUT_FOLDER_PATH, f"{file_name}_full_analysis.png")
+
+    file_base_name = os.path.splitext(file_name)[0]
+    output_dir = os.path.join(OUTPUT_FOLDER_PATH, file_base_name)
+    os.makedirs(output_dir, exist_ok=True)
+    output_path = os.path.join(output_dir, "full_analysis.png")
+    
     plt.savefig(output_path)
     print(f"Graph saved to: {output_path}")
 
diff --git a/SimulationGraph/reportMaker.py b/SimulationGraph/reportMaker.py
index 9c607417ba41a904dd2eb938937d733fb664fc80..c8c3f03b054e48e3920ed855d0c0f066e778ce77 100644
--- a/SimulationGraph/reportMaker.py
+++ b/SimulationGraph/reportMaker.py
@@ -108,7 +108,10 @@ def generate_md_report(file_name):
     report_lines.extend(format_spawn_list("Collectibles", metadata.get("collectibles", [])))
     report_lines.extend(format_spawn_list("Obstacles", metadata.get("obstacles", [])))
 
-    output_path = os.path.join(OUTPUT_FOLDER_PATH, f"{file_name}_report.md")
+    file_base_name = os.path.splitext(file_name)[0]
+    output_dir = os.path.join(OUTPUT_FOLDER_PATH, file_base_name)
+    os.makedirs(output_dir, exist_ok=True)
+    output_path = os.path.join(output_dir, "report.md")
     with open(output_path, "w", encoding="utf-8") as f:
         f.write("\n".join(report_lines))
 
diff --git a/SimulationGraph/simulation_analysis.png b/SimulationGraph/simulation_analysis.png
deleted file mode 100644
index b4a82a58cd9cb6e6183497d78534b9b575a93e0c..0000000000000000000000000000000000000000
Binary files a/SimulationGraph/simulation_analysis.png and /dev/null differ