diff --git a/skyvern/forge/sdk/routes/__init__.py b/skyvern/forge/sdk/routes/__init__.py
index 810a0069..0ae1ab5d 100644
--- a/skyvern/forge/sdk/routes/__init__.py
+++ b/skyvern/forge/sdk/routes/__init__.py
@@ -8,7 +8,7 @@ from skyvern.forge.sdk.routes import pylon  # noqa: F401
 from skyvern.forge.sdk.routes import run_blocks  # noqa: F401
 from skyvern.forge.sdk.routes import scripts  # noqa: F401
 from skyvern.forge.sdk.routes import sdk  # noqa: F401
-from skyvern.forge.sdk.routes import streaming  # noqa: F401
-from skyvern.forge.sdk.routes import streaming_messages  # noqa: F401
-from skyvern.forge.sdk.routes import streaming_vnc  # noqa: F401
 from skyvern.forge.sdk.routes import webhooks  # noqa: F401
+from skyvern.forge.sdk.routes.streaming import messages  # noqa: F401
+from skyvern.forge.sdk.routes.streaming import screenshot  # noqa: F401
+from skyvern.forge.sdk.routes.streaming import vnc  # noqa: F401
diff --git a/skyvern/forge/sdk/routes/streaming_agent.py b/skyvern/forge/sdk/routes/streaming/agent.py
similarity index 99%
rename from skyvern/forge/sdk/routes/streaming_agent.py
rename to skyvern/forge/sdk/routes/streaming/agent.py
index 4169e4c0..7966de7a 100644
--- a/skyvern/forge/sdk/routes/streaming_agent.py
+++ b/skyvern/forge/sdk/routes/streaming/agent.py
@@ -8,7 +8,7 @@ from contextlib import asynccontextmanager
 import structlog
 from playwright.async_api import Browser, BrowserContext, Page, Playwright, async_playwright
 
-import skyvern.forge.sdk.routes.streaming_clients as sc
+import skyvern.forge.sdk.routes.streaming.clients as sc
 from skyvern.config import settings
 
 LOG = structlog.get_logger()
diff --git a/skyvern/forge/sdk/routes/streaming_auth.py b/skyvern/forge/sdk/routes/streaming/auth.py
similarity index 100%
rename from skyvern/forge/sdk/routes/streaming_auth.py
rename to skyvern/forge/sdk/routes/streaming/auth.py
diff --git a/skyvern/forge/sdk/routes/streaming_clients.py b/skyvern/forge/sdk/routes/streaming/clients.py
similarity index 100%
rename from skyvern/forge/sdk/routes/streaming_clients.py
rename to skyvern/forge/sdk/routes/streaming/clients.py
diff --git a/skyvern/forge/sdk/routes/streaming_messages.py b/skyvern/forge/sdk/routes/streaming/messages.py
similarity index 98%
rename from skyvern/forge/sdk/routes/streaming_messages.py
rename to skyvern/forge/sdk/routes/streaming/messages.py
index ac2e4c85..2bd6f0ef 100644
--- a/skyvern/forge/sdk/routes/streaming_messages.py
+++ b/skyvern/forge/sdk/routes/streaming/messages.py
@@ -8,11 +8,11 @@ import structlog
 from fastapi import WebSocket, WebSocketDisconnect
 from websockets.exceptions import ConnectionClosedError
 
-import skyvern.forge.sdk.routes.streaming_clients as sc
+import skyvern.forge.sdk.routes.streaming.clients as sc
 from skyvern.forge.sdk.routes.routers import base_router, legacy_base_router
-from skyvern.forge.sdk.routes.streaming_agent import connected_agent
-from skyvern.forge.sdk.routes.streaming_auth import auth
-from skyvern.forge.sdk.routes.streaming_verify import (
+from skyvern.forge.sdk.routes.streaming.agent import connected_agent
+from skyvern.forge.sdk.routes.streaming.auth import auth
+from skyvern.forge.sdk.routes.streaming.verify import (
     loop_verify_browser_session,
     loop_verify_workflow_run,
     verify_browser_session,
diff --git a/skyvern/forge/sdk/routes/streaming.py b/skyvern/forge/sdk/routes/streaming/screenshot.py
similarity index 98%
rename from skyvern/forge/sdk/routes/streaming.py
rename to skyvern/forge/sdk/routes/streaming/screenshot.py
index 76a576ef..bf9b8aee 100644
--- a/skyvern/forge/sdk/routes/streaming.py
+++ b/skyvern/forge/sdk/routes/streaming/screenshot.py
@@ -146,7 +146,11 @@ async def workflow_run_streaming(
         organization = await get_current_org(x_api_key=apikey, authorization=token)
         organization_id = organization.organization_id
     except Exception:
-        LOG.exception("WofklowRun Streaming: Error while getting organization", workflow_run_id=workflow_run_id)
+        LOG.exception(
+            "WofklowRun Streaming: Error while getting organization",
+            workflow_run_id=workflow_run_id,
+            token=token,
+        )
         try:
             await websocket.send_text("Invalid credential provided")
         except ConnectionClosedOK:
diff --git a/skyvern/forge/sdk/routes/streaming_verify.py b/skyvern/forge/sdk/routes/streaming/verify.py
similarity index 99%
rename from skyvern/forge/sdk/routes/streaming_verify.py
rename to skyvern/forge/sdk/routes/streaming/verify.py
index 7d43a9aa..79893d4e 100644
--- a/skyvern/forge/sdk/routes/streaming_verify.py
+++ b/skyvern/forge/sdk/routes/streaming/verify.py
@@ -3,7 +3,7 @@ from datetime import datetime
 
 import structlog
 
-import skyvern.forge.sdk.routes.streaming_clients as sc
+import skyvern.forge.sdk.routes.streaming.clients as sc
 from skyvern.config import settings
 from skyvern.forge import app
 from skyvern.forge.sdk.schemas.persistent_browser_sessions import AddressablePersistentBrowserSession
diff --git a/skyvern/forge/sdk/routes/streaming_vnc.py b/skyvern/forge/sdk/routes/streaming/vnc.py
similarity index 98%
rename from skyvern/forge/sdk/routes/streaming_vnc.py
rename to skyvern/forge/sdk/routes/streaming/vnc.py
index 0e91c099..9b1ad14f 100644
--- a/skyvern/forge/sdk/routes/streaming_vnc.py
+++ b/skyvern/forge/sdk/routes/streaming/vnc.py
@@ -19,14 +19,14 @@ from fastapi import WebSocket, WebSocketDisconnect
 from websockets import Data
 from websockets.exceptions import ConnectionClosedError
 
-import skyvern.forge.sdk.routes.streaming_clients as sc
+import skyvern.forge.sdk.routes.streaming.clients as sc
 from skyvern.config import settings
 from skyvern.forge import app
 from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType
 from skyvern.forge.sdk.routes.routers import base_router, legacy_base_router
-from skyvern.forge.sdk.routes.streaming_agent import connected_agent
-from skyvern.forge.sdk.routes.streaming_auth import auth
-from skyvern.forge.sdk.routes.streaming_verify import (
+from skyvern.forge.sdk.routes.streaming.agent import connected_agent
+from skyvern.forge.sdk.routes.streaming.auth import auth
+from skyvern.forge.sdk.routes.streaming.verify import (
     loop_verify_browser_session,
     loop_verify_task,
     loop_verify_workflow_run,