diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index e9963fdb1d..5e2a7e1c6b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -74,9 +74,9 @@ import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.gecko.GeckoProvider
-import org.mozilla.fenix.home.recentvisits.DefaultHistoryMetadataService
-import org.mozilla.fenix.home.recentvisits.HistoryMetadataMiddleware
-import org.mozilla.fenix.home.recentvisits.HistoryMetadataService
+import org.mozilla.fenix.historymetadata.DefaultHistoryMetadataService
+import org.mozilla.fenix.historymetadata.HistoryMetadataMiddleware
+import org.mozilla.fenix.historymetadata.HistoryMetadataService
 import org.mozilla.fenix.media.MediaSessionService
 import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.perf.lazyMonitored
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt
rename to app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt
index 18425a14fb..39d0ccdfab 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.home.recentvisits
+package org.mozilla.fenix.historymetadata
 
 import mozilla.components.browser.state.action.BrowserAction
 import mozilla.components.browser.state.action.ContentAction
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt
rename to app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt
index ca375d11c0..5b708a2b07 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt
+++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.home.recentvisits
+package org.mozilla.fenix.historymetadata
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.asCoroutineDispatcher
diff --git a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt
index 6c0e9e5114..3ae5542970 100644
--- a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt
@@ -32,6 +32,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.historymetadata.HistoryMetadataMiddleware
+import org.mozilla.fenix.historymetadata.HistoryMetadataService
 
 @RunWith(FenixRobolectricTestRunner::class)
 class HistoryMetadataMiddlewareTest {
diff --git a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt
index 9664115e22..12168721d6 100644
--- a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt
@@ -19,6 +19,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.historymetadata.DefaultHistoryMetadataService
+import org.mozilla.fenix.historymetadata.HistoryMetadataService
 
 class HistoryMetadataServiceTest {