From 3f703170a153237c364a72ae72da003fa52a2a17 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Wed, 21 Feb 2024 08:22:32 +0100
Subject: [PATCH] refactor: move web stuff into their own folder

Refs: https://github.com/nodejs/undici/issues/2732
---
 benchmarks/cacheGetFieldValues.mjs            |  2 +-
 index-fetch.js                                | 16 +++++-----
 index.js                                      | 30 +++++++++----------
 lib/cache/symbols.js                          |  5 ----
 lib/client.js                                 |  2 +-
 lib/mock/mock-interceptor.js                  |  2 +-
 lib/{ => web}/cache/cache.js                  |  4 +--
 lib/{ => web}/cache/cachestorage.js           |  2 +-
 lib/web/cache/symbols.js                      |  5 ++++
 lib/{ => web}/cache/util.js                   |  0
 lib/{ => web}/cookies/constants.js            |  0
 lib/{ => web}/cookies/index.js                |  0
 lib/{ => web}/cookies/parse.js                |  0
 lib/{ => web}/cookies/util.js                 |  2 +-
 .../eventsource/eventsource-stream.js         |  0
 lib/{ => web}/eventsource/eventsource.js      |  2 +-
 lib/{ => web}/eventsource/util.js             |  0
 lib/{ => web}/fetch/LICENSE                   |  0
 lib/{ => web}/fetch/body.js                   |  4 +--
 lib/{ => web}/fetch/constants.js              |  0
 lib/{ => web}/fetch/dataURL.js                |  0
 .../fetch}/dispatcher-weakref.js              |  2 +-
 lib/{ => web}/fetch/file.js                   |  2 +-
 lib/{ => web}/fetch/formdata.js               |  2 +-
 lib/{ => web}/fetch/global.js                 |  0
 lib/{ => web}/fetch/headers.js                |  4 +--
 lib/{ => web}/fetch/index.js                  |  4 +--
 lib/{ => web}/fetch/request.js                |  6 ++--
 lib/{ => web}/fetch/response.js               |  4 +--
 lib/{ => web}/fetch/symbols.js                |  0
 lib/{ => web}/fetch/util.js                   |  2 +-
 lib/{ => web}/fetch/webidl.js                 |  2 +-
 lib/{ => web}/fileapi/encoding.js             |  0
 lib/{ => web}/fileapi/filereader.js           |  2 +-
 lib/{ => web}/fileapi/progressevent.js        |  0
 lib/{ => web}/fileapi/symbols.js              |  0
 lib/{ => web}/fileapi/util.js                 |  0
 lib/{ => web}/websocket/connection.js         |  6 ++--
 lib/{ => web}/websocket/constants.js          |  0
 lib/{ => web}/websocket/events.js             |  2 +-
 lib/{ => web}/websocket/frame.js              |  0
 lib/{ => web}/websocket/receiver.js           |  2 +-
 lib/{ => web}/websocket/symbols.js            |  0
 lib/{ => web}/websocket/util.js               |  0
 lib/{ => web}/websocket/websocket.js          |  4 +--
 test/cache/get-field-values.js                |  2 +-
 test/cookie/global-headers.js                 |  2 +-
 test/eventsource/eventsource-attributes.js    |  2 +-
 test/eventsource/eventsource-close.js         |  2 +-
 test/eventsource/eventsource-connect.js       |  2 +-
 .../eventsource-constructor-stringify.js      |  2 +-
 test/eventsource/eventsource-constructor.js   |  2 +-
 test/eventsource/eventsource-message.js       |  2 +-
 test/eventsource/eventsource-reconnect.js     |  2 +-
 test/eventsource/eventsource-redirecting.js   |  2 +-
 .../eventsource-request-status-error.js       |  2 +-
 test/eventsource/eventsource-stream-bom.js    |  2 +-
 .../eventsource-stream-parse-line.js          |  2 +-
 .../eventsource-stream-process-event.js       |  2 +-
 test/eventsource/eventsource-stream.js        |  2 +-
 test/eventsource/eventsource.js               |  2 +-
 test/eventsource/util.js                      |  2 +-
 test/fetch/data-uri.js                        |  2 +-
 test/fetch/file.js                            |  2 +-
 test/fetch/headers.js                         |  4 +--
 test/fetch/request.js                         |  4 +--
 test/fetch/response.js                        |  4 +--
 test/fetch/util.js                            |  4 +--
 test/jest/instanceof-error.test.js            |  2 +-
 test/node-fetch/main.js                       |  6 ++--
 test/node-fetch/response.js                   |  2 +-
 test/webidl/converters.js                     |  2 +-
 test/webidl/helpers.js                        |  2 +-
 test/webidl/util.js                           |  2 +-
 test/websocket/events.js                      |  2 +-
 test/websocket/frame.js                       |  4 +--
 test/wpt/runner/worker.mjs                    | 12 ++++----
 77 files changed, 104 insertions(+), 104 deletions(-)
 delete mode 100644 lib/cache/symbols.js
 rename lib/{ => web}/cache/cache.js (99%)
 rename lib/{ => web}/cache/cachestorage.js (98%)
 create mode 100644 lib/web/cache/symbols.js
 rename lib/{ => web}/cache/util.js (100%)
 rename lib/{ => web}/cookies/constants.js (100%)
 rename lib/{ => web}/cookies/index.js (100%)
 rename lib/{ => web}/cookies/parse.js (100%)
 rename lib/{ => web}/cookies/util.js (99%)
 rename lib/{ => web}/eventsource/eventsource-stream.js (100%)
 rename lib/{ => web}/eventsource/eventsource.js (99%)
 rename lib/{ => web}/eventsource/util.js (100%)
 rename lib/{ => web}/fetch/LICENSE (100%)
 rename lib/{ => web}/fetch/body.js (99%)
 rename lib/{ => web}/fetch/constants.js (100%)
 rename lib/{ => web}/fetch/dataURL.js (100%)
 rename lib/{compat => web/fetch}/dispatcher-weakref.js (93%)
 rename lib/{ => web}/fetch/file.js (99%)
 rename lib/{ => web}/fetch/formdata.js (99%)
 rename lib/{ => web}/fetch/global.js (100%)
 rename lib/{ => web}/fetch/headers.js (99%)
 rename lib/{ => web}/fetch/index.js (99%)
 rename lib/{ => web}/fetch/request.js (99%)
 rename lib/{ => web}/fetch/response.js (99%)
 rename lib/{ => web}/fetch/symbols.js (100%)
 rename lib/{ => web}/fetch/util.js (99%)
 rename lib/{ => web}/fetch/webidl.js (99%)
 rename lib/{ => web}/fileapi/encoding.js (100%)
 rename lib/{ => web}/fileapi/filereader.js (99%)
 rename lib/{ => web}/fileapi/progressevent.js (100%)
 rename lib/{ => web}/fileapi/symbols.js (100%)
 rename lib/{ => web}/fileapi/util.js (100%)
 rename lib/{ => web}/websocket/connection.js (98%)
 rename lib/{ => web}/websocket/constants.js (100%)
 rename lib/{ => web}/websocket/events.js (99%)
 rename lib/{ => web}/websocket/frame.js (100%)
 rename lib/{ => web}/websocket/receiver.js (99%)
 rename lib/{ => web}/websocket/symbols.js (100%)
 rename lib/{ => web}/websocket/util.js (100%)
 rename lib/{ => web}/websocket/websocket.js (99%)

