diff --git a/mcp_bridge/endpoints.py b/mcp_bridge/api_endpoints/openai/__init__.py
similarity index 80%
rename from mcp_bridge/endpoints.py
rename to mcp_bridge/api_endpoints/openai/__init__.py
index afbb67b..00795bf 100644
--- a/mcp_bridge/endpoints.py
+++ b/mcp_bridge/api_endpoints/openai/__init__.py
@@ -2,12 +2,10 @@
 
 from lmos_openai_types import CreateChatCompletionRequest, CreateCompletionRequest
 
-from openai_clients import (
-    client,
-    completions,
-    chat_completions,
-    streaming_chat_completions,
-)
+from .genericHttpxClient import client
+from .completion import completions
+from .chatCompletion import chat_completions
+from .streamChatCompletion import streaming_chat_completions
 
 from openapi_tags import Tag
 
diff --git a/mcp_bridge/openai_clients/chatCompletion.py b/mcp_bridge/api_endpoints/openai/chatCompletion.py
similarity index 100%
rename from mcp_bridge/openai_clients/chatCompletion.py
rename to mcp_bridge/api_endpoints/openai/chatCompletion.py
diff --git a/mcp_bridge/openai_clients/completion.py b/mcp_bridge/api_endpoints/openai/completion.py
similarity index 100%
rename from mcp_bridge/openai_clients/completion.py
rename to mcp_bridge/api_endpoints/openai/completion.py
diff --git a/mcp_bridge/openai_clients/genericHttpxClient.py b/mcp_bridge/api_endpoints/openai/genericHttpxClient.py
similarity index 100%
rename from mcp_bridge/openai_clients/genericHttpxClient.py
rename to mcp_bridge/api_endpoints/openai/genericHttpxClient.py
diff --git a/mcp_bridge/openai_clients/streamChatCompletion.py b/mcp_bridge/api_endpoints/openai/streamChatCompletion.py
similarity index 96%
rename from mcp_bridge/openai_clients/streamChatCompletion.py
rename to mcp_bridge/api_endpoints/openai/streamChatCompletion.py
index 70b648e..68afd84 100644
--- a/mcp_bridge/openai_clients/streamChatCompletion.py
+++ b/mcp_bridge/api_endpoints/openai/streamChatCompletion.py
@@ -17,7 +17,8 @@
 from loguru import logger
 from httpx_sse import aconnect_sse
 
-from sse_starlette.sse import EventSourceResponse, ServerSentEvent
+from sse_starlette.sse import EventSourceResponse
+from sse_starlette.event import ServerSentEvent
 
 
 async def streaming_chat_completions(request: CreateChatCompletionRequest):
diff --git a/mcp_bridge/openai_clients/streamCompletion.py b/mcp_bridge/api_endpoints/openai/streamCompletion.py
similarity index 100%
rename from mcp_bridge/openai_clients/streamCompletion.py
rename to mcp_bridge/api_endpoints/openai/streamCompletion.py
diff --git a/mcp_bridge/openai_clients/utils.py b/mcp_bridge/api_endpoints/openai/utils.py
similarity index 100%
rename from mcp_bridge/openai_clients/utils.py
rename to mcp_bridge/api_endpoints/openai/utils.py
diff --git a/mcp_bridge/main.py b/mcp_bridge/main.py
index ec277ae..03a7e0b 100644
--- a/mcp_bridge/main.py
+++ b/mcp_bridge/main.py
@@ -1,5 +1,5 @@
 from fastapi import FastAPI
-from endpoints import router as endpointRouter
+from api_endpoints.openai import router as endpointRouter
 from mcpManagement import router as mcpRouter
 from health import router as healthRouter
 from mcp_server import router as mcp_server_router
diff --git a/mcp_bridge/openai_clients/__init__.py b/mcp_bridge/openai_clients/__init__.py
deleted file mode 100644
index b47def7..0000000
--- a/mcp_bridge/openai_clients/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .genericHttpxClient import client
-from .completion import completions
-from .chatCompletion import chat_completions
-from .streamChatCompletion import streaming_chat_completions
-
-__all__ = ["client", "completions", "chat_completions", "streaming_chat_completions"]