diff --git a/api.py b/api.py
index ada1d17..4a1fa05 100644
--- a/api.py
+++ b/api.py
@@ -17,7 +17,7 @@ import os
 from pathlib import Path as FilePath
 from data.data import TAGS_METADATA, templates_signature_email
 from routes.auth import router as auth_router
-from config import settings
+from config.config import settings
 from database import (
     init_db,
     async_session_factory,
@@ -28,8 +28,8 @@ from database import (
     SignatureLog,
     StatutSignature as StatutSignatureEnum,
 )
-from email_queue import email_queue
-from sage_client import sage_client, SageGatewayClient
+from services.email_queue import email_queue
+from sage.sage_client import sage_client, SageGatewayClient
 
 from schemas import (
     TiersDetails,
diff --git a/config.py b/config/config.py
similarity index 100%
rename from config.py
rename to config/config.py
diff --git a/core/sage_context.py b/core/sage_context.py
index 42089a2..b84b3bf 100644
--- a/core/sage_context.py
+++ b/core/sage_context.py
@@ -5,8 +5,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from database import get_session, User
 from core.dependencies import get_current_user
-from sage_client import SageGatewayClient
-from config import settings
+from sage.sage_client import SageGatewayClient
+from config.config import settings
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/init_db.py b/database/init_db.py
similarity index 100%
rename from init_db.py
rename to database/init_db.py
diff --git a/routes/auth.py b/routes/auth.py
index d037d29..9b7d377 100644
--- a/routes/auth.py
+++ b/routes/auth.py
@@ -20,7 +20,7 @@ from security.auth import (
 )
 from services.email_service import AuthEmailService
 from core.dependencies import get_current_user
-from config import settings
+from config.config import settings
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/routes/sage_gateway.py b/routes/sage_gateway.py
index 2a83016..ba54f7f 100644
--- a/routes/sage_gateway.py
+++ b/routes/sage_gateway.py
@@ -18,7 +18,7 @@ from schemas import (
     SageGatewayStatsResponse,
     CurrentGatewayInfo,
 )
-from config import settings
+from config.config import settings
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/sage-gateways", tags=["Sage Gateways"])
diff --git a/sage_client.py b/sage/sage_client.py
similarity index 99%
rename from sage_client.py
rename to sage/sage_client.py
index 85c7b4a..b0fb6e9 100644
--- a/sage_client.py
+++ b/sage/sage_client.py
@@ -1,7 +1,7 @@
 # sage_client.py
 import requests
 from typing import Dict, List, Optional
-from config import settings
+from config.config import settings
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/schemas/documents/documents.py b/schemas/documents/documents.py
index 95a933d..509d2ad 100644
--- a/schemas/documents/documents.py
+++ b/schemas/documents/documents.py
@@ -1,4 +1,4 @@
-from config import settings
+from config.config import settings
 from enum import Enum
 
 
diff --git a/email_queue.py b/services/email_queue.py
similarity index 99%
rename from email_queue.py
rename to services/email_queue.py
index ee25aa5..71d8269 100644
--- a/email_queue.py
+++ b/services/email_queue.py
@@ -9,7 +9,7 @@ import socket
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
-from config import settings
+from config.config import settings
 import logging
 from reportlab.lib.pagesizes import A4
 from reportlab.pdfgen import canvas
diff --git a/services/email_service.py b/services/email_service.py
index 7550e1f..2a6e9e3 100644
--- a/services/email_service.py
+++ b/services/email_service.py
@@ -1,7 +1,7 @@
 import smtplib
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from config import settings
+from config.config import settings
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/services/sage_gateway.py b/services/sage_gateway.py
index 6b085bb..48276a4 100644
--- a/services/sage_gateway.py
+++ b/services/sage_gateway.py
@@ -9,7 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, update, and_
 import logging
 
-from config import settings
+from config.config import settings
 from database import SageGatewayConfig
 
 logger = logging.getLogger(__name__)
diff --git a/create_admin.py b/utils/create_admin.py
similarity index 100%
rename from create_admin.py
rename to utils/create_admin.py
diff --git a/utils/generic_functions.py b/utils/generic_functions.py
index f7a8e2d..70bb9a4 100644
--- a/utils/generic_functions.py
+++ b/utils/generic_functions.py
@@ -1,5 +1,5 @@
 from typing import Dict
-from config import settings
+from config.config import settings
 import logging
 
 from datetime import datetime
@@ -7,7 +7,7 @@ import uuid
 import requests
 
 from sqlalchemy.ext.asyncio import AsyncSession
-
+from services.email_queue import email_queue
 from data.data import templates_signature_email
 from database import EmailLog, StatutEmail as StatutEmailEnum
 
@@ -22,8 +22,6 @@ async def universign_envoyer(
     doc_data: Dict,
     session: AsyncSession,
 ) -> Dict:
-    from email_queue import email_queue
-
     try:
         api_key = settings.universign_api_key
         api_url = settings.universign_api_url