diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 44029f928..868cb0928 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -255,6 +255,7 @@ nav:
   #   - An Analysis on Prompting Strategies: "swarms/prompts/overview.md"
   #   - Managing Prompts in Production: "swarms/prompts/main.md"
   - Community:
+    - Bounty Program: "corporate/bounty_program.md"
     - Contributing: 
       - Contributing: "swarms/contributing.md"
       - Tests: "swarms/framework/test.md"
@@ -264,7 +265,6 @@ nav:
       - Swarms 5.6.8: "swarms/changelog/5_6_8.md"
       - Swarms 5.8.1: "swarms/changelog/5_8_1.md"
       - Swarms 5.9.2: "swarms/changelog/changelog_new.md"
-    - Bounty Program: "corporate/bounty_program.md"
   - Corporate:
     - Culture: "corporate/culture.md"
     - Hiring: "corporate/hiring.md"
diff --git a/pyproject.toml b/pyproject.toml
index 541bcbac2..2818e7f57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,7 +69,7 @@ psutil = "*"
 sentry-sdk = "*"
 python-dotenv = "*"
 PyYAML = "*"
-docstring_parser = "0.16"
+docstring_parser = "0.16" # TODO:
 tiktoken = "*"
 networkx = "*"
 aiofiles = "*"
diff --git a/swarms/structs/agent.py b/swarms/structs/agent.py
index caedb9519..c1a9982ab 100644
--- a/swarms/structs/agent.py
+++ b/swarms/structs/agent.py
@@ -21,8 +21,6 @@
 
 import toml
 import yaml
-
-# from swarms.utils.loguru_logger import initialize_logger
 from loguru import logger
 from pydantic import BaseModel
 from swarm_models.tiktoken_wrapper import TikTokenizer
@@ -500,10 +498,6 @@ def __init__(
         if preset_stopping_token is not None:
             self.stopping_token = "<DONE>"
 
-        # # Check the parameters
-        # # Telemetry Processor to log agent data
-        # threading.Thread(target=self.agent_initialization()).start
-
         # If the docs exist then ingest the docs
         if exists(self.docs):
             threading.Thread(
diff --git a/swarms/structs/output_types.py b/swarms/structs/output_types.py
index 7e4a46441..69e975aa6 100644
--- a/swarms/structs/output_types.py
+++ b/swarms/structs/output_types.py
@@ -1,6 +1,5 @@
 from typing import Literal
 
-# Literal of output types
 # Literal of output types
 OutputType = Literal[
     "all",
diff --git a/auto_test_eval.py b/tests/agent_evals/auto_test_eval.py
similarity index 98%
rename from auto_test_eval.py
rename to tests/agent_evals/auto_test_eval.py
index fd2820136..b9c770fab 100644
--- a/auto_test_eval.py
+++ b/tests/agent_evals/auto_test_eval.py
@@ -92,9 +92,6 @@ def __init__(
         self.issues_created = []
         self.last_issue_time = datetime.now()
 
-        # Validate GitHub token
-        # self._validate_github_credentials()
-
     def _get_swarms_version(self) -> str:
         """Get the installed version of Swarms."""
         try:
@@ -316,11 +313,6 @@ def report_swarms_issue(
             return None
 
 
-# from swarms import Agent
-# from swarm_models import OpenAIChat
-# from swarms.utils.issue_reporter import SwarmsIssueReporter
-# import os
-
 # Setup the reporter with your GitHub token
 reporter = SwarmsIssueReporter(
     github_token=os.getenv("GITHUB_API_KEY")
diff --git a/github_summarizer_agent.py b/tests/agent_evals/github_summarizer_agent.py
similarity index 100%
rename from github_summarizer_agent.py
rename to tests/agent_evals/github_summarizer_agent.py
diff --git a/test_agent_features.py b/tests/structs/test_agent_features.py
similarity index 99%
rename from test_agent_features.py
rename to tests/structs/test_agent_features.py
index 85d01d09a..37ce53210 100644
--- a/test_agent_features.py
+++ b/tests/structs/test_agent_features.py
@@ -1,11 +1,13 @@
 import asyncio
-from swarms import Agent
-from swarm_models import OpenAIChat
+import json
 import os
+import tempfile
 import time
-import json
+
 import yaml
-import tempfile
+from swarm_models import OpenAIChat
+
+from swarms import Agent
 
 
 def test_basic_agent_functionality():