diff --git a/client_manager.py b/relay/client_manager.py
similarity index 99%
rename from client_manager.py
rename to relay/client_manager.py
index 913d674..4c8eade 100644
--- a/client_manager.py
+++ b/relay/client_manager.py
@@ -7,7 +7,7 @@ from loguru import logger
 
 from lnbits.helpers import urlsafe_short_hash
 
-from .crud import (
+from ..crud import (
     create_event,
     delete_events,
     get_account,
@@ -18,8 +18,8 @@ from .crud import (
     mark_events_deleted,
     prune_old_events,
 )
-from .helpers import extract_domain
-from .models import NostrAccount, NostrEvent, NostrEventType, NostrFilter, RelaySpec
+from ..helpers import extract_domain
+from ..models import NostrAccount, NostrEvent, NostrEventType, NostrFilter, RelaySpec
 
 
 class NostrClientManager:
diff --git a/tests/test_clients.py b/tests/test_clients.py
index eff5902..e4f0f29 100644
--- a/tests/test_clients.py
+++ b/tests/test_clients.py
@@ -6,7 +6,7 @@ import pytest
 from fastapi import WebSocket
 from loguru import logger
 
-from lnbits.extensions.nostrrelay.client_manager import (  # type: ignore
+from lnbits.extensions.nostrrelay.relay.client_manager import (  # type: ignore
     NostrClientConnection,
     NostrClientManager,
 )
diff --git a/views_api.py b/views_api.py
index 1d1c843..a3321f2 100644
--- a/views_api.py
+++ b/views_api.py
@@ -16,7 +16,7 @@ from lnbits.decorators import (
 from lnbits.helpers import urlsafe_short_hash
 
 from . import nostrrelay_ext
-from .client_manager import NostrClientConnection, NostrClientManager
+from .relay.client_manager import NostrClientConnection, NostrClientManager
 from .crud import (
     create_account,
     create_relay,