diff --git a/tests/test_agent_assembly_context.py b/tests/agent/test_agent_assembly_context.py
similarity index 100%
rename from tests/test_agent_assembly_context.py
rename to tests/agent/test_agent_assembly_context.py
diff --git a/tests/test_agent_instructions.py b/tests/agent/test_agent_instructions.py
similarity index 100%
rename from tests/test_agent_instructions.py
rename to tests/agent/test_agent_instructions.py
diff --git a/tests/test_agent_schedules.py b/tests/agent/test_agent_schedules.py
similarity index 100%
rename from tests/test_agent_schedules.py
rename to tests/agent/test_agent_schedules.py
diff --git a/tests/test_agent_thread_pr_state.py b/tests/agent/test_agent_thread_pr_state.py
similarity index 100%
rename from tests/test_agent_thread_pr_state.py
rename to tests/agent/test_agent_thread_pr_state.py
diff --git a/tests/test_agent_usage.py b/tests/agent/test_agent_usage.py
similarity index 100%
rename from tests/test_agent_usage.py
rename to tests/agent/test_agent_usage.py
diff --git a/tests/test_agents_md.py b/tests/agent/test_agents_md.py
similarity index 100%
rename from tests/test_agents_md.py
rename to tests/agent/test_agents_md.py
diff --git a/tests/test_api_standards_skill.py b/tests/agent/test_api_standards_skill.py
similarity index 100%
rename from tests/test_api_standards_skill.py
rename to tests/agent/test_api_standards_skill.py
diff --git a/tests/test_dispatch.py b/tests/agent/test_dispatch.py
similarity index 100%
rename from tests/test_dispatch.py
rename to tests/agent/test_dispatch.py
diff --git a/tests/test_langsmith_trace_url.py b/tests/agent/test_langsmith_trace_url.py
similarity index 100%
rename from tests/test_langsmith_trace_url.py
rename to tests/agent/test_langsmith_trace_url.py
diff --git a/tests/test_multimodal.py b/tests/agent/test_multimodal.py
similarity index 100%
rename from tests/test_multimodal.py
rename to tests/agent/test_multimodal.py
diff --git a/tests/test_plan_mode.py b/tests/agent/test_plan_mode.py
similarity index 100%
rename from tests/test_plan_mode.py
rename to tests/agent/test_plan_mode.py
diff --git a/tests/test_plan_review.py b/tests/agent/test_plan_review.py
similarity index 100%
rename from tests/test_plan_review.py
rename to tests/agent/test_plan_review.py
diff --git a/tests/test_prompt_default_repo.py b/tests/agent/test_prompt_default_repo.py
similarity index 100%
rename from tests/test_prompt_default_repo.py
rename to tests/agent/test_prompt_default_repo.py
diff --git a/tests/test_repo_prep.py b/tests/agent/test_repo_prep.py
similarity index 100%
rename from tests/test_repo_prep.py
rename to tests/agent/test_repo_prep.py
diff --git a/tests/test_workflow_push_guard.py b/tests/agent/test_workflow_push_guard.py
similarity index 100%
rename from tests/test_workflow_push_guard.py
rename to tests/agent/test_workflow_push_guard.py
diff --git a/tests/test_analyzer_cron.py b/tests/analyzer/test_analyzer_cron.py
similarity index 100%
rename from tests/test_analyzer_cron.py
rename to tests/analyzer/test_analyzer_cron.py
diff --git a/tests/test_analyzer_skills.py b/tests/analyzer/test_analyzer_skills.py
similarity index 100%
rename from tests/test_analyzer_skills.py
rename to tests/analyzer/test_analyzer_skills.py
diff --git a/tests/test_eval_jobs.py b/tests/analyzer/test_eval_jobs.py
similarity index 100%
rename from tests/test_eval_jobs.py
rename to tests/analyzer/test_eval_jobs.py
diff --git a/tests/test_eval_store_reporter.py b/tests/analyzer/test_eval_store_reporter.py
similarity index 100%
rename from tests/test_eval_store_reporter.py
rename to tests/analyzer/test_eval_store_reporter.py
diff --git a/tests/test_atlassian_connect.py b/tests/auth/test_atlassian_connect.py
similarity index 100%
rename from tests/test_atlassian_connect.py
rename to tests/auth/test_atlassian_connect.py
diff --git a/tests/test_auth_error_leak.py b/tests/auth/test_auth_error_leak.py
similarity index 100%
rename from tests/test_auth_error_leak.py
rename to tests/auth/test_auth_error_leak.py
diff --git a/tests/test_auth_sources.py b/tests/auth/test_auth_sources.py
similarity index 100%
rename from tests/test_auth_sources.py
rename to tests/auth/test_auth_sources.py
diff --git a/tests/test_authorship.py b/tests/auth/test_authorship.py
similarity index 100%
rename from tests/test_authorship.py
rename to tests/auth/test_authorship.py
diff --git a/tests/test_encryption.py b/tests/auth/test_encryption.py
similarity index 100%
rename from tests/test_encryption.py
rename to tests/auth/test_encryption.py
diff --git a/tests/test_github_oauth_refresh.py b/tests/auth/test_github_oauth_refresh.py
similarity index 100%
rename from tests/test_github_oauth_refresh.py
rename to tests/auth/test_github_oauth_refresh.py
diff --git a/tests/test_github_token_ttl.py b/tests/auth/test_github_token_ttl.py
similarity index 100%
rename from tests/test_github_token_ttl.py
rename to tests/auth/test_github_token_ttl.py
diff --git a/tests/test_notion_oauth.py b/tests/auth/test_notion_oauth.py
similarity index 100%
rename from tests/test_notion_oauth.py
rename to tests/auth/test_notion_oauth.py
diff --git a/tests/test_slack_oauth.py b/tests/auth/test_slack_oauth.py
similarity index 100%
rename from tests/test_slack_oauth.py
rename to tests/auth/test_slack_oauth.py
diff --git a/tests/test_user_credentials.py b/tests/auth/test_user_credentials.py
similarity index 100%
rename from tests/test_user_credentials.py
rename to tests/auth/test_user_credentials.py
diff --git a/tests/test_account_link.py b/tests/dashboard/test_account_link.py
similarity index 100%
rename from tests/test_account_link.py
rename to tests/dashboard/test_account_link.py
diff --git a/tests/test_autofix_state.py b/tests/dashboard/test_autofix_state.py
similarity index 100%
rename from tests/test_autofix_state.py
rename to tests/dashboard/test_autofix_state.py
diff --git a/tests/test_dashboard_admin.py b/tests/dashboard/test_dashboard_admin.py
similarity index 100%
rename from tests/test_dashboard_admin.py
rename to tests/dashboard/test_dashboard_admin.py
diff --git a/tests/test_dashboard_csrf.py b/tests/dashboard/test_dashboard_csrf.py
similarity index 100%
rename from tests/test_dashboard_csrf.py
rename to tests/dashboard/test_dashboard_csrf.py
diff --git a/tests/test_dashboard_links.py b/tests/dashboard/test_dashboard_links.py
similarity index 100%
rename from tests/test_dashboard_links.py
rename to tests/dashboard/test_dashboard_links.py
diff --git a/tests/test_dashboard_oauth_redirect.py b/tests/dashboard/test_dashboard_oauth_redirect.py
similarity index 100%
rename from tests/test_dashboard_oauth_redirect.py
rename to tests/dashboard/test_dashboard_oauth_redirect.py
diff --git a/tests/test_dashboard_org_login_gate.py b/tests/dashboard/test_dashboard_org_login_gate.py
similarity index 100%
rename from tests/test_dashboard_org_login_gate.py
rename to tests/dashboard/test_dashboard_org_login_gate.py
diff --git a/tests/test_dashboard_repo_optional.py b/tests/dashboard/test_dashboard_repo_optional.py
similarity index 100%
rename from tests/test_dashboard_repo_optional.py
rename to tests/dashboard/test_dashboard_repo_optional.py
diff --git a/tests/test_dashboard_repos.py b/tests/dashboard/test_dashboard_repos.py
similarity index 100%
rename from tests/test_dashboard_repos.py
rename to tests/dashboard/test_dashboard_repos.py
diff --git a/tests/test_dashboard_reviews.py b/tests/dashboard/test_dashboard_reviews.py
similarity index 100%
rename from tests/test_dashboard_reviews.py
rename to tests/dashboard/test_dashboard_reviews.py
diff --git a/tests/test_dashboard_run_email.py b/tests/dashboard/test_dashboard_run_email.py
similarity index 100%
rename from tests/test_dashboard_run_email.py
rename to tests/dashboard/test_dashboard_run_email.py
diff --git a/tests/test_dashboard_thread_api.py b/tests/dashboard/test_dashboard_thread_api.py
similarity index 100%
rename from tests/test_dashboard_thread_api.py
rename to tests/dashboard/test_dashboard_thread_api.py
diff --git a/tests/test_dashboard_thread_api_activity.py b/tests/dashboard/test_dashboard_thread_api_activity.py
similarity index 100%
rename from tests/test_dashboard_thread_api_activity.py
rename to tests/dashboard/test_dashboard_thread_api_activity.py
diff --git a/tests/test_dashboard_web_handoff.py b/tests/dashboard/test_dashboard_web_handoff.py
similarity index 100%
rename from tests/test_dashboard_web_handoff.py
rename to tests/dashboard/test_dashboard_web_handoff.py
diff --git a/tests/test_public_repo_org_gate.py b/tests/dashboard/test_public_repo_org_gate.py
similarity index 100%
rename from tests/test_public_repo_org_gate.py
rename to tests/dashboard/test_public_repo_org_gate.py
diff --git a/tests/test_team_credentials.py b/tests/dashboard/test_team_credentials.py
similarity index 100%
rename from tests/test_team_credentials.py
rename to tests/dashboard/test_team_credentials.py
diff --git a/tests/test_team_settings_fable.py b/tests/dashboard/test_team_settings_fable.py
similarity index 100%
rename from tests/test_team_settings_fable.py
rename to tests/dashboard/test_team_settings_fable.py
diff --git a/tests/test_team_settings_grouping.py b/tests/dashboard/test_team_settings_grouping.py
similarity index 100%
rename from tests/test_team_settings_grouping.py
rename to tests/dashboard/test_team_settings_grouping.py
diff --git a/tests/test_team_settings_org_guidelines.py b/tests/dashboard/test_team_settings_org_guidelines.py
similarity index 100%
rename from tests/test_team_settings_org_guidelines.py
rename to tests/dashboard/test_team_settings_org_guidelines.py
diff --git a/tests/test_user_mappings.py b/tests/dashboard/test_user_mappings.py
similarity index 100%
rename from tests/test_user_mappings.py
rename to tests/dashboard/test_user_mappings.py
diff --git a/tests/test_app_bot_identity.py b/tests/github/test_app_bot_identity.py
similarity index 100%
rename from tests/test_app_bot_identity.py
rename to tests/github/test_app_bot_identity.py
diff --git a/tests/test_autofix_webhook.py b/tests/github/test_autofix_webhook.py
similarity index 100%
rename from tests/test_autofix_webhook.py
rename to tests/github/test_autofix_webhook.py
diff --git a/tests/test_ci_autofix.py b/tests/github/test_ci_autofix.py
similarity index 100%
rename from tests/test_ci_autofix.py
rename to tests/github/test_ci_autofix.py
diff --git a/tests/test_github_app.py b/tests/github/test_github_app.py
similarity index 100%
rename from tests/test_github_app.py
rename to tests/github/test_github_app.py
diff --git a/tests/test_github_checks.py b/tests/github/test_github_checks.py
similarity index 100%
rename from tests/test_github_checks.py
rename to tests/github/test_github_checks.py
diff --git a/tests/test_github_ci.py b/tests/github/test_github_ci.py
similarity index 100%
rename from tests/test_github_ci.py
rename to tests/github/test_github_ci.py
diff --git a/tests/test_github_comment_prompts.py b/tests/github/test_github_comment_prompts.py
similarity index 100%
rename from tests/test_github_comment_prompts.py
rename to tests/github/test_github_comment_prompts.py
diff --git a/tests/test_github_feedback.py b/tests/github/test_github_feedback.py
similarity index 100%
rename from tests/test_github_feedback.py
rename to tests/github/test_github_feedback.py
diff --git a/tests/test_github_http.py b/tests/github/test_github_http.py
similarity index 100%
rename from tests/test_github_http.py
rename to tests/github/test_github_http.py
diff --git a/tests/test_github_issue_webhook.py b/tests/github/test_github_issue_webhook.py
similarity index 100%
rename from tests/test_github_issue_webhook.py
rename to tests/github/test_github_issue_webhook.py
diff --git a/tests/test_github_proxy_refresh.py b/tests/github/test_github_proxy_refresh.py
similarity index 100%
rename from tests/test_github_proxy_refresh.py
rename to tests/github/test_github_proxy_refresh.py
diff --git a/tests/test_normalize_repo.py b/tests/github/test_normalize_repo.py
similarity index 100%
rename from tests/test_normalize_repo.py
rename to tests/github/test_normalize_repo.py
diff --git a/tests/test_open_pull_request.py b/tests/github/test_open_pull_request.py
similarity index 100%
rename from tests/test_open_pull_request.py
rename to tests/github/test_open_pull_request.py
diff --git a/tests/test_pr_creation_guard.py b/tests/github/test_pr_creation_guard.py
similarity index 100%
rename from tests/test_pr_creation_guard.py
rename to tests/github/test_pr_creation_guard.py
diff --git a/tests/test_repo_extraction.py b/tests/github/test_repo_extraction.py
similarity index 100%
rename from tests/test_repo_extraction.py
rename to tests/github/test_repo_extraction.py
diff --git a/tests/test_check_message_queue.py b/tests/middleware/test_check_message_queue.py
similarity index 100%
rename from tests/test_check_message_queue.py
rename to tests/middleware/test_check_message_queue.py
diff --git a/tests/test_ensure_no_empty_msg.py b/tests/middleware/test_ensure_no_empty_msg.py
similarity index 100%
rename from tests/test_ensure_no_empty_msg.py
rename to tests/middleware/test_ensure_no_empty_msg.py
diff --git a/tests/test_model_fallback_middleware.py b/tests/middleware/test_model_fallback_middleware.py
similarity index 100%
rename from tests/test_model_fallback_middleware.py
rename to tests/middleware/test_model_fallback_middleware.py
diff --git a/tests/test_notify_step_limit_middleware.py b/tests/middleware/test_notify_step_limit_middleware.py
similarity index 100%
rename from tests/test_notify_step_limit_middleware.py
rename to tests/middleware/test_notify_step_limit_middleware.py
diff --git a/tests/test_repair_orphaned_tool_calls.py b/tests/middleware/test_repair_orphaned_tool_calls.py
similarity index 100%
rename from tests/test_repair_orphaned_tool_calls.py
rename to tests/middleware/test_repair_orphaned_tool_calls.py
diff --git a/tests/test_sanitize_fireworks_messages.py b/tests/middleware/test_sanitize_fireworks_messages.py
similarity index 100%
rename from tests/test_sanitize_fireworks_messages.py
rename to tests/middleware/test_sanitize_fireworks_messages.py
diff --git a/tests/test_sanitize_openai_responses.py b/tests/middleware/test_sanitize_openai_responses.py
similarity index 100%
rename from tests/test_sanitize_openai_responses.py
rename to tests/middleware/test_sanitize_openai_responses.py
diff --git a/tests/test_sanitize_thinking_blocks.py b/tests/middleware/test_sanitize_thinking_blocks.py
similarity index 100%
rename from tests/test_sanitize_thinking_blocks.py
rename to tests/middleware/test_sanitize_thinking_blocks.py
diff --git a/tests/test_sanitize_tool_inputs.py b/tests/middleware/test_sanitize_tool_inputs.py
similarity index 100%
rename from tests/test_sanitize_tool_inputs.py
rename to tests/middleware/test_sanitize_tool_inputs.py
diff --git a/tests/test_subdir_agents_middleware.py b/tests/middleware/test_subdir_agents_middleware.py
similarity index 100%
rename from tests/test_subdir_agents_middleware.py
rename to tests/middleware/test_subdir_agents_middleware.py
diff --git a/tests/test_tool_artifact_middleware.py b/tests/middleware/test_tool_artifact_middleware.py
similarity index 100%
rename from tests/test_tool_artifact_middleware.py
rename to tests/middleware/test_tool_artifact_middleware.py
diff --git a/tests/test_agent_subagent_models.py b/tests/models/test_agent_subagent_models.py
similarity index 100%
rename from tests/test_agent_subagent_models.py
rename to tests/models/test_agent_subagent_models.py
diff --git a/tests/test_anthropic_effort.py b/tests/models/test_anthropic_effort.py
similarity index 100%
rename from tests/test_anthropic_effort.py
rename to tests/models/test_anthropic_effort.py
diff --git a/tests/test_anthropic_model.py b/tests/models/test_anthropic_model.py
similarity index 100%
rename from tests/test_anthropic_model.py
rename to tests/models/test_anthropic_model.py
diff --git a/tests/test_fireworks_model.py b/tests/models/test_fireworks_model.py
similarity index 100%
rename from tests/test_fireworks_model.py
rename to tests/models/test_fireworks_model.py
diff --git a/tests/test_model_fallback_resolution.py b/tests/models/test_model_fallback_resolution.py
similarity index 100%
rename from tests/test_model_fallback_resolution.py
rename to tests/models/test_model_fallback_resolution.py
diff --git a/tests/test_pr_ready_auto_review.py b/tests/reviewer/test_pr_ready_auto_review.py
similarity index 100%
rename from tests/test_pr_ready_auto_review.py
rename to tests/reviewer/test_pr_ready_auto_review.py
diff --git a/tests/test_recent_comments.py b/tests/reviewer/test_recent_comments.py
similarity index 100%
rename from tests/test_recent_comments.py
rename to tests/reviewer/test_recent_comments.py
diff --git a/tests/test_reconcile_sweep.py b/tests/reviewer/test_reconcile_sweep.py
similarity index 100%
rename from tests/test_reconcile_sweep.py
rename to tests/reviewer/test_reconcile_sweep.py
diff --git a/tests/test_review_api.py b/tests/reviewer/test_review_api.py
similarity index 100%
rename from tests/test_review_api.py
rename to tests/reviewer/test_review_api.py
diff --git a/tests/test_review_chat.py b/tests/reviewer/test_review_chat.py
similarity index 100%
rename from tests/test_review_chat.py
rename to tests/reviewer/test_review_chat.py
diff --git a/tests/test_review_style_collector.py b/tests/reviewer/test_review_style_collector.py
similarity index 100%
rename from tests/test_review_style_collector.py
rename to tests/reviewer/test_review_style_collector.py
diff --git a/tests/test_review_style_sync.py b/tests/reviewer/test_review_style_sync.py
similarity index 100%
rename from tests/test_review_style_sync.py
rename to tests/reviewer/test_review_style_sync.py
diff --git a/tests/test_review_styles_store.py b/tests/reviewer/test_review_styles_store.py
similarity index 100%
rename from tests/test_review_styles_store.py
rename to tests/reviewer/test_review_styles_store.py
diff --git a/tests/test_reviewer.py b/tests/reviewer/test_reviewer.py
similarity index 100%
rename from tests/test_reviewer.py
rename to tests/reviewer/test_reviewer.py
diff --git a/tests/test_reviewer_diff.py b/tests/reviewer/test_reviewer_diff.py
similarity index 100%
rename from tests/test_reviewer_diff.py
rename to tests/reviewer/test_reviewer_diff.py
diff --git a/tests/test_reviewer_eval_judge.py b/tests/reviewer/test_reviewer_eval_judge.py
similarity index 100%
rename from tests/test_reviewer_eval_judge.py
rename to tests/reviewer/test_reviewer_eval_judge.py
diff --git a/tests/test_reviewer_eval_run.py b/tests/reviewer/test_reviewer_eval_run.py
similarity index 100%
rename from tests/test_reviewer_eval_run.py
rename to tests/reviewer/test_reviewer_eval_run.py
diff --git a/tests/test_reviewer_eval_target.py b/tests/reviewer/test_reviewer_eval_target.py
similarity index 100%
rename from tests/test_reviewer_eval_target.py
rename to tests/reviewer/test_reviewer_eval_target.py
diff --git a/tests/test_reviewer_findings.py b/tests/reviewer/test_reviewer_findings.py
similarity index 100%
rename from tests/test_reviewer_findings.py
rename to tests/reviewer/test_reviewer_findings.py
diff --git a/tests/test_reviewer_groups.py b/tests/reviewer/test_reviewer_groups.py
similarity index 100%
rename from tests/test_reviewer_groups.py
rename to tests/reviewer/test_reviewer_groups.py
diff --git a/tests/test_reviewer_outcomes.py b/tests/reviewer/test_reviewer_outcomes.py
similarity index 100%
rename from tests/test_reviewer_outcomes.py
rename to tests/reviewer/test_reviewer_outcomes.py
diff --git a/tests/test_reviewer_publish.py b/tests/reviewer/test_reviewer_publish.py
similarity index 100%
rename from tests/test_reviewer_publish.py
rename to tests/reviewer/test_reviewer_publish.py
diff --git a/tests/test_reviewer_reconcile.py b/tests/reviewer/test_reviewer_reconcile.py
similarity index 100%
rename from tests/test_reviewer_reconcile.py
rename to tests/reviewer/test_reviewer_reconcile.py
diff --git a/tests/test_reviewer_tools.py b/tests/reviewer/test_reviewer_tools.py
similarity index 100%
rename from tests/test_reviewer_tools.py
rename to tests/reviewer/test_reviewer_tools.py
diff --git a/tests/test_reviewer_trace_context.py b/tests/reviewer/test_reviewer_trace_context.py
similarity index 100%
rename from tests/test_reviewer_trace_context.py
rename to tests/reviewer/test_reviewer_trace_context.py
diff --git a/tests/test_reviewer_watch.py b/tests/reviewer/test_reviewer_watch.py
similarity index 100%
rename from tests/test_reviewer_watch.py
rename to tests/reviewer/test_reviewer_watch.py
diff --git a/tests/test_daytona_integration.py b/tests/sandbox/test_daytona_integration.py
similarity index 98%
rename from tests/test_daytona_integration.py
rename to tests/sandbox/test_daytona_integration.py
index 05d14aa2..2c1fd101 100644
--- a/tests/test_daytona_integration.py
+++ b/tests/sandbox/test_daytona_integration.py
@@ -3,7 +3,7 @@ import sys
 import types
 from pathlib import Path
 
