diff --git a/rescript.json b/rescript.json
index e5a6ebd7..c55ec8a1 100644
--- a/rescript.json
+++ b/rescript.json
@@ -10,6 +10,7 @@
     "WebAPI.Fetch": ["WebAPI.Event", "WebAPI.File", "WebAPI.URL", "Fetch"],
     "WebAPI.CSSFontLoading": ["WebAPI.Event", "CSSFontLoading"],
     "WebAPI.Device": ["WebAPI.Event", "Device"],
+    "WebAPI.Messaging": ["WebAPI.Event", "WebAPI.File", "Messaging"],
     "WebAPI.Crypto": ["WebAPI.DOM", "Crypto"],
     "WebAPI.Performance": ["WebAPI.Event", "Performance"],
     "WebAPI.ViewTransitions": ["WebAPI.Event", "ViewTransitions"]
@@ -62,11 +63,20 @@
       ]
     },
     {
-      "dir": "src/ChannelMessaging",
+      "dir": "src/messaging",
       "subdirs": true,
-      "feature": "WebAPI.ChannelMessaging",
+      "feature": "Messaging",
       "public": [
-        "MessagePort"
+        "ApplicationServerKey",
+        "CloseEvent",
+        "MessageEvent",
+        "MessagePort",
+        "Notification",
+        "PushEvent",
+        "PushManager",
+        "PushMessageData",
+        "PushSubscription",
+        "WebSocket"
       ]
     },
     {
@@ -351,14 +361,6 @@
         "MutationObserver"
       ]
     },
-    {
-      "dir": "src/Notification",
-      "subdirs": true,
-      "feature": "WebAPI.Notification",
-      "public": [
-        "Notification"
-      ]
-    },
     {
       "dir": "src/performance",
       "subdirs": true,
@@ -385,18 +387,6 @@
         "PictureInPicture"
       ]
     },
-    {
-      "dir": "src/Push",
-      "subdirs": true,
-      "feature": "WebAPI.Push",
-      "public": [
-        "ApplicationServerKey",
-        "PushEvent",
-        "PushManager",
-        "PushMessageData",
-        "PushSubscription"
-      ]
-    },
     {
       "dir": "src/RemotePlayback",
       "subdirs": true,
@@ -528,16 +518,6 @@
         "SubtleCrypto"
       ]
     },
-    {
-      "dir": "src/WebSockets",
-      "subdirs": true,
-      "feature": "WebAPI.WebSockets",
-      "public": [
-        "CloseEvent",
-        "MessageEvent",
-        "WebSocket"
-      ]
-    },
     {
       "dir": "src/WebSpeech",
       "subdirs": true,
diff --git a/src/Push/ApplicationServerKey.res b/src/messaging/ApplicationServerKey.res
similarity index 100%
rename from src/Push/ApplicationServerKey.res
rename to src/messaging/ApplicationServerKey.res
diff --git a/src/ChannelMessaging/ChannelMessagingTypes.res b/src/messaging/ChannelMessagingTypes.res
similarity index 100%
rename from src/ChannelMessaging/ChannelMessagingTypes.res
rename to src/messaging/ChannelMessagingTypes.res
diff --git a/src/WebSockets/CloseEvent.res b/src/messaging/CloseEvent.res
similarity index 100%
rename from src/WebSockets/CloseEvent.res
rename to src/messaging/CloseEvent.res
diff --git a/src/WebSockets/MessageEvent.res b/src/messaging/MessageEvent.res
similarity index 100%
rename from src/WebSockets/MessageEvent.res
rename to src/messaging/MessageEvent.res
diff --git a/src/ChannelMessaging/MessagePort.res b/src/messaging/MessagePort.res
similarity index 100%
rename from src/ChannelMessaging/MessagePort.res
rename to src/messaging/MessagePort.res
diff --git a/src/Notification/Notification.res b/src/messaging/Notification.res
similarity index 100%
rename from src/Notification/Notification.res
rename to src/messaging/Notification.res
diff --git a/src/Notification/NotificationTypes.res b/src/messaging/NotificationTypes.res
similarity index 100%
rename from src/Notification/NotificationTypes.res
rename to src/messaging/NotificationTypes.res
diff --git a/src/Push/PushEvent.res b/src/messaging/PushEvent.res
similarity index 100%
rename from src/Push/PushEvent.res
rename to src/messaging/PushEvent.res
diff --git a/src/Push/PushManager.res b/src/messaging/PushManager.res
similarity index 100%
rename from src/Push/PushManager.res
rename to src/messaging/PushManager.res
diff --git a/src/Push/PushMessageData.res b/src/messaging/PushMessageData.res
similarity index 100%
rename from src/Push/PushMessageData.res
rename to src/messaging/PushMessageData.res
diff --git a/src/Push/PushSubscription.res b/src/messaging/PushSubscription.res
similarity index 100%
rename from src/Push/PushSubscription.res
rename to src/messaging/PushSubscription.res
diff --git a/src/Push/PushTypes.res b/src/messaging/PushTypes.res
similarity index 100%
rename from src/Push/PushTypes.res
rename to src/messaging/PushTypes.res
diff --git a/src/WebSockets/WebSocket.res b/src/messaging/WebSocket.res
similarity index 100%
rename from src/WebSockets/WebSocket.res
rename to src/messaging/WebSocket.res
diff --git a/src/WebSockets/WebSocketsTypes.res b/src/messaging/WebSocketsTypes.res
similarity index 100%
rename from src/WebSockets/WebSocketsTypes.res
rename to src/messaging/WebSocketsTypes.res