diff --git a/benchmarks/cacheGetFieldValues.mjs b/benchmarks/cacheGetFieldValues.mjs
index 50fd3185184..9a685d24544 100644
--- a/benchmarks/cacheGetFieldValues.mjs
+++ b/benchmarks/cacheGetFieldValues.mjs
@@ -1,5 +1,5 @@
 import { bench, group, run } from 'mitata'
-import { getFieldValues } from '../lib/cache/util.js'
+import { getFieldValues } from '../lib/web/cache/util.js'
 
 const values = [
   '',
diff --git a/index-fetch.js b/index-fetch.js
index 851731865b5..b8b3f3c7cac 100644
--- a/index-fetch.js
+++ b/index-fetch.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 
 module.exports.fetch = function fetch (resource, init = undefined) {
   return fetchImpl(resource, init).catch((err) => {
@@ -10,12 +10,12 @@ module.exports.fetch = function fetch (resource, init = undefined) {
     throw err
   })
 }
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
 
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
-module.exports.MessageEvent = require('./lib/websocket/events').MessageEvent
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
+module.exports.MessageEvent = require('./lib/web/websocket/events').MessageEvent
 
-module.exports.EventSource = require('./lib/eventsource/eventsource').EventSource
+module.exports.EventSource = require('./lib/web/eventsource/eventsource').EventSource
diff --git a/index.js b/index.js
index 2e274b24029..f2a4057d803 100644
--- a/index.js
+++ b/index.js
@@ -94,7 +94,7 @@ function makeDispatcher (fn) {
 module.exports.setGlobalDispatcher = setGlobalDispatcher
 module.exports.getGlobalDispatcher = getGlobalDispatcher
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 module.exports.fetch = async function fetch (init, options = undefined) {
   try {
     return await fetchImpl(init, options)
@@ -106,39 +106,39 @@ module.exports.fetch = async function fetch (init, options = undefined) {
     throw err
   }
 }
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.File = require('./lib/fetch/file').File
-module.exports.FileReader = require('./lib/fileapi/filereader').FileReader
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.File = require('./lib/web/fetch/file').File
+module.exports.FileReader = require('./lib/web/fileapi/filereader').FileReader
 
-const { setGlobalOrigin, getGlobalOrigin } = require('./lib/fetch/global')
+const { setGlobalOrigin, getGlobalOrigin } = require('./lib/web/fetch/global')
 
 module.exports.setGlobalOrigin = setGlobalOrigin
 module.exports.getGlobalOrigin = getGlobalOrigin
 
-const { CacheStorage } = require('./lib/cache/cachestorage')
-const { kConstruct } = require('./lib/cache/symbols')
+const { CacheStorage } = require('./lib/web/cache/cachestorage')
+const { kConstruct } = require('./lib/web/cache/symbols')
 
 // Cache & CacheStorage are tightly coupled with fetch. Even if it may run
 // in an older version of Node, it doesn't have any use without fetch.
 module.exports.caches = new CacheStorage(kConstruct)
 
-const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/cookies')
+const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/web/cookies')
 
 module.exports.deleteCookie = deleteCookie
 module.exports.getCookies = getCookies
 module.exports.getSetCookies = getSetCookies
 module.exports.setCookie = setCookie
 
-const { parseMIMEType, serializeAMimeType } = require('./lib/fetch/dataURL')
+const { parseMIMEType, serializeAMimeType } = require('./lib/web/fetch/dataURL')
 
 module.exports.parseMIMEType = parseMIMEType
 module.exports.serializeAMimeType = serializeAMimeType
 
-const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/websocket/events')
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
+const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/web/websocket/events')
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
 module.exports.CloseEvent = CloseEvent
 module.exports.ErrorEvent = ErrorEvent
 module.exports.MessageEvent = MessageEvent
@@ -154,6 +154,6 @@ module.exports.MockPool = MockPool
 module.exports.MockAgent = MockAgent
 module.exports.mockErrors = mockErrors
 
-const { EventSource } = require('./lib/eventsource/eventsource')
+const { EventSource } = require('./lib/web/eventsource/eventsource')
 
 module.exports.EventSource = EventSource
diff --git a/lib/cache/symbols.js b/lib/cache/symbols.js
deleted file mode 100644
index 40448d6001e..00000000000
--- a/lib/cache/symbols.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict'
-
-module.exports = {
-  kConstruct: require('../core/symbols').kConstruct
-}
diff --git a/lib/client.js b/lib/client.js
index b74ffcbf7be..7a7260406ef 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1500,7 +1500,7 @@ function write (client, request) {
 
   if (util.isFormDataLike(body)) {
     if (!extractBody) {
-      extractBody = require('./fetch/body.js').extractBody
+      extractBody = require('./web/fetch/body.js').extractBody
     }
 
     const [bodyStream, contentType] = extractBody(body)
diff --git a/lib/mock/mock-interceptor.js b/lib/mock/mock-interceptor.js
index 1772f0e424f..d071a90db06 100644
--- a/lib/mock/mock-interceptor.js
+++ b/lib/mock/mock-interceptor.js
@@ -74,7 +74,7 @@ class MockInterceptor {
       if (opts.query) {
         opts.path = buildURL(opts.path, opts.query)
       } else {
-        // Matches https://github.com/nodejs/undici/blob/main/lib/fetch/index.js#L1811
+        // Matches https://github.com/nodejs/undici/blob/main/lib/web/fetch/index.js#L1811
         const parsedURL = new URL(opts.path, 'data://')
         opts.path = parsedURL.pathname + parsedURL.search
       }
diff --git a/lib/cache/cache.js b/lib/web/cache/cache.js
similarity index 99%
rename from lib/cache/cache.js
rename to lib/web/cache/cache.js
index 74cd802de7f..acbd6c7d0f7 100644
--- a/lib/cache/cache.js
+++ b/lib/web/cache/cache.js
@@ -2,7 +2,7 @@
 
 const { kConstruct } = require('./symbols')
 const { urlEquals, getFieldValues } = require('./util')
-const { kEnumerableProperty, isDisturbed } = require('../core/util')
+const { kEnumerableProperty, isDisturbed } = require('../../core/util')
 const { webidl } = require('../fetch/webidl')
 const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
 const { Request, fromInnerRequest } = require('../fetch/request')
@@ -10,7 +10,7 @@ const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
 const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
 const assert = require('node:assert')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 
 /**
  * @see https://w3c.github.io/ServiceWorker/#dfn-cache-batch-operation
diff --git a/lib/cache/cachestorage.js b/lib/web/cache/cachestorage.js
similarity index 98%
rename from lib/cache/cachestorage.js
rename to lib/web/cache/cachestorage.js
index 4f3351a6a9b..de3813cfecb 100644
--- a/lib/cache/cachestorage.js
+++ b/lib/web/cache/cachestorage.js
@@ -3,7 +3,7 @@
 const { kConstruct } = require('./symbols')
 const { Cache } = require('./cache')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class CacheStorage {
   /**
diff --git a/lib/web/cache/symbols.js b/lib/web/cache/symbols.js
new file mode 100644
index 00000000000..9271fb61267
--- /dev/null
+++ b/lib/web/cache/symbols.js
@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  kConstruct: require('../../core/symbols').kConstruct
+}
diff --git a/lib/cache/util.js b/lib/web/cache/util.js
similarity index 100%
rename from lib/cache/util.js
rename to lib/web/cache/util.js
diff --git a/lib/cookies/constants.js b/lib/web/cookies/constants.js
similarity index 100%
rename from lib/cookies/constants.js
rename to lib/web/cookies/constants.js
diff --git a/lib/cookies/index.js b/lib/web/cookies/index.js
similarity index 100%
rename from lib/cookies/index.js
rename to lib/web/cookies/index.js
diff --git a/lib/cookies/parse.js b/lib/web/cookies/parse.js
similarity index 100%
rename from lib/cookies/parse.js
rename to lib/web/cookies/parse.js
diff --git a/lib/cookies/util.js b/lib/web/cookies/util.js
similarity index 99%
rename from lib/cookies/util.js
rename to lib/web/cookies/util.js
index 203c4bcf37c..0c1353d5ca3 100644
--- a/lib/cookies/util.js
+++ b/lib/web/cookies/util.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('node:assert')
-const { kHeadersList } = require('../core/symbols')
+const { kHeadersList } = require('../../core/symbols')
 
 function isCTLExcludingHtab (value) {
   if (value.length === 0) {
diff --git a/lib/eventsource/eventsource-stream.js b/lib/web/eventsource/eventsource-stream.js
similarity index 100%
rename from lib/eventsource/eventsource-stream.js
rename to lib/web/eventsource/eventsource-stream.js
diff --git a/lib/eventsource/eventsource.js b/lib/web/eventsource/eventsource.js
similarity index 99%
rename from lib/eventsource/eventsource.js
rename to lib/web/eventsource/eventsource.js
index ee61cfde880..ad6ea26dcd1 100644
--- a/lib/eventsource/eventsource.js
+++ b/lib/web/eventsource/eventsource.js
@@ -9,7 +9,7 @@ const { EventSourceStream } = require('./eventsource-stream')
 const { parseMIMEType } = require('../fetch/dataURL')
 const { MessageEvent } = require('../websocket/events')
 const { isNetworkError } = require('../fetch/response')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 const { delay } = require('./util')
 
 let experimentalWarned = false
diff --git a/lib/eventsource/util.js b/lib/web/eventsource/util.js
similarity index 100%
rename from lib/eventsource/util.js
rename to lib/web/eventsource/util.js
diff --git a/lib/fetch/LICENSE b/lib/web/fetch/LICENSE
similarity index 100%
rename from lib/fetch/LICENSE
rename to lib/web/fetch/LICENSE
diff --git a/lib/fetch/body.js b/lib/web/fetch/body.js
similarity index 99%
rename from lib/fetch/body.js
rename to lib/web/fetch/body.js
index 65fd63c5b23..4b81fcedc42 100644
--- a/lib/fetch/body.js
+++ b/lib/web/fetch/body.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Busboy = require('@fastify/busboy')
-const util = require('../core/util')
+const util = require('../../core/util')
 const {
   ReadableStreamFrom,
   isBlobLike,
@@ -16,7 +16,7 @@ const { kState } = require('./symbols')
 const { webidl } = require('./webidl')
 const { Blob, File: NativeFile } = require('node:buffer')
 const assert = require('node:assert')
-const { isErrored } = require('../core/util')
+const { isErrored } = require('../../core/util')
 const { isArrayBuffer } = require('node:util/types')
 const { File: UndiciFile } = require('./file')
 const { serializeAMimeType } = require('./dataURL')
diff --git a/lib/fetch/constants.js b/lib/web/fetch/constants.js
similarity index 100%
rename from lib/fetch/constants.js
rename to lib/web/fetch/constants.js
diff --git a/lib/fetch/dataURL.js b/lib/web/fetch/dataURL.js
similarity index 100%
rename from lib/fetch/dataURL.js
rename to lib/web/fetch/dataURL.js
diff --git a/lib/compat/dispatcher-weakref.js b/lib/web/fetch/dispatcher-weakref.js
similarity index 93%
rename from lib/compat/dispatcher-weakref.js
rename to lib/web/fetch/dispatcher-weakref.js
index 463b29ca319..05fde6f09f4 100644
--- a/lib/compat/dispatcher-weakref.js
+++ b/lib/web/fetch/dispatcher-weakref.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { kConnected, kSize } = require('../core/symbols')
+const { kConnected, kSize } = require('../../core/symbols')
 
 class CompatWeakRef {
   constructor (value) {
diff --git a/lib/fetch/file.js b/lib/web/fetch/file.js
similarity index 99%
rename from lib/fetch/file.js
rename to lib/web/fetch/file.js
index d52feb3e3c9..61a232017b2 100644
--- a/lib/fetch/file.js
+++ b/lib/web/fetch/file.js
@@ -6,7 +6,7 @@ const { kState } = require('./symbols')
 const { isBlobLike } = require('./util')
 const { webidl } = require('./webidl')
 const { parseMIMEType, serializeAMimeType } = require('./dataURL')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const encoder = new TextEncoder()
 
 class File extends Blob {
diff --git a/lib/fetch/formdata.js b/lib/web/fetch/formdata.js
similarity index 99%
rename from lib/fetch/formdata.js
rename to lib/web/fetch/formdata.js
index 80df2b8f399..e8dcd6fa614 100644
--- a/lib/fetch/formdata.js
+++ b/lib/web/fetch/formdata.js
@@ -2,7 +2,7 @@
 
 const { isBlobLike, iteratorMixin } = require('./util')
 const { kState } = require('./symbols')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { File: UndiciFile, FileLike, isFileLike } = require('./file')
 const { webidl } = require('./webidl')
 const { File: NativeFile } = require('node:buffer')
diff --git a/lib/fetch/global.js b/lib/web/fetch/global.js
similarity index 100%
rename from lib/fetch/global.js
rename to lib/web/fetch/global.js
diff --git a/lib/fetch/headers.js b/lib/web/fetch/headers.js
similarity index 99%
rename from lib/fetch/headers.js
rename to lib/web/fetch/headers.js
index 41ae9b02368..770c9380874 100644
--- a/lib/fetch/headers.js
+++ b/lib/web/fetch/headers.js
@@ -2,9 +2,9 @@
 
 'use strict'
 
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const { kGuard } = require('./symbols')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const {
   iteratorMixin,
   isValidHeaderName,
diff --git a/lib/fetch/index.js b/lib/web/fetch/index.js
similarity index 99%
rename from lib/fetch/index.js
rename to lib/web/fetch/index.js
index f65bfbe78da..f4a6e5e6262 100644
--- a/lib/fetch/index.js
+++ b/lib/web/fetch/index.js
@@ -59,9 +59,9 @@ const {
 } = require('./constants')
 const EE = require('node:events')
 const { Readable, pipeline } = require('node:stream')
-const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../core/util')
+const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../../core/util')
 const { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require('./dataURL')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 const { webidl } = require('./webidl')
 const { STATUS_CODES } = require('node:http')
 const GET_OR_HEAD = ['GET', 'HEAD']
diff --git a/lib/fetch/request.js b/lib/web/fetch/request.js
similarity index 99%
rename from lib/fetch/request.js
rename to lib/web/fetch/request.js
index 998e407e527..ef2f3ff0b14 100644
--- a/lib/fetch/request.js
+++ b/lib/web/fetch/request.js
@@ -4,8 +4,8 @@
 
 const { extractBody, mixinBody, cloneBody } = require('./body')
 const { Headers, fill: fillHeaders, HeadersList } = require('./headers')
-const { FinalizationRegistry } = require('../compat/dispatcher-weakref')()
-const util = require('../core/util')
+const { FinalizationRegistry } = require('./dispatcher-weakref')()
+const util = require('../../core/util')
 const {
   isValidHTTPToken,
   sameOrigin,
@@ -28,7 +28,7 @@ const { kHeaders, kSignal, kState, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')
 const { getGlobalOrigin } = require('./global')
 const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require('node:events')
 
diff --git a/lib/fetch/response.js b/lib/web/fetch/response.js
similarity index 99%
rename from lib/fetch/response.js
rename to lib/web/fetch/response.js
index 69aba18ba6e..355c2847aba 100644
--- a/lib/fetch/response.js
+++ b/lib/web/fetch/response.js
@@ -2,7 +2,7 @@
 
 const { Headers, HeadersList, fill } = require('./headers')
 const { extractBody, cloneBody, mixinBody } = require('./body')
-const util = require('../core/util')
+const util = require('../../core/util')
 const { kEnumerableProperty } = util
 const {
   isValidReasonPhrase,
@@ -22,7 +22,7 @@ const { webidl } = require('./webidl')
 const { FormData } = require('./formdata')
 const { getGlobalOrigin } = require('./global')
 const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { types } = require('node:util')
 
diff --git a/lib/fetch/symbols.js b/lib/web/fetch/symbols.js
similarity index 100%
rename from lib/fetch/symbols.js
rename to lib/web/fetch/symbols.js
diff --git a/lib/fetch/util.js b/lib/web/fetch/util.js
similarity index 99%
rename from lib/fetch/util.js
rename to lib/web/fetch/util.js
index c07db2338a4..b3523cb2e15 100644
--- a/lib/fetch/util.js
+++ b/lib/web/fetch/util.js
@@ -6,7 +6,7 @@ const { redirectStatusSet, referrerPolicySet: referrerPolicyTokens, badPortsSet
 const { getGlobalOrigin } = require('./global')
 const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./dataURL')
 const { performance } = require('node:perf_hooks')
-const { isBlobLike, ReadableStreamFrom, isValidHTTPToken } = require('../core/util')
+const { isBlobLike, ReadableStreamFrom, isValidHTTPToken } = require('../../core/util')
 const assert = require('node:assert')
 const { isUint8Array } = require('node:util/types')
 const { webidl } = require('./webidl')
diff --git a/lib/fetch/webidl.js b/lib/web/fetch/webidl.js
similarity index 99%
rename from lib/fetch/webidl.js
rename to lib/web/fetch/webidl.js
index 0978e67f26f..da5df4a362f 100644
--- a/lib/fetch/webidl.js
+++ b/lib/web/fetch/webidl.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { types } = require('node:util')
-const { toUSVString } = require('../core/util')
+const { toUSVString } = require('../../core/util')
 
 /** @type {import('../../types/webidl').Webidl} */
 const webidl = {}
diff --git a/lib/fileapi/encoding.js b/lib/web/fileapi/encoding.js
similarity index 100%
rename from lib/fileapi/encoding.js
rename to lib/web/fileapi/encoding.js
diff --git a/lib/fileapi/filereader.js b/lib/web/fileapi/filereader.js
similarity index 99%
rename from lib/fileapi/filereader.js
rename to lib/web/fileapi/filereader.js
index cd36a22ff6f..0cca813994e 100644
--- a/lib/fileapi/filereader.js
+++ b/lib/web/fileapi/filereader.js
@@ -13,7 +13,7 @@ const {
   kAborted
 } = require('./symbols')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class FileReader extends EventTarget {
   constructor () {
diff --git a/lib/fileapi/progressevent.js b/lib/web/fileapi/progressevent.js
similarity index 100%
rename from lib/fileapi/progressevent.js
rename to lib/web/fileapi/progressevent.js
diff --git a/lib/fileapi/symbols.js b/lib/web/fileapi/symbols.js
similarity index 100%
rename from lib/fileapi/symbols.js
rename to lib/web/fileapi/symbols.js
diff --git a/lib/fileapi/util.js b/lib/web/fileapi/util.js
similarity index 100%
rename from lib/fileapi/util.js
rename to lib/web/fileapi/util.js
diff --git a/lib/websocket/connection.js b/lib/web/websocket/connection.js
similarity index 98%
rename from lib/websocket/connection.js
rename to lib/web/websocket/connection.js
index 399c3f52f14..33905404833 100644
--- a/lib/websocket/connection.js
+++ b/lib/web/websocket/connection.js
@@ -8,13 +8,13 @@ const {
   kReceivedClose
 } = require('./symbols')
 const { fireEvent, failWebsocketConnection } = require('./util')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { CloseEvent } = require('./events')
 const { makeRequest } = require('../fetch/request')
 const { fetching } = require('../fetch/index')
 const { Headers } = require('../fetch/headers')
-const { getGlobalDispatcher } = require('../global')
-const { kHeadersList } = require('../core/symbols')
+const { getGlobalDispatcher } = require('../../global')
+const { kHeadersList } = require('../../core/symbols')
 
 /** @type {import('crypto')} */
 let crypto
diff --git a/lib/websocket/constants.js b/lib/web/websocket/constants.js
similarity index 100%
rename from lib/websocket/constants.js
rename to lib/web/websocket/constants.js
diff --git a/lib/websocket/events.js b/lib/web/websocket/events.js
similarity index 99%
rename from lib/websocket/events.js
rename to lib/web/websocket/events.js
index 626e8da0583..b1f91d0e190 100644
--- a/lib/websocket/events.js
+++ b/lib/web/websocket/events.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { MessagePort } = require('node:worker_threads')
 
 /**
diff --git a/lib/websocket/frame.js b/lib/web/websocket/frame.js
similarity index 100%
rename from lib/websocket/frame.js
rename to lib/web/websocket/frame.js
diff --git a/lib/websocket/receiver.js b/lib/web/websocket/receiver.js
similarity index 99%
rename from lib/websocket/receiver.js
rename to lib/web/websocket/receiver.js
index 28ff8b25f5c..63035618968 100644
--- a/lib/websocket/receiver.js
+++ b/lib/web/websocket/receiver.js
@@ -3,7 +3,7 @@
 const { Writable } = require('node:stream')
 const { parserStates, opcodes, states, emptyBuffer } = require('./constants')
 const { kReadyState, kSentClose, kResponse, kReceivedClose } = require('./symbols')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { isValidStatusCode, failWebsocketConnection, websocketMessageReceived } = require('./util')
 const { WebsocketFrameSend } = require('./frame')
 
diff --git a/lib/websocket/symbols.js b/lib/web/websocket/symbols.js
similarity index 100%
rename from lib/websocket/symbols.js
rename to lib/web/websocket/symbols.js
diff --git a/lib/websocket/util.js b/lib/web/websocket/util.js
similarity index 100%
rename from lib/websocket/util.js
rename to lib/web/websocket/util.js
diff --git a/lib/websocket/websocket.js b/lib/web/websocket/websocket.js
similarity index 99%
rename from lib/websocket/websocket.js
rename to lib/web/websocket/websocket.js
index 6cbd01666ef..0072da48193 100644
--- a/lib/websocket/websocket.js
+++ b/lib/web/websocket/websocket.js
@@ -17,8 +17,8 @@ const { isEstablished, isClosing, isValidSubprotocol, failWebsocketConnection, f
 const { establishWebSocketConnection } = require('./connection')
 const { WebsocketFrameSend } = require('./frame')
 const { ByteParser } = require('./receiver')
-const { kEnumerableProperty, isBlobLike } = require('../core/util')
-const { getGlobalDispatcher } = require('../global')
+const { kEnumerableProperty, isBlobLike } = require('../../core/util')
+const { getGlobalDispatcher } = require('../../global')
 const { types } = require('node:util')
 
 let experimentalWarned = false
diff --git a/test/cache/get-field-values.js b/test/cache/get-field-values.js
index 7a1a91d523a..b6a2f60dbbc 100644
--- a/test/cache/get-field-values.js
+++ b/test/cache/get-field-values.js
@@ -2,7 +2,7 @@
 
 const { deepStrictEqual, throws } = require('node:assert')
 const { test } = require('node:test')
-const { getFieldValues } = require('../../lib/cache/util')
+const { getFieldValues } = require('../../lib/web/cache/util')
 
 test('getFieldValues', () => {
   throws(() => getFieldValues(null), {
diff --git a/test/cookie/global-headers.js b/test/cookie/global-headers.js
index 1dc9d9a5857..4afccc490ed 100644
--- a/test/cookie/global-headers.js
+++ b/test/cookie/global-headers.js
@@ -8,7 +8,7 @@ const {
   getSetCookies,
   setCookie
 } = require('../..')
-const { getHeadersList } = require('../../lib/cookies/util')
+const { getHeadersList } = require('../../lib/web/cookies/util')
 
 describe('Using global Headers', async () => {
   test('deleteCookies', () => {
diff --git a/test/eventsource/eventsource-attributes.js b/test/eventsource/eventsource-attributes.js
index 41b01aff295..0e046affdbd 100644
--- a/test/eventsource/eventsource-attributes.js
+++ b/test/eventsource/eventsource-attributes.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - eventhandler idl', async () => {
   const server = http.createServer((req, res) => {
diff --git a/test/eventsource/eventsource-close.js b/test/eventsource/eventsource-close.js
index 7f88d00dc87..5b6397df63a 100644
--- a/test/eventsource/eventsource-close.js
+++ b/test/eventsource/eventsource-close.js
@@ -5,7 +5,7 @@ const events = require('node:events')
 const http = require('node:http')
 const { setTimeout } = require('node:timers/promises')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - close', () => {
   test('should not emit error when closing the EventSource Instance', async () => {
diff --git a/test/eventsource/eventsource-connect.js b/test/eventsource/eventsource-connect.js
index f5f81b1a549..75508ee954d 100644
--- a/test/eventsource/eventsource-connect.js
+++ b/test/eventsource/eventsource-connect.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - sending correct request headers', () => {
   test('should send request with connection keep-alive', async () => {
diff --git a/test/eventsource/eventsource-constructor-stringify.js b/test/eventsource/eventsource-constructor-stringify.js
index 8e6fb7c2601..aee1d02bc6d 100644
--- a/test/eventsource/eventsource-constructor-stringify.js
+++ b/test/eventsource/eventsource-constructor-stringify.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - constructor stringify', () => {
   test('should stringify argument', async () => {
diff --git a/test/eventsource/eventsource-constructor.js b/test/eventsource/eventsource-constructor.js
index 3640ba15467..a5e25e3f1dc 100644
--- a/test/eventsource/eventsource-constructor.js
+++ b/test/eventsource/eventsource-constructor.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - withCredentials', () => {
   test('withCredentials should be false by default', async () => {
diff --git a/test/eventsource/eventsource-message.js b/test/eventsource/eventsource-message.js
index 8b76bdc6b26..d7843bc6891 100644
--- a/test/eventsource/eventsource-message.js
+++ b/test/eventsource/eventsource-message.js
@@ -5,7 +5,7 @@ const events = require('node:events')
 const http = require('node:http')
 const { setTimeout } = require('node:timers/promises')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - message', () => {
   test('Should not emit a message if only retry field was sent', async () => {
diff --git a/test/eventsource/eventsource-reconnect.js b/test/eventsource/eventsource-reconnect.js
index 3499b8b3702..50d5f6dadec 100644
--- a/test/eventsource/eventsource-reconnect.js
+++ b/test/eventsource/eventsource-reconnect.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource, defaultReconnectionTime } = require('../../lib/eventsource/eventsource')
+const { EventSource, defaultReconnectionTime } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - reconnect', () => {
   test('Should reconnect on connection close', async () => {
diff --git a/test/eventsource/eventsource-redirecting.js b/test/eventsource/eventsource-redirecting.js
index 1e8a31ae310..07bd36ea790 100644
--- a/test/eventsource/eventsource-redirecting.js
+++ b/test/eventsource/eventsource-redirecting.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - redirecting', () => {
   [301, 302, 307, 308].forEach((statusCode) => {
diff --git a/test/eventsource/eventsource-request-status-error.js b/test/eventsource/eventsource-request-status-error.js
index a8775fde18a..3b73d22b851 100644
--- a/test/eventsource/eventsource-request-status-error.js
+++ b/test/eventsource/eventsource-request-status-error.js
@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const events = require('node:events')
 const http = require('node:http')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - status error', () => {
   [204, 205, 210, 299, 404, 410, 503].forEach((statusCode) => {
diff --git a/test/eventsource/eventsource-stream-bom.js b/test/eventsource/eventsource-stream-bom.js
index 4bcfd76064f..b447832a124 100644
--- a/test/eventsource/eventsource-stream-bom.js
+++ b/test/eventsource/eventsource-stream-bom.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test, describe } = require('node:test')
-const { EventSourceStream } = require('../../lib/eventsource/eventsource-stream')
+const { EventSourceStream } = require('../../lib/web/eventsource/eventsource-stream')
 
 describe('EventSourceStream - handle BOM', () => {
   test('Remove BOM from the beginning of the stream. 1 byte chunks', () => {
diff --git a/test/eventsource/eventsource-stream-parse-line.js b/test/eventsource/eventsource-stream-parse-line.js
index 6ef6dd8eca3..45069a2752d 100644
--- a/test/eventsource/eventsource-stream-parse-line.js
+++ b/test/eventsource/eventsource-stream-parse-line.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test, describe } = require('node:test')
-const { EventSourceStream } = require('../../lib/eventsource/eventsource-stream')
+const { EventSourceStream } = require('../../lib/web/eventsource/eventsource-stream')
 
 describe('EventSourceStream - parseLine', () => {
   const defaultEventSourceSettings = {
diff --git a/test/eventsource/eventsource-stream-process-event.js b/test/eventsource/eventsource-stream-process-event.js
index aa106e15f1c..a0452ad36dc 100644
--- a/test/eventsource/eventsource-stream-process-event.js
+++ b/test/eventsource/eventsource-stream-process-event.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test, describe } = require('node:test')
-const { EventSourceStream } = require('../../lib/eventsource/eventsource-stream')
+const { EventSourceStream } = require('../../lib/web/eventsource/eventsource-stream')
 
 describe('EventSourceStream - processEvent', () => {
   const defaultEventSourceSettings = {
diff --git a/test/eventsource/eventsource-stream.js b/test/eventsource/eventsource-stream.js
index 69a04821e26..8a74f539d8e 100644
--- a/test/eventsource/eventsource-stream.js
+++ b/test/eventsource/eventsource-stream.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test, describe } = require('node:test')
-const { EventSourceStream } = require('../../lib/eventsource/eventsource-stream')
+const { EventSourceStream } = require('../../lib/web/eventsource/eventsource-stream')
 
 describe('EventSourceStream', () => {
   test('ignore empty chunks', () => {
diff --git a/test/eventsource/eventsource.js b/test/eventsource/eventsource.js
index 9ea9673f9e7..f7b62831449 100644
--- a/test/eventsource/eventsource.js
+++ b/test/eventsource/eventsource.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test, describe } = require('node:test')
-const { EventSource } = require('../../lib/eventsource/eventsource')
+const { EventSource } = require('../../lib/web/eventsource/eventsource')
 
 describe('EventSource - constructor', () => {
   test('Not providing url argument should throw', () => {
diff --git a/test/eventsource/util.js b/test/eventsource/util.js
index e976731557e..fa6c854a43a 100644
--- a/test/eventsource/util.js
+++ b/test/eventsource/util.js
@@ -2,7 +2,7 @@
 
 const assert = require('node:assert')
 const { test } = require('node:test')
-const { isASCIINumber, isValidLastEventId } = require('../../lib/eventsource/util')
+const { isASCIINumber, isValidLastEventId } = require('../../lib/web/eventsource/util')
 
 test('isValidLastEventId', () => {
   assert.strictEqual(isValidLastEventId('valid'), true)
diff --git a/test/fetch/data-uri.js b/test/fetch/data-uri.js
index de3c44a6eef..7c99c8e9422 100644
--- a/test/fetch/data-uri.js
+++ b/test/fetch/data-uri.js
@@ -9,7 +9,7 @@ const {
   stringPercentDecode,
   parseMIMEType,
   collectAnHTTPQuotedString
-} = require('../../lib/fetch/dataURL')
+} = require('../../lib/web/fetch/dataURL')
 const { fetch } = require('../..')
 
 test('https://url.spec.whatwg.org/#concept-url-serializer', async (t) => {
diff --git a/test/fetch/file.js b/test/fetch/file.js
index 44149653c12..4bf8e812d3b 100644
--- a/test/fetch/file.js
+++ b/test/fetch/file.js
@@ -4,7 +4,7 @@ const { Blob } = require('node:buffer')
 const { test } = require('node:test')
 const assert = require('node:assert')
 const { tspl } = require('@matteo.collina/tspl')
-const { File, FileLike } = require('../../lib/fetch/file')
+const { File, FileLike } = require('../../lib/web/fetch/file')
 
 test('args validation', (t) => {
   const { throws, doesNotThrow, strictEqual } = tspl(t, { plan: 14 })
diff --git a/test/fetch/headers.js b/test/fetch/headers.js
index d3e27fa348d..acdf5ab611e 100644
--- a/test/fetch/headers.js
+++ b/test/fetch/headers.js
@@ -3,8 +3,8 @@
 const { test } = require('node:test')
 const assert = require('node:assert')
 const { tspl } = require('@matteo.collina/tspl')
-const { Headers, fill } = require('../../lib/fetch/headers')
-const { kGuard } = require('../../lib/fetch/symbols')
+const { Headers, fill } = require('../../lib/web/fetch/headers')
+const { kGuard } = require('../../lib/web/fetch/symbols')
 const { once } = require('node:events')
 const { fetch } = require('../..')
 const { createServer } = require('node:http')
diff --git a/test/fetch/request.js b/test/fetch/request.js
index f2855d07923..41ae8a836d7 100644
--- a/test/fetch/request.js
+++ b/test/fetch/request.js
@@ -10,12 +10,12 @@ const {
   Headers,
   fetch
 } = require('../../')
-const { fromInnerRequest, makeRequest } = require('../../lib/fetch/request')
+const { fromInnerRequest, makeRequest } = require('../../lib/web/fetch/request')
 const {
   Blob: ThirdPartyBlob,
   FormData: ThirdPartyFormData
 } = require('formdata-node')
-const { kState, kGuard, kRealm, kSignal, kHeaders } = require('../../lib/fetch/symbols')
+const { kState, kGuard, kRealm, kSignal, kHeaders } = require('../../lib/web/fetch/symbols')
 const { kHeadersList } = require('../../lib/core/symbols')
 
 const hasSignalReason = 'reason' in AbortSignal.prototype
diff --git a/test/fetch/response.js b/test/fetch/response.js
index cfd4ddb6268..1f44f99f15d 100644
--- a/test/fetch/response.js
+++ b/test/fetch/response.js
@@ -7,12 +7,12 @@ const {
   Response,
   FormData
 } = require('../../')
-const { fromInnerResponse, makeResponse } = require('../../lib/fetch/response')
+const { fromInnerResponse, makeResponse } = require('../../lib/web/fetch/response')
 const {
   Blob: ThirdPartyBlob,
   FormData: ThirdPartyFormData
 } = require('formdata-node')
-const { kState, kGuard, kRealm, kHeaders } = require('../../lib/fetch/symbols')
+const { kState, kGuard, kRealm, kHeaders } = require('../../lib/web/fetch/symbols')
 const { kHeadersList } = require('../../lib/core/symbols')
 
 test('arg validation', async () => {
diff --git a/test/fetch/util.js b/test/fetch/util.js
index eb245486f4d..a5c33d64934 100644
--- a/test/fetch/util.js
+++ b/test/fetch/util.js
@@ -3,8 +3,8 @@
 const { test } = require('node:test')
 const assert = require('node:assert')
 const { tspl } = require('@matteo.collina/tspl')
-const util = require('../../lib/fetch/util')
-const { HeadersList } = require('../../lib/fetch/headers')
+const util = require('../../lib/web/fetch/util')
+const { HeadersList } = require('../../lib/web/fetch/headers')
 const { createHash } = require('node:crypto')
 
 test('responseURL', (t) => {
diff --git a/test/jest/instanceof-error.test.js b/test/jest/instanceof-error.test.js
index 363ec7013e8..30667262dee 100644
--- a/test/jest/instanceof-error.test.js
+++ b/test/jest/instanceof-error.test.js
@@ -9,7 +9,7 @@ const { once } = require('node:events')
 jest.useRealTimers()
 
 it('isErrorLike sanity check', () => {
-  const { isErrorLike } = require('../../lib/fetch/util')
+  const { isErrorLike } = require('../../lib/web/fetch/util')
   const error = new DOMException('')
 
   // https://github.com/facebook/jest/issues/2549
diff --git a/test/node-fetch/main.js b/test/node-fetch/main.js
index e4b13b1f482..3ba4a929af0 100644
--- a/test/node-fetch/main.js
+++ b/test/node-fetch/main.js
@@ -19,9 +19,9 @@ const {
   setGlobalDispatcher,
   Agent
 } = require('../../index.js')
-const HeadersOrig = require('../../lib/fetch/headers.js').Headers
-const ResponseOrig = require('../../lib/fetch/response.js').Response
-const RequestOrig = require('../../lib/fetch/request.js').Request
+const HeadersOrig = require('../../lib/web/fetch/headers.js').Headers
+const ResponseOrig = require('../../lib/web/fetch/response.js').Response
+const RequestOrig = require('../../lib/web/fetch/request.js').Request
 const TestServer = require('./utils/server.js')
 
 const {
diff --git a/test/node-fetch/response.js b/test/node-fetch/response.js
index e28dcb37119..84b3e9c471d 100644
--- a/test/node-fetch/response.js
+++ b/test/node-fetch/response.js
@@ -6,7 +6,7 @@ const stream = require('node:stream')
 const { Response } = require('../../index.js')
 const TestServer = require('./utils/server.js')
 const { Blob } = require('node:buffer')
-const { kState } = require('../../lib/fetch/symbols.js')
+const { kState } = require('../../lib/web/fetch/symbols.js')
 
 describe('Response', () => {
   const local = new TestServer()
diff --git a/test/webidl/converters.js b/test/webidl/converters.js
index cabd9185468..0e906ed6719 100644
--- a/test/webidl/converters.js
+++ b/test/webidl/converters.js
@@ -2,7 +2,7 @@
 
 const { describe, test } = require('node:test')
 const assert = require('node:assert')
-const { webidl } = require('../../lib/fetch/webidl')
+const { webidl } = require('../../lib/web/fetch/webidl')
 
 test('sequence', () => {
   const converter = webidl.sequenceConverter(
diff --git a/test/webidl/helpers.js b/test/webidl/helpers.js
index 2842efeb3c2..b18baa5fb7b 100644
--- a/test/webidl/helpers.js
+++ b/test/webidl/helpers.js
@@ -2,7 +2,7 @@
 
 const { describe, test } = require('node:test')
 const assert = require('node:assert')
-const { webidl } = require('../../lib/fetch/webidl')
+const { webidl } = require('../../lib/web/fetch/webidl')
 
 test('webidl.interfaceConverter', () => {
   class A {}
diff --git a/test/webidl/util.js b/test/webidl/util.js
index 1e087c53fee..83ea669fb2f 100644
--- a/test/webidl/util.js
+++ b/test/webidl/util.js
@@ -2,7 +2,7 @@
 
 const { test } = require('node:test')
 const assert = require('node:assert')
-const { webidl } = require('../../lib/fetch/webidl')
+const { webidl } = require('../../lib/web/fetch/webidl')
 
 test('Type(V)', () => {
   const Type = webidl.util.Type
diff --git a/test/websocket/events.js b/test/websocket/events.js
index b7c533251aa..8186baac679 100644
--- a/test/websocket/events.js
+++ b/test/websocket/events.js
@@ -3,7 +3,7 @@
 const { test, describe, after } = require('node:test')
 const assert = require('node:assert')
 const { WebSocketServer } = require('ws')
-const { MessageEvent, CloseEvent, ErrorEvent } = require('../../lib/websocket/events')
+const { MessageEvent, CloseEvent, ErrorEvent } = require('../../lib/web/websocket/events')
 const { WebSocket } = require('../..')
 
 test('MessageEvent', () => {
diff --git a/test/websocket/frame.js b/test/websocket/frame.js
index 936bd8f69e0..0f6a7d4a751 100644
--- a/test/websocket/frame.js
+++ b/test/websocket/frame.js
@@ -2,8 +2,8 @@
 
 const { test } = require('node:test')
 const assert = require('node:assert')
-const { WebsocketFrameSend } = require('../../lib/websocket/frame')
-const { opcodes } = require('../../lib/websocket/constants')
+const { WebsocketFrameSend } = require('../../lib/web/websocket/frame')
+const { opcodes } = require('../../lib/web/websocket/constants')
 
 test('Writing 16-bit frame length value at correct offset when buffer has a non-zero byteOffset', () => {
   /*
diff --git a/test/wpt/runner/worker.mjs b/test/wpt/runner/worker.mjs
index 37c5dc6a105..f0f45542e97 100644
--- a/test/wpt/runner/worker.mjs
+++ b/test/wpt/runner/worker.mjs
@@ -7,13 +7,13 @@ import { parentPort, workerData } from 'node:worker_threads'
 import {
   fetch, File, FileReader, FormData, Headers, Request, Response, setGlobalOrigin
 } from '../../../index.js'
-import { CloseEvent } from '../../../lib/websocket/events.js'
-import { WebSocket } from '../../../lib/websocket/websocket.js'
-import { Cache } from '../../../lib/cache/cache.js'
-import { CacheStorage } from '../../../lib/cache/cachestorage.js'
-import { kConstruct } from '../../../lib/cache/symbols.js'
+import { CloseEvent } from '../../../lib/web/websocket/events.js'
+import { WebSocket } from '../../../lib/web/websocket/websocket.js'
+import { Cache } from '../../../lib/web/cache/cache.js'
+import { CacheStorage } from '../../../lib/web/cache/cachestorage.js'
+import { kConstruct } from '../../../lib/web/cache/symbols.js'
 // TODO(@KhafraDev): move this import once its added to index
-import { EventSource } from '../../../lib/eventsource/eventsource.js'
+import { EventSource } from '../../../lib/web/eventsource/eventsource.js'
 import { webcrypto } from 'node:crypto'
 
 const { initScripts, meta, test, url, path } = workerData