diff --git a/packages/rum-core/src/domain/parentContexts.spec.ts b/packages/rum-core/src/domain/parentContexts.spec.ts
index a7168b313d..0e145d7644 100644
--- a/packages/rum-core/src/domain/parentContexts.spec.ts
+++ b/packages/rum-core/src/domain/parentContexts.spec.ts
@@ -1,6 +1,7 @@
 import { RelativeTime, relativeToClocks } from '@datadog/browser-core'
 import { createRumSessionMock, RumSessionMock } from '../../test/mockRumSession'
 import { setup, TestSetupBuilder } from '../../test/specHelper'
+import { CLEAR_OLD_CONTEXTS_INTERVAL } from '../tools/contextHistory'
 import { LifeCycleEventType } from './lifeCycle'
 import {
   ACTION_CONTEXT_TIME_OUT_DELAY,
@@ -10,7 +11,6 @@ import {
 } from './parentContexts'
 import { AutoAction } from './rumEventsCollection/action/trackActions'
 import { ViewCreatedEvent } from './rumEventsCollection/view/trackViews'
-import { CLEAR_OLD_CONTEXTS_INTERVAL } from './contextHistory'
 
 describe('parentContexts', () => {
   const FAKE_ID = 'fake'
diff --git a/packages/rum-core/src/domain/parentContexts.ts b/packages/rum-core/src/domain/parentContexts.ts
index 49d9056207..390c129e07 100644
--- a/packages/rum-core/src/domain/parentContexts.ts
+++ b/packages/rum-core/src/domain/parentContexts.ts
@@ -1,10 +1,10 @@
 import { ONE_MINUTE, RelativeTime, SESSION_TIME_OUT_DELAY } from '@datadog/browser-core'
 import { ActionContext, ViewContext } from '../rawRumEvent.types'
+import { ContextHistory } from '../tools/contextHistory'
 import { LifeCycle, LifeCycleEventType } from './lifeCycle'
 import { AutoAction, AutoActionCreatedEvent } from './rumEventsCollection/action/trackActions'
 import { ViewCreatedEvent } from './rumEventsCollection/view/trackViews'
 import { RumSession } from './rumSession'
-import { ContextHistory } from './contextHistory'
 
 export const VIEW_CONTEXT_TIME_OUT_DELAY = SESSION_TIME_OUT_DELAY
 export const ACTION_CONTEXT_TIME_OUT_DELAY = 5 * ONE_MINUTE // arbitrary
diff --git a/packages/rum-core/src/domain/urlContexts.ts b/packages/rum-core/src/domain/urlContexts.ts
index 2121ab9ef2..f039cffc0a 100644
--- a/packages/rum-core/src/domain/urlContexts.ts
+++ b/packages/rum-core/src/domain/urlContexts.ts
@@ -1,7 +1,7 @@
 import { RelativeTime, Observable, SESSION_TIME_OUT_DELAY, relativeNow } from '@datadog/browser-core'
 import { UrlContext } from '../rawRumEvent.types'
 import { LocationChange } from '../browser/locationChangeObservable'
-import { ContextHistory } from './contextHistory'
+import { ContextHistory } from '../tools/contextHistory'
 import { LifeCycle, LifeCycleEventType } from './lifeCycle'
 
 /**
diff --git a/packages/rum-core/src/domain/contextHistory.spec.ts b/packages/rum-core/src/tools/contextHistory.spec.ts
similarity index 100%
rename from packages/rum-core/src/domain/contextHistory.spec.ts
rename to packages/rum-core/src/tools/contextHistory.spec.ts
diff --git a/packages/rum-core/src/domain/contextHistory.ts b/packages/rum-core/src/tools/contextHistory.ts
similarity index 100%
rename from packages/rum-core/src/domain/contextHistory.ts
rename to packages/rum-core/src/tools/contextHistory.ts