diff --git a/client/src/components/CallButtons.tsx b/client/src/components/CallButtons.tsx
index 0ee463e..16daab1 100644
--- a/client/src/components/CallButtons.tsx
+++ b/client/src/components/CallButtons.tsx
@@ -21,8 +21,8 @@
 import { ChangeEvent, useMemo } from 'react';
 
 import { useCallManagerContext } from '../contexts/CallManagerProvider';
-import { CallStatus, VideoStatus } from '../contexts/CallProvider';
 import { useUserMediaContext } from '../contexts/UserMediaProvider';
+import { CallStatus, VideoStatus } from '../services/CallManager';
 import {
   ColoredRoundButton,
   ExpandableButton,
diff --git a/client/src/components/ConversationSummaryList.tsx b/client/src/components/ConversationSummaryList.tsx
index c50a5f9..5db337b 100644
--- a/client/src/components/ConversationSummaryList.tsx
+++ b/client/src/components/ConversationSummaryList.tsx
@@ -25,10 +25,10 @@
 
 import { useAuthContext } from '../contexts/AuthProvider';
 import { useCallManagerContext } from '../contexts/CallManagerProvider';
-import { CallStatus } from '../contexts/CallProvider';
 import { useConversationDisplayNameShort } from '../hooks/useConversationDisplayName';
 import { useUrlParams } from '../hooks/useUrlParams';
 import { ConversationRouteParams } from '../router';
+import { CallStatus } from '../services/CallManager';
 import { useRemoveConversationMutation } from '../services/conversationQueries';
 import { getMessageCallText, getMessageMemberText } from '../utils/chatmessages';
 import { formatRelativeDate, formatTime } from '../utils/dates&times';
diff --git a/client/src/contexts/CallManagerProvider.tsx b/client/src/contexts/CallManagerProvider.tsx
index 8f44a1b..5ec7720 100644
--- a/client/src/contexts/CallManagerProvider.tsx
+++ b/client/src/contexts/CallManagerProvider.tsx
@@ -19,8 +19,8 @@
 import { createOptionalContext } from '../hooks/createOptionalContext';
 import { useUrlParams } from '../hooks/useUrlParams';
 import { ConversationRouteParams } from '../router';
+import { ICallManager, useCallManager } from '../services/CallManager';
 import { WithChildren } from '../utils/utils';
-import { ICallManager, useCallManager } from './CallProvider';
 
 const optionalCallManagerContext = createOptionalContext<ICallManager>('CallManagerContext');
 export const useCallManagerContext = optionalCallManagerContext.useOptionalContext;
diff --git a/client/src/pages/CallInterface.tsx b/client/src/pages/CallInterface.tsx
index 2892bb7..289fcab 100644
--- a/client/src/pages/CallInterface.tsx
+++ b/client/src/pages/CallInterface.tsx
@@ -49,9 +49,9 @@
 import VideoOverlay from '../components/VideoOverlay';
 import VideoStream from '../components/VideoStream';
 import { useCallManagerContext } from '../contexts/CallManagerProvider';
-import { CallStatus, VideoStatus } from '../contexts/CallProvider';
 import { useConversationContext } from '../contexts/ConversationProvider';
 import { useUserMediaContext } from '../contexts/UserMediaProvider';
+import { CallStatus, VideoStatus } from '../services/CallManager';
 import { formatCallDuration } from '../utils/dates&times';
 import { VideoElementWithSinkId } from '../utils/utils';
 import { CallPending } from './CallPending';
diff --git a/client/src/pages/CallPending.tsx b/client/src/pages/CallPending.tsx
index 0ff1b9e..ada8c34 100644
--- a/client/src/pages/CallPending.tsx
+++ b/client/src/pages/CallPending.tsx
@@ -29,9 +29,9 @@
 } from '../components/CallButtons';
 import ConversationAvatar from '../components/ConversationAvatar';
 import { useCallManagerContext } from '../contexts/CallManagerProvider';
-import { CallStatus } from '../contexts/CallProvider';
 import { useConversationContext } from '../contexts/ConversationProvider';
 import { useUserMediaContext } from '../contexts/UserMediaProvider';
+import { CallStatus } from '../services/CallManager';
 import { VideoElementWithSinkId } from '../utils/utils';
 
 export const CallPending = () => {
diff --git a/client/src/contexts/CallProvider.tsx b/client/src/services/CallManager.tsx
similarity index 97%
rename from client/src/contexts/CallProvider.tsx
rename to client/src/services/CallManager.tsx
index 61379a9..b0837b0 100644
--- a/client/src/contexts/CallProvider.tsx
+++ b/client/src/services/CallManager.tsx
@@ -19,15 +19,15 @@
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import { AlertSnackbarContext } from '../contexts/AlertSnackbarProvider';
+import { useAuthContext } from '../contexts/AuthProvider';
+import { useUserMediaContext } from '../contexts/UserMediaProvider';
+import { useWebSocketContext } from '../contexts/WebSocketProvider';
 import { ConversationMember } from '../models/conversation-member';
 import { useConversationInfosQuery, useMembersQuery } from '../services/conversationQueries';
 import { callTimeoutMs } from '../utils/constants';
 import { AsyncSetState, SetState } from '../utils/utils';
 import { useWebRtcManager } from '../webrtc/WebRtcManager';
-import { AlertSnackbarContext } from './AlertSnackbarProvider';
-import { useAuthContext } from './AuthProvider';
-import { useUserMediaContext } from './UserMediaProvider';
-import { useWebSocketContext } from './WebSocketProvider';
 
 export type CallRole = 'caller' | 'receiver' | undefined;
 
diff --git a/client/src/webrtc/RtcPeerConnectionHandler.ts b/client/src/webrtc/RtcPeerConnectionHandler.ts
index ddf2f6f..d8d9d3c 100644
--- a/client/src/webrtc/RtcPeerConnectionHandler.ts
+++ b/client/src/webrtc/RtcPeerConnectionHandler.ts
@@ -18,9 +18,9 @@
 
 import { WebRtcIceCandidate, WebRtcSdp, WebSocketMessageTable, WebSocketMessageType } from 'jami-web-common';
 
-import { CallData } from '../contexts/CallProvider';
 import { IWebSocketContext } from '../contexts/WebSocketProvider';
 import { Account } from '../models/account';
+import { CallData } from '../services/CallManager';
 import { Listener } from '../utils/utils';
 
 export type RTCPeerConnectionInfos = {
diff --git a/client/src/webrtc/WebRtcManager.ts b/client/src/webrtc/WebRtcManager.ts
index 67a614b..7e991f8 100644
--- a/client/src/webrtc/WebRtcManager.ts
+++ b/client/src/webrtc/WebRtcManager.ts
@@ -17,9 +17,9 @@
  */
 import { useMemo, useRef, useSyncExternalStore } from 'react';
 
-import { CallData } from '../contexts/CallProvider';
 import { IWebSocketContext } from '../contexts/WebSocketProvider';
 import { Account } from '../models/account';
+import { CallData } from '../services/CallManager';
 import { Listener } from '../utils/utils';
 import { RTCPeerConnectionHandler, RTCPeerConnectionInfos } from './RtcPeerConnectionHandler';