diff --git a/nextcloud_mcp_server/client.py b/nextcloud_mcp_server/client/__init__.py
similarity index 93%
rename from nextcloud_mcp_server/client.py
rename to nextcloud_mcp_server/client/__init__.py
index 907ade7..22db2e5 100644
--- a/nextcloud_mcp_server/client.py
+++ b/nextcloud_mcp_server/client/__init__.py
@@ -8,10 +8,10 @@ from httpx import (
 )
 import logging
 
-from .notes_client import NotesClient
-from .webdav_client import WebDAVClient
-from .tables_client import TablesClient
-from .controllers.notes_search import NotesSearchController
+from .notes import NotesClient
+from .webdav import WebDAVClient
+from .tables import TablesClient
+from ..controllers.notes_search import NotesSearchController
 
 logger = logging.getLogger(__name__)
 
diff --git a/nextcloud_mcp_server/base_client.py b/nextcloud_mcp_server/client/base.py
similarity index 100%
rename from nextcloud_mcp_server/base_client.py
rename to nextcloud_mcp_server/client/base.py
diff --git a/nextcloud_mcp_server/notes_client.py b/nextcloud_mcp_server/client/notes.py
similarity index 97%
rename from nextcloud_mcp_server/notes_client.py
rename to nextcloud_mcp_server/client/notes.py
index 4dee62c..b8f951a 100644
--- a/nextcloud_mcp_server/notes_client.py
+++ b/nextcloud_mcp_server/client/notes.py
@@ -3,7 +3,7 @@
 from typing import Dict, List, Any, Optional
 import logging
 
-from .base_client import BaseNextcloudClient
+from .base import BaseNextcloudClient
 
 logger = logging.getLogger(__name__)
 
@@ -106,7 +106,7 @@ class NotesClient(BaseNextcloudClient):
             )
             try:
                 # Import here to avoid circular imports
-                from .webdav_client import WebDAVClient
+                from .webdav import WebDAVClient
 
                 webdav_client = WebDAVClient(self._client, self.username)
                 await webdav_client.cleanup_old_attachment_directory(
@@ -152,7 +152,7 @@ class NotesClient(BaseNextcloudClient):
 
         # Clean up attachment directories
         try:
-            from .webdav_client import WebDAVClient
+            from .webdav import WebDAVClient
 
             webdav_client = WebDAVClient(self._client, self.username)
 
diff --git a/nextcloud_mcp_server/tables_client.py b/nextcloud_mcp_server/client/tables.py
similarity index 99%
rename from nextcloud_mcp_server/tables_client.py
rename to nextcloud_mcp_server/client/tables.py
index d8554cb..3ee0bc4 100644
--- a/nextcloud_mcp_server/tables_client.py
+++ b/nextcloud_mcp_server/client/tables.py
@@ -3,7 +3,7 @@
 from typing import Dict, List, Any, Optional
 import logging
 
-from .base_client import BaseNextcloudClient
+from .base import BaseNextcloudClient
 
 logger = logging.getLogger(__name__)
 
diff --git a/nextcloud_mcp_server/webdav_client.py b/nextcloud_mcp_server/client/webdav.py
similarity index 99%
rename from nextcloud_mcp_server/webdav_client.py
rename to nextcloud_mcp_server/client/webdav.py
index 5dac2d3..f5649ee 100644
--- a/nextcloud_mcp_server/webdav_client.py
+++ b/nextcloud_mcp_server/client/webdav.py
@@ -5,7 +5,7 @@ from typing import Tuple, Dict, Any, Optional
 import logging
 from httpx import HTTPStatusError
 
-from .base_client import BaseNextcloudClient
+from .base import BaseNextcloudClient
 
 logger = logging.getLogger(__name__)