-ROOT = Path(__file__).resolve().parents[1]
+ROOT = Path(__file__).resolve().parents[2]
 
 
 class _FakeCreateSandboxFromSnapshotParams:
diff --git a/tests/test_e2b_integration.py b/tests/sandbox/test_e2b_integration.py
similarity index 98%
rename from tests/test_e2b_integration.py
rename to tests/sandbox/test_e2b_integration.py
index d23aaf23..62941994 100644
--- a/tests/test_e2b_integration.py
+++ b/tests/sandbox/test_e2b_integration.py
@@ -3,7 +3,7 @@ import sys
 import types
 from pathlib import Path
 
-ROOT = Path(__file__).resolve().parents[1]
+ROOT = Path(__file__).resolve().parents[2]
 
 
 class _FakeSandbox:
diff --git a/tests/test_gateway.py b/tests/sandbox/test_gateway.py
similarity index 100%
rename from tests/test_gateway.py
rename to tests/sandbox/test_gateway.py
diff --git a/tests/test_langsmith_sandbox_config.py b/tests/sandbox/test_langsmith_sandbox_config.py
similarity index 100%
rename from tests/test_langsmith_sandbox_config.py
rename to tests/sandbox/test_langsmith_sandbox_config.py
diff --git a/tests/test_langsmith_sandbox_timeout.py b/tests/sandbox/test_langsmith_sandbox_timeout.py
similarity index 100%
rename from tests/test_langsmith_sandbox_timeout.py
rename to tests/sandbox/test_langsmith_sandbox_timeout.py
diff --git a/tests/test_local_integration.py b/tests/sandbox/test_local_integration.py
similarity index 100%
rename from tests/test_local_integration.py
rename to tests/sandbox/test_local_integration.py
diff --git a/tests/test_proxy_auth.py b/tests/sandbox/test_proxy_auth.py
similarity index 100%
rename from tests/test_proxy_auth.py
rename to tests/sandbox/test_proxy_auth.py
diff --git a/tests/test_repo_binding_isolation.py b/tests/sandbox/test_repo_binding_isolation.py
similarity index 100%
rename from tests/test_repo_binding_isolation.py
rename to tests/sandbox/test_repo_binding_isolation.py
diff --git a/tests/test_repo_snapshots.py b/tests/sandbox/test_repo_snapshots.py
similarity index 100%
rename from tests/test_repo_snapshots.py
rename to tests/sandbox/test_repo_snapshots.py
diff --git a/tests/test_sandbox_paths.py b/tests/sandbox/test_sandbox_paths.py
similarity index 100%
rename from tests/test_sandbox_paths.py
rename to tests/sandbox/test_sandbox_paths.py
diff --git a/tests/middleware/test_sandbox_recovery.py b/tests/sandbox/test_sandbox_recovery.py
similarity index 100%
rename from tests/middleware/test_sandbox_recovery.py
rename to tests/sandbox/test_sandbox_recovery.py
diff --git a/tests/test_stale_sandbox_creating.py b/tests/sandbox/test_stale_sandbox_creating.py
similarity index 100%
rename from tests/test_stale_sandbox_creating.py
rename to tests/sandbox/test_stale_sandbox_creating.py
diff --git a/tests/test_refresh_slack_status_middleware.py b/tests/slack/test_refresh_slack_status_middleware.py
similarity index 100%
rename from tests/test_refresh_slack_status_middleware.py
rename to tests/slack/test_refresh_slack_status_middleware.py
diff --git a/tests/test_slack_add_reaction_tool.py b/tests/slack/test_slack_add_reaction_tool.py
similarity index 100%
rename from tests/test_slack_add_reaction_tool.py
rename to tests/slack/test_slack_add_reaction_tool.py
diff --git a/tests/test_slack_assistants_status.py b/tests/slack/test_slack_assistants_status.py
similarity index 100%
rename from tests/test_slack_assistants_status.py
rename to tests/slack/test_slack_assistants_status.py
diff --git a/tests/test_slack_context.py b/tests/slack/test_slack_context.py
similarity index 100%
rename from tests/test_slack_context.py
rename to tests/slack/test_slack_context.py
diff --git a/tests/test_slack_feedback.py b/tests/slack/test_slack_feedback.py
similarity index 100%
rename from tests/test_slack_feedback.py
rename to tests/slack/test_slack_feedback.py
diff --git a/tests/test_slack_start_new_thread_tool.py b/tests/slack/test_slack_start_new_thread_tool.py
similarity index 100%
rename from tests/test_slack_start_new_thread_tool.py
rename to tests/slack/test_slack_start_new_thread_tool.py
diff --git a/tests/test_slack_thread_reply_tool.py b/tests/slack/test_slack_thread_reply_tool.py
similarity index 100%
rename from tests/test_slack_thread_reply_tool.py
rename to tests/slack/test_slack_thread_reply_tool.py
diff --git a/tests/test_slack_webhook_errors.py b/tests/slack/test_slack_webhook_errors.py
similarity index 100%
rename from tests/test_slack_webhook_errors.py
rename to tests/slack/test_slack_webhook_errors.py
diff --git a/tests/test_confluence_utils.py b/tests/tools/test_confluence_utils.py
similarity index 100%
rename from tests/test_confluence_utils.py
rename to tests/tools/test_confluence_utils.py
diff --git a/tests/test_corridor_mcp.py b/tests/tools/test_corridor_mcp.py
similarity index 100%
rename from tests/test_corridor_mcp.py
rename to tests/tools/test_corridor_mcp.py
diff --git a/tests/test_currents_tools.py b/tests/tools/test_currents_tools.py
similarity index 100%
rename from tests/test_currents_tools.py
rename to tests/tools/test_currents_tools.py
diff --git a/tests/test_http_security.py b/tests/tools/test_http_security.py
similarity index 100%
rename from tests/test_http_security.py
rename to tests/tools/test_http_security.py
diff --git a/tests/test_jira_utils.py b/tests/tools/test_jira_utils.py
similarity index 100%
rename from tests/test_jira_utils.py
rename to tests/tools/test_jira_utils.py
diff --git a/tests/test_observability_tools.py b/tests/tools/test_observability_tools.py
similarity index 100%
rename from tests/test_observability_tools.py
rename to tests/tools/test_observability_tools.py
diff --git a/tests/test_report_platform_issue_tool.py b/tests/tools/test_report_platform_issue_tool.py
similarity index 100%
rename from tests/test_report_platform_issue_tool.py
rename to tests/tools/test_report_platform_issue_tool.py
diff --git a/tests/test_schedule_thread_wakeup.py b/tests/tools/test_schedule_thread_wakeup.py
similarity index 100%
rename from tests/test_schedule_thread_wakeup.py
rename to tests/tools/test_schedule_thread_wakeup.py
diff --git a/tests/test_completion_webhook.py b/tests/webhooks/test_completion_webhook.py
similarity index 100%
rename from tests/test_completion_webhook.py
rename to tests/webhooks/test_completion_webhook.py
diff --git a/tests/test_confluence_webhook.py b/tests/webhooks/test_confluence_webhook.py
similarity index 100%
rename from tests/test_confluence_webhook.py
rename to tests/webhooks/test_confluence_webhook.py
diff --git a/tests/test_jira_webhook_author.py b/tests/webhooks/test_jira_webhook_author.py
similarity index 100%
rename from tests/test_jira_webhook_author.py
rename to tests/webhooks/test_jira_webhook_author.py
diff --git a/tests/test_jira_webhook_corroboration.py b/tests/webhooks/test_jira_webhook_corroboration.py
similarity index 100%
rename from tests/test_jira_webhook_corroboration.py
rename to tests/webhooks/test_jira_webhook_corroboration.py
diff --git a/tests/test_jira_webhook_replay.py b/tests/webhooks/test_jira_webhook_replay.py
similarity index 100%
rename from tests/test_jira_webhook_replay.py
rename to tests/webhooks/test_jira_webhook_replay.py
diff --git a/tests/test_linear_webhook_author.py b/tests/webhooks/test_linear_webhook_author.py
similarity index 100%
rename from tests/test_linear_webhook_author.py
rename to tests/webhooks/test_linear_webhook_author.py
diff --git a/tests/test_linear_webhook_replay.py b/tests/webhooks/test_linear_webhook_replay.py
similarity index 100%
rename from tests/test_linear_webhook_replay.py
rename to tests/webhooks/test_linear_webhook_replay.py