diff --git a/rescript.json b/rescript.json
index 61666a78..ce2f933b 100644
--- a/rescript.json
+++ b/rescript.json
@@ -2,7 +2,7 @@
   "name": "@rescript/webapi",
   "namespace": "WebAPI",
   "features": {
-    "WebAPI.DOM": ["DOM", "Event"],
+    "WebAPI.DOM": ["DOM"],
     "WebAPI.Event": ["WebAPI.DOM", "Event"],
     "WebAPI.DOMPlatform": ["WebAPI.Event", "DOMPlatform"],
     "WebAPI.Animation": ["WebAPI.Event", "Animation"],
@@ -16,6 +16,16 @@
       "DOMNodes"
     ],
     "WebAPI.HTML": ["WebAPI.DOMNodes", "WebAPI.File", "HTML"],
+    "WebAPI.Window": [
+      "WebAPI.HTML",
+      "WebAPI.Media",
+      "WebAPI.Storage",
+      "WebAPI.Messaging",
+      "WebAPI.Crypto",
+      "WebAPI.Performance",
+      "WebAPI.ViewTransitions",
+      "Window"
+    ],
     "WebAPI.Media": ["WebAPI.HTML", "Media"],
     "WebAPI.WebAudio": ["WebAPI.Media", "WebAPI.Messaging", "WebAudio"],
     "WebAPI.SVG": ["WebAPI.DOMNodes", "WebAPI.Geometry", "SVG"],
@@ -281,14 +291,16 @@
       ]
     },
     {
-      "dir": "src/DOM",
+      "dir": "src/window",
       "subdirs": true,
-      "feature": "WebAPI.DOM",
+      "feature": "Window",
       "public": [
         "CustomElementRegistry",
         "Document",
+        "History",
         "IdleDeadline",
         "Location",
+        "VisualViewport",
         "Window",
         "XPathExpression",
         "XPathResult"
@@ -357,14 +369,6 @@
         "WebMIDI"
       ]
     },
-    {
-      "dir": "src/History",
-      "subdirs": true,
-      "feature": "WebAPI.History",
-      "public": [
-        "History"
-      ]
-    },
     {
       "dir": "src/storage",
       "subdirs": true,
@@ -491,14 +495,6 @@
         "ViewTransition"
       ]
     },
-    {
-      "dir": "src/VisualViewport",
-      "subdirs": true,
-      "feature": "WebAPI.VisualViewport",
-      "public": [
-        "VisualViewport"
-      ]
-    },
     {
       "dir": "src/web-audio",
       "subdirs": true,
diff --git a/src/DOM/CustomElementRegistry.res b/src/window/CustomElementRegistry.res
similarity index 100%
rename from src/DOM/CustomElementRegistry.res
rename to src/window/CustomElementRegistry.res
diff --git a/src/DOM/Document.res b/src/window/Document.res
similarity index 100%
rename from src/DOM/Document.res
rename to src/window/Document.res
diff --git a/src/DOM/DomGlobal.res b/src/window/DomGlobal.res
similarity index 100%
rename from src/DOM/DomGlobal.res
rename to src/window/DomGlobal.res
diff --git a/src/History/History.res b/src/window/History.res
similarity index 100%
rename from src/History/History.res
rename to src/window/History.res
diff --git a/src/History/HistoryTypes.res b/src/window/HistoryTypes.res
similarity index 100%
rename from src/History/HistoryTypes.res
rename to src/window/HistoryTypes.res
diff --git a/src/DOM/IdleDeadline.res b/src/window/IdleDeadline.res
similarity index 100%
rename from src/DOM/IdleDeadline.res
rename to src/window/IdleDeadline.res
diff --git a/src/DOM/Location.res b/src/window/Location.res
similarity index 100%
rename from src/DOM/Location.res
rename to src/window/Location.res
diff --git a/src/VisualViewport/VisualViewport.res b/src/window/VisualViewport.res
similarity index 100%
rename from src/VisualViewport/VisualViewport.res
rename to src/window/VisualViewport.res
diff --git a/src/VisualViewport/VisualViewportTypes.res b/src/window/VisualViewportTypes.res
similarity index 100%
rename from src/VisualViewport/VisualViewportTypes.res
rename to src/window/VisualViewportTypes.res
diff --git a/src/DOM/Window.res b/src/window/Window.res
similarity index 100%
rename from src/DOM/Window.res
rename to src/window/Window.res
diff --git a/src/DOM/XPathExpression.res b/src/window/XPathExpression.res
similarity index 100%
rename from src/DOM/XPathExpression.res
rename to src/window/XPathExpression.res
diff --git a/src/DOM/XPathResult.res b/src/window/XPathResult.res
similarity index 100%
rename from src/DOM/XPathResult.res
rename to src/window/XPathResult.res