diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index b0cdfd5047..eb09ffd6dd 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -5793,6 +5793,8 @@
 		3712091F2C232E2B003ADF3D /* RemoteMessaging */ = {
 			isa = PBXGroup;
 			children = (
+				BB3229042D08643700DA92E9 /* TabBarRemoteMessageView.swift */,
+				BB9BA2282D10C0A3009229F3 /* TabBarActiveRemoteMessage.swift */,
 				371209202C232E3F003ADF3D /* RemoteMessagingClient.swift */,
 				3768D8432C2CC884004120AE /* RemoteMessagingConfigMatcherProvider.swift */,
 				3768D83F2C29C1F1004120AE /* ActiveRemoteMessageModel.swift */,
@@ -8327,7 +8329,6 @@
 		AA86491124D8318F001BABEE /* TabBar */ = {
 			isa = PBXGroup;
 			children = (
-				BB68B6542D0B1E9200CEC812 /* TabBarRemoteMessaging */,
 				AA86491224D831A1001BABEE /* View */,
 				AA8EDF1F2491FCC10071C2E8 /* ViewModel */,
 				AA9FF95724A1ECE20039E328 /* Model */,
@@ -8475,6 +8476,7 @@
 		AA8EDF1F2491FCC10071C2E8 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
+				BB9BDD482D09BA9D0069E9EF /* TabBarRemoteMessageViewModel.swift */,
 				37D23779287EB8CA00BCE03B /* TabIndex.swift */,
 				AA9FF95E24A1FB680039E328 /* TabCollectionViewModel.swift */,
 			);
@@ -8576,7 +8578,6 @@
 		AA9FF95724A1ECE20039E328 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				BB9BA2282D10C0A3009229F3 /* TabBarActiveRemoteMessage.swift */,
 				BB9BA2252D10C089009229F3 /* TabBarRemoteMessage.swift */,
 				AA9FF95C24A1FA1C0039E328 /* TabCollection.swift */,
 			);
@@ -9532,15 +9533,6 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		BB68B6542D0B1E9200CEC812 /* TabBarRemoteMessaging */ = {
-			isa = PBXGroup;
-			children = (
-				BB3229042D08643700DA92E9 /* TabBarRemoteMessageView.swift */,
-				BB9BDD482D09BA9D0069E9EF /* TabBarRemoteMessageViewModel.swift */,
-			);
-			path = TabBarRemoteMessaging;
-			sourceTree = "<group>";
-		};
 		BD7090D42C540C0D009EED82 /* MetadataCollectors */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/DuckDuckGo/TabBar/Model/TabBarActiveRemoteMessage.swift b/DuckDuckGo/RemoteMessaging/TabBarActiveRemoteMessage.swift
similarity index 100%
rename from DuckDuckGo/TabBar/Model/TabBarActiveRemoteMessage.swift
rename to DuckDuckGo/RemoteMessaging/TabBarActiveRemoteMessage.swift
diff --git a/DuckDuckGo/TabBar/TabBarRemoteMessaging/TabBarRemoteMessageView.swift b/DuckDuckGo/RemoteMessaging/TabBarRemoteMessageView.swift
similarity index 100%
rename from DuckDuckGo/TabBar/TabBarRemoteMessaging/TabBarRemoteMessageView.swift
rename to DuckDuckGo/RemoteMessaging/TabBarRemoteMessageView.swift
diff --git a/DuckDuckGo/TabBar/TabBarRemoteMessaging/TabBarRemoteMessageViewModel.swift b/DuckDuckGo/TabBar/ViewModel/TabBarRemoteMessageViewModel.swift
similarity index 100%
rename from DuckDuckGo/TabBar/TabBarRemoteMessaging/TabBarRemoteMessageViewModel.swift
rename to DuckDuckGo/TabBar/ViewModel/TabBarRemoteMessageViewModel.swift