refactor(core): include_js_files! 'dir' option doesn't change specifiers (#18019)

This commit changes "include_js_files!" macro from "deno_core"
in a way that "dir" option doesn't cause specifiers to be rewritten 
to include it.

Example:
```
include_js_files! {
  dir "js",
  "hello.js",
}
```

The above definition required embedders to use:
`import ... from "internal:<ext_name>/js/hello.js"`. 
But with this change, the "js" directory in which the files are stored
is an implementation detail, which for embedders results in: 
`import ... from "internal:<ext_name>/hello.js"`.

The directory the files are stored in, is an implementation detail and 
in some cases might result in a significant size difference for the 
snapshot. As an example, in "deno_node" extension, we store the 
source code in "polyfills" directory; which resulted in each specifier 
to look like "internal:deno_node/polyfills/<module_name>", but with 
this change it's "internal:deno_node/<module_name>". 

Given that "deno_node" has over 100 files, many of them having 
several import specifiers to the same extension, this change removes
10 characters from each import specifier.

61 files changed, 360 insertions, 364 deletions

diff --git a/ext/node/polyfills/internal/assert.mjs b/ext/node/polyfills/internal/assert.mjs
index fcdb32a05..50f260e10 100644
--- a/ext/node/polyfills/internal/assert.mjs
+++ b/ext/node/polyfills/internal/assert.mjs
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { ERR_INTERNAL_ASSERTION } from "internal:deno_node/polyfills/internal/errors.ts";
+import { ERR_INTERNAL_ASSERTION } from "internal:deno_node/internal/errors.ts";
 
 function assert(value, message) {
   if (!value) {
diff --git a/ext/node/polyfills/internal/async_hooks.ts b/ext/node/polyfills/internal/async_hooks.ts
index 8bf513e46..daabd4926 100644
--- a/ext/node/polyfills/internal/async_hooks.ts
+++ b/ext/node/polyfills/internal/async_hooks.ts
@@ -2,12 +2,12 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
 // deno-lint-ignore camelcase
-import * as async_wrap from "internal:deno_node/polyfills/internal_binding/async_wrap.ts";
-import { ERR_ASYNC_CALLBACK } from "internal:deno_node/polyfills/internal/errors.ts";
+import * as async_wrap from "internal:deno_node/internal_binding/async_wrap.ts";
+import { ERR_ASYNC_CALLBACK } from "internal:deno_node/internal/errors.ts";
 export {
   asyncIdSymbol,
   ownerSymbol,
-} from "internal:deno_node/polyfills/internal_binding/symbols.ts";
+} from "internal:deno_node/internal_binding/symbols.ts";
 
 interface ActiveHooks {
   array: AsyncHook[];
diff --git a/ext/node/polyfills/internal/buffer.d.ts b/ext/node/polyfills/internal/buffer.d.ts
index 638674467..900425d52 100644
--- a/ext/node/polyfills/internal/buffer.d.ts
+++ b/ext/node/polyfills/internal/buffer.d.ts
@@ -35,7 +35,7 @@ type WithImplicitCoercion<T> =
  * recommended to explicitly reference it via an import or require statement.
  *
  * ```js
- * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+ * import { Buffer } from "internal:deno_node/internal/buffer";
  *
  * // Creates a zero-filled Buffer of length 10.
  * const buf1 = Buffer.alloc(10);
@@ -118,7 +118,7 @@ export class Buffer extends Uint8Array {
    * Array entries outside that range will be truncated to fit into it.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Creates a new Buffer containing the UTF-8 bytes of the string 'buffer'.
    * const buf = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
@@ -165,7 +165,7 @@ export class Buffer extends Uint8Array {
    * Returns `true` if `obj` is a `Buffer`, `false` otherwise.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * Buffer.isBuffer(Buffer.alloc(10)); // true
    * Buffer.isBuffer(Buffer.from('foo')); // true
@@ -181,7 +181,7 @@ export class Buffer extends Uint8Array {
    * or `false` otherwise.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * console.log(Buffer.isEncoding('utf8'));
    * // Prints: true
@@ -210,7 +210,7 @@ export class Buffer extends Uint8Array {
    * string.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const str = '\u00bd + \u00bc = \u00be';
    *
@@ -249,7 +249,7 @@ export class Buffer extends Uint8Array {
    * truncated to `totalLength`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Create a single `Buffer` from a list of three `Buffer` instances.
    *
@@ -282,7 +282,7 @@ export class Buffer extends Uint8Array {
    * Compares `buf1` to `buf2`, typically for the purpose of sorting arrays of`Buffer` instances. This is equivalent to calling `buf1.compare(buf2)`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from('1234');
    * const buf2 = Buffer.from('0123');
@@ -300,7 +300,7 @@ export class Buffer extends Uint8Array {
    * Allocates a new `Buffer` of `size` bytes. If `fill` is `undefined`, the`Buffer` will be zero-filled.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.alloc(5);
    *
@@ -313,7 +313,7 @@ export class Buffer extends Uint8Array {
    * If `fill` is specified, the allocated `Buffer` will be initialized by calling `buf.fill(fill)`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.alloc(5, 'a');
    *
@@ -325,7 +325,7 @@ export class Buffer extends Uint8Array {
    * initialized by calling `buf.fill(fill, encoding)`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64');
    *
@@ -355,7 +355,7 @@ export class Buffer extends Uint8Array {
    * _initialized_. The contents of the newly created `Buffer` are unknown and_may contain sensitive data_. Use `Buffer.alloc()` instead to initialize`Buffer` instances with zeroes.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(10);
    *
@@ -406,7 +406,7 @@ export class Buffer extends Uint8Array {
    * then copying out the relevant bits.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Need to keep around a few small chunks of memory.
    * const store = [];
@@ -443,7 +443,7 @@ export class Buffer extends Uint8Array {
    * written. However, partially encoded characters will not be written.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.alloc(256);
    *
@@ -484,7 +484,7 @@ export class Buffer extends Uint8Array {
    * as {@link constants.MAX_STRING_LENGTH}.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.allocUnsafe(26);
    *
@@ -521,7 +521,7 @@ export class Buffer extends Uint8Array {
    * In particular, `Buffer.from(buf.toJSON())` works like `Buffer.from(buf)`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5]);
    * const json = JSON.stringify(buf);
@@ -548,7 +548,7 @@ export class Buffer extends Uint8Array {
    * Returns `true` if both `buf` and `otherBuffer` have exactly the same bytes,`false` otherwise. Equivalent to `buf.compare(otherBuffer) === 0`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from('ABC');
    * const buf2 = Buffer.from('414243', 'hex');
@@ -572,7 +572,7 @@ export class Buffer extends Uint8Array {
    * * `-1` is returned if `target` should come _after_`buf` when sorted.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from('ABC');
    * const buf2 = Buffer.from('BCD');
@@ -596,7 +596,7 @@ export class Buffer extends Uint8Array {
    * The optional `targetStart`, `targetEnd`, `sourceStart`, and `sourceEnd`arguments can be used to limit the comparison to specific ranges within `target`and `buf` respectively.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8, 9]);
    * const buf2 = Buffer.from([5, 6, 7, 8, 9, 1, 2, 3, 4]);
@@ -632,7 +632,7 @@ export class Buffer extends Uint8Array {
    * different function arguments.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Create two `Buffer` instances.
    * const buf1 = Buffer.allocUnsafe(26);
@@ -653,7 +653,7 @@ export class Buffer extends Uint8Array {
    * ```
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Create a `Buffer` and copy data from one region to an overlapping region
    * // within the same `Buffer`.
@@ -693,7 +693,7 @@ export class Buffer extends Uint8Array {
    * which is a superclass of `Buffer`. To copy the slice, use`Uint8Array.prototype.slice()`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('buffer');
    *
@@ -722,7 +722,7 @@ export class Buffer extends Uint8Array {
    * Modifying the new `Buffer` slice will modify the memory in the original `Buffer`because the allocated memory of the two objects overlap.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Create a `Buffer` with the ASCII alphabet, take a slice, and modify one byte
    * // from the original `Buffer`.
@@ -749,7 +749,7 @@ export class Buffer extends Uint8Array {
    * end of `buf` rather than the beginning.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('buffer');
    *
@@ -776,7 +776,7 @@ export class Buffer extends Uint8Array {
    * `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -797,7 +797,7 @@ export class Buffer extends Uint8Array {
    * `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -818,7 +818,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeBigUint64BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -837,7 +837,7 @@ export class Buffer extends Uint8Array {
    * Writes `value` to `buf` at the specified `offset` as little-endian
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -861,7 +861,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUintLE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(6);
    *
@@ -884,7 +884,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUintBE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(6);
    *
@@ -905,7 +905,7 @@ export class Buffer extends Uint8Array {
    * when `value` is anything other than a signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(6);
    *
@@ -926,7 +926,7 @@ export class Buffer extends Uint8Array {
    * signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(6);
    *
@@ -948,7 +948,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readBigUint64BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff]);
    *
@@ -965,7 +965,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readBigUint64LE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff]);
    *
@@ -1001,7 +1001,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUintLE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78, 0x90, 0xab]);
    *
@@ -1020,7 +1020,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUintBE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78, 0x90, 0xab]);
    *
@@ -1039,7 +1039,7 @@ export class Buffer extends Uint8Array {
    * supporting up to 48 bits of accuracy.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78, 0x90, 0xab]);
    *
@@ -1056,7 +1056,7 @@ export class Buffer extends Uint8Array {
    * supporting up to 48 bits of accuracy.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78, 0x90, 0xab]);
    *
@@ -1078,7 +1078,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUint8` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([1, -2]);
    *
@@ -1099,7 +1099,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUint16LE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56]);
    *
@@ -1120,7 +1120,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUint16BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56]);
    *
@@ -1139,7 +1139,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUint32LE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78]);
    *
@@ -1158,7 +1158,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `readUint32BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0x12, 0x34, 0x56, 0x78]);
    *
@@ -1175,7 +1175,7 @@ export class Buffer extends Uint8Array {
    * Integers read from a `Buffer` are interpreted as two's complement signed values.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([-1, 5]);
    *
@@ -1196,7 +1196,7 @@ export class Buffer extends Uint8Array {
    * Integers read from a `Buffer` are interpreted as two's complement signed values.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0, 5]);
    *
@@ -1215,7 +1215,7 @@ export class Buffer extends Uint8Array {
    * Integers read from a `Buffer` are interpreted as two's complement signed values.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0, 5]);
    *
@@ -1232,7 +1232,7 @@ export class Buffer extends Uint8Array {
    * Integers read from a `Buffer` are interpreted as two's complement signed values.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0, 0, 0, 5]);
    *
@@ -1251,7 +1251,7 @@ export class Buffer extends Uint8Array {
    * Integers read from a `Buffer` are interpreted as two's complement signed values.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([0, 0, 0, 5]);
    *
@@ -1266,7 +1266,7 @@ export class Buffer extends Uint8Array {
    * Reads a 32-bit, little-endian float from `buf` at the specified `offset`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([1, 2, 3, 4]);
    *
@@ -1283,7 +1283,7 @@ export class Buffer extends Uint8Array {
    * Reads a 32-bit, big-endian float from `buf` at the specified `offset`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([1, 2, 3, 4]);
    *
@@ -1298,7 +1298,7 @@ export class Buffer extends Uint8Array {
    * Reads a 64-bit, little-endian double from `buf` at the specified `offset`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8]);
    *
@@ -1315,7 +1315,7 @@ export class Buffer extends Uint8Array {
    * Reads a 64-bit, big-endian double from `buf` at the specified `offset`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8]);
    *
@@ -1332,7 +1332,7 @@ export class Buffer extends Uint8Array {
    * byte order _in-place_. Throws `ERR_INVALID_BUFFER_SIZE` if `buf.length` is not a multiple of 2.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
    *
@@ -1354,7 +1354,7 @@ export class Buffer extends Uint8Array {
    * between UTF-16 little-endian and UTF-16 big-endian:
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('This is little-endian UTF-16', 'utf16le');
    * buf.swap16(); // Convert to big-endian UTF-16 text.
@@ -1368,7 +1368,7 @@ export class Buffer extends Uint8Array {
    * byte order _in-place_. Throws `ERR_INVALID_BUFFER_SIZE` if `buf.length` is not a multiple of 4.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
    *
@@ -1394,7 +1394,7 @@ export class Buffer extends Uint8Array {
    * Throws `ERR_INVALID_BUFFER_SIZE` if `buf.length` is not a multiple of 8.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf1 = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
    *
@@ -1423,7 +1423,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUint8` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1448,7 +1448,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUint16LE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1471,7 +1471,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUint16BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1494,7 +1494,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUint32LE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1516,7 +1516,7 @@ export class Buffer extends Uint8Array {
    * This function is also available under the `writeUint32BE` alias.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1539,7 +1539,7 @@ export class Buffer extends Uint8Array {
    * `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(2);
    *
@@ -1562,7 +1562,7 @@ export class Buffer extends Uint8Array {
    * The `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(2);
    *
@@ -1584,7 +1584,7 @@ export class Buffer extends Uint8Array {
    * The `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(2);
    *
@@ -1606,7 +1606,7 @@ export class Buffer extends Uint8Array {
    * The `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1628,7 +1628,7 @@ export class Buffer extends Uint8Array {
    * The `value` is interpreted and written as a two's complement signed integer.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1648,7 +1648,7 @@ export class Buffer extends Uint8Array {
    * undefined when `value` is anything other than a JavaScript number.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1668,7 +1668,7 @@ export class Buffer extends Uint8Array {
    * undefined when `value` is anything other than a JavaScript number.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(4);
    *
@@ -1688,7 +1688,7 @@ export class Buffer extends Uint8Array {
    * other than a JavaScript number.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -1708,7 +1708,7 @@ export class Buffer extends Uint8Array {
    * other than a JavaScript number.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(8);
    *
@@ -1728,7 +1728,7 @@ export class Buffer extends Uint8Array {
    * the entire `buf` will be filled:
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Fill a `Buffer` with the ASCII character 'h'.
    *
@@ -1746,7 +1746,7 @@ export class Buffer extends Uint8Array {
    * then only the bytes of that character that fit into `buf` are written:
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Fill a `Buffer` with character that takes up two bytes in UTF-8.
    *
@@ -1758,7 +1758,7 @@ export class Buffer extends Uint8Array {
    * fill data remains, an exception is thrown:
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.allocUnsafe(5);
    *
@@ -1792,7 +1792,7 @@ export class Buffer extends Uint8Array {
    * value between `0` and `255`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('this is a buffer');
    *
@@ -1825,7 +1825,7 @@ export class Buffer extends Uint8Array {
    * behavior matches [`String.prototype.indexOf()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf).
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const b = Buffer.from('abcdef');
    *
@@ -1860,7 +1860,7 @@ export class Buffer extends Uint8Array {
    * rather than the first occurrence.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('this buffer is a buffer');
    *
@@ -1895,7 +1895,7 @@ export class Buffer extends Uint8Array {
    * This behavior matches [`String.prototype.lastIndexOf()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf).
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const b = Buffer.from('abcdef');
    *
@@ -1932,7 +1932,7 @@ export class Buffer extends Uint8Array {
    * of `buf`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * // Log the entire contents of a `Buffer`.
    *
@@ -1956,7 +1956,7 @@ export class Buffer extends Uint8Array {
    * Equivalent to `buf.indexOf() !== -1`.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('this is a buffer');
    *
@@ -1990,7 +1990,7 @@ export class Buffer extends Uint8Array {
    * Creates and returns an [iterator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols) of `buf` keys (indices).
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('buffer');
    *
@@ -2013,7 +2013,7 @@ export class Buffer extends Uint8Array {
    * called automatically when a `Buffer` is used in a `for..of` statement.
    *
    * ```js
-   * import { Buffer } from "internal:deno_node/polyfills/internal/buffer";
+   * import { Buffer } from "internal:deno_node/internal/buffer";
    *
    * const buf = Buffer.from('buffer');
    *
diff --git a/ext/node/polyfills/internal/buffer.mjs b/ext/node/polyfills/internal/buffer.mjs
index 1600462cf..d56ffdd3c 100644
--- a/ext/node/polyfills/internal/buffer.mjs
+++ b/ext/node/polyfills/internal/buffer.mjs
@@ -3,9 +3,9 @@
 // Copyright Feross Aboukhadijeh, and other contributors. All rights reserved. MIT license.
 
 import { TextDecoder, TextEncoder } from "internal:deno_web/08_text_encoding.js";
-import { codes } from "internal:deno_node/polyfills/internal/error_codes.ts";
-import { encodings } from "internal:deno_node/polyfills/internal_binding/string_decoder.ts";
-import { indexOfBuffer, indexOfNumber } from "internal:deno_node/polyfills/internal_binding/buffer.ts";
+import { codes } from "internal:deno_node/internal/error_codes.ts";
+import { encodings } from "internal:deno_node/internal_binding/string_decoder.ts";
+import { indexOfBuffer, indexOfNumber } from "internal:deno_node/internal_binding/buffer.ts";
 import {
   asciiToBytes,
   base64ToBytes,
@@ -14,11 +14,11 @@ import {
   bytesToUtf16le,
   hexToBytes,
   utf16leToBytes,
-} from "internal:deno_node/polyfills/internal_binding/_utils.ts";
-import { isAnyArrayBuffer, isArrayBufferView } from "internal:deno_node/polyfills/internal/util/types.ts";
-import { normalizeEncoding } from "internal:deno_node/polyfills/internal/util.mjs";
-import { validateBuffer } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { isUint8Array } from "internal:deno_node/polyfills/internal/util/types.ts";
+} from "internal:deno_node/internal_binding/_utils.ts";
+import { isAnyArrayBuffer, isArrayBufferView } from "internal:deno_node/internal/util/types.ts";
+import { normalizeEncoding } from "internal:deno_node/internal/util.mjs";
+import { validateBuffer } from "internal:deno_node/internal/validators.mjs";
+import { isUint8Array } from "internal:deno_node/internal/util/types.ts";
 import { forgivingBase64Encode, forgivingBase64UrlEncode } from "internal:deno_web/00_infra.js";
 import { atob, btoa } from "internal:deno_web/05_base64.js";
 import { Blob } from "internal:deno_web/09_file.js";
diff --git a/ext/node/polyfills/internal/child_process.ts b/ext/node/polyfills/internal/child_process.ts
index 81a404c14..a96b97d9e 100644
--- a/ext/node/polyfills/internal/child_process.ts
+++ b/ext/node/polyfills/internal/child_process.ts
@@ -2,37 +2,33 @@
 
 // This module implements 'child_process' module of Node.JS API.
 // ref: https://nodejs.org/api/child_process.html
-import { assert } from "internal:deno_node/polyfills/_util/asserts.ts";
-import { EventEmitter } from "internal:deno_node/polyfills/events.ts";
-import { os } from "internal:deno_node/polyfills/internal_binding/constants.ts";
+import { assert } from "internal:deno_node/_util/asserts.ts";
+import { EventEmitter } from "internal:deno_node/events.ts";
+import { os } from "internal:deno_node/internal_binding/constants.ts";
 import {
   notImplemented,
   warnNotImplemented,
-} from "internal:deno_node/polyfills/_utils.ts";
-import {
-  Readable,
-  Stream,
-  Writable,
-} from "internal:deno_node/polyfills/stream.ts";
-import { deferred } from "internal:deno_node/polyfills/_util/async.ts";
-import { isWindows } from "internal:deno_node/polyfills/_util/os.ts";
-import { nextTick } from "internal:deno_node/polyfills/_next_tick.ts";
+} from "internal:deno_node/_utils.ts";
+import { Readable, Stream, Writable } from "internal:deno_node/stream.ts";
+import { deferred } from "internal:deno_node/_util/async.ts";
+import { isWindows } from "internal:deno_node/_util/os.ts";
+import { nextTick } from "internal:deno_node/_next_tick.ts";
 import {
   AbortError,
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
   ERR_UNKNOWN_SIGNAL,
-} from "internal:deno_node/polyfills/internal/errors.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { errnoException } from "internal:deno_node/polyfills/internal/errors.ts";
-import { ErrnoException } from "internal:deno_node/polyfills/_global.d.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
+} from "internal:deno_node/internal/errors.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { errnoException } from "internal:deno_node/internal/errors.ts";
+import { ErrnoException } from "internal:deno_node/_global.d.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
 import {
   isInt32,
   validateBoolean,
   validateObject,
   validateString,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
+} from "internal:deno_node/internal/validators.mjs";
 import {
   ArrayIsArray,
   ArrayPrototypeFilter,
@@ -43,10 +39,10 @@ import {
   ArrayPrototypeUnshift,
   ObjectPrototypeHasOwnProperty,
   StringPrototypeToUpperCase,
-} from "internal:deno_node/polyfills/internal/primordials.mjs";
-import { kEmptyObject } from "internal:deno_node/polyfills/internal/util.mjs";
-import { getValidatedPath } from "internal:deno_node/polyfills/internal/fs/utils.mjs";
-import process from "internal:deno_node/polyfills/process.ts";
+} from "internal:deno_node/internal/primordials.mjs";
+import { kEmptyObject } from "internal:deno_node/internal/util.mjs";
+import { getValidatedPath } from "internal:deno_node/internal/fs/utils.mjs";
+import process from "internal:deno_node/process.ts";
 
 export function mapValues<T, O>(
   record: Readonly<Record<string, T>>,
diff --git a/ext/node/polyfills/internal/cli_table.ts b/ext/node/polyfills/internal/cli_table.ts
index 68cc6d044..0fc046478 100644
--- a/ext/node/polyfills/internal/cli_table.ts
+++ b/ext/node/polyfills/internal/cli_table.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
-import { getStringWidth } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
+import { getStringWidth } from "internal:deno_node/internal/util/inspect.mjs";
 
 // The use of Unicode characters below is the only non-comment use of non-ASCII
 // Unicode characters in Node.js built-in modules. If they are ever removed or
diff --git a/ext/node/polyfills/internal/console/constructor.mjs b/ext/node/polyfills/internal/console/constructor.mjs
index 362c97f68..8c9a6d390 100644
--- a/ext/node/polyfills/internal/console/constructor.mjs
+++ b/ext/node/polyfills/internal/console/constructor.mjs
@@ -8,12 +8,12 @@ import {
   ERR_INCOMPATIBLE_OPTION_PAIR,
   ERR_INVALID_ARG_VALUE,
   isStackOverflowError,
-} from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
 import {
   validateArray,
   validateInteger,
   validateObject,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
+} from "internal:deno_node/internal/validators.mjs";
 const previewEntries = (iter, isKeyValue) => {
   if (isKeyValue) {
     const arr = [...iter];
@@ -25,24 +25,24 @@ const previewEntries = (iter, isKeyValue) => {
     return [...iter];
   }
 };
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 const { isBuffer } = Buffer;
-import { formatWithOptions, inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
+import { formatWithOptions, inspect } from "internal:deno_node/internal/util/inspect.mjs";
 import {
   isMap,
   isMapIterator,
   isSet,
   isSetIterator,
   isTypedArray,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
+} from "internal:deno_node/internal/util/types.ts";
 import {
   CHAR_LOWERCASE_B as kTraceBegin,
   CHAR_LOWERCASE_E as kTraceEnd,
   CHAR_LOWERCASE_N as kTraceInstant,
   CHAR_UPPERCASE_C as kTraceCount,
-} from "internal:deno_node/polyfills/internal/constants.ts";
-import { clearScreenDown, cursorTo } from "internal:deno_node/polyfills/internal/readline/callbacks.mjs";
-import cliTable from "internal:deno_node/polyfills/internal/cli_table.ts";
+} from "internal:deno_node/internal/constants.ts";
+import { clearScreenDown, cursorTo } from "internal:deno_node/internal/readline/callbacks.mjs";
+import cliTable from "internal:deno_node/internal/cli_table.ts";
 const kCounts = Symbol("counts");
 
 const kTraceConsoleCategory = "node,node.console";
diff --git a/ext/node/polyfills/internal/crypto/_keys.ts b/ext/node/polyfills/internal/crypto/_keys.ts
index 794582bf1..853777976 100644
--- a/ext/node/polyfills/internal/crypto/_keys.ts
+++ b/ext/node/polyfills/internal/crypto/_keys.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { kKeyObject } from "internal:deno_node/polyfills/internal/crypto/constants.ts";
+import { kKeyObject } from "internal:deno_node/internal/crypto/constants.ts";
 
 export const kKeyType = Symbol("kKeyType");
 
diff --git a/ext/node/polyfills/internal/crypto/_randomBytes.ts b/ext/node/polyfills/internal/crypto/_randomBytes.ts
index 41678fcf1..16b779a02 100644
--- a/ext/node/polyfills/internal/crypto/_randomBytes.ts
+++ b/ext/node/polyfills/internal/crypto/_randomBytes.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 export const MAX_RANDOM_VALUES = 65536;
 export const MAX_SIZE = 4294967295;
diff --git a/ext/node/polyfills/internal/crypto/_randomFill.ts b/ext/node/polyfills/internal/crypto/_randomFill.ts
index 045072696..9acff9b9b 100644
--- a/ext/node/polyfills/internal/crypto/_randomFill.ts
+++ b/ext/node/polyfills/internal/crypto/_randomFill.ts
@@ -1,8 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 import randomBytes, {
   MAX_SIZE as kMaxUint32,
-} from "internal:deno_node/polyfills/internal/crypto/_randomBytes.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+} from "internal:deno_node/internal/crypto/_randomBytes.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 const kBufferMaxLength = 0x7fffffff;
 
diff --git a/ext/node/polyfills/internal/crypto/certificate.ts b/ext/node/polyfills/internal/crypto/certificate.ts
index f6fb333a9..bfa171ad3 100644
--- a/ext/node/polyfills/internal/crypto/certificate.ts
+++ b/ext/node/polyfills/internal/crypto/certificate.ts
@@ -1,9 +1,9 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { BinaryLike } from "internal:deno_node/polyfills/internal/crypto/types.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { BinaryLike } from "internal:deno_node/internal/crypto/types.ts";
 
 export class Certificate {
   static Certificate = Certificate;
diff --git a/ext/node/polyfills/internal/crypto/cipher.ts b/ext/node/polyfills/internal/crypto/cipher.ts
index ddef00076..943783cb3 100644
--- a/ext/node/polyfills/internal/crypto/cipher.ts
+++ b/ext/node/polyfills/internal/crypto/cipher.ts
@@ -1,21 +1,21 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
+import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts";
 import {
   validateInt32,
   validateObject,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import type { TransformOptions } from "internal:deno_node/polyfills/_stream.d.ts";
-import { Transform } from "internal:deno_node/polyfills/_stream.mjs";
-import { KeyObject } from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import type { BufferEncoding } from "internal:deno_node/polyfills/_global.d.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import type { TransformOptions } from "internal:deno_node/_stream.d.ts";
+import { Transform } from "internal:deno_node/_stream.mjs";
+import { KeyObject } from "internal:deno_node/internal/crypto/keys.ts";
+import type { BufferEncoding } from "internal:deno_node/_global.d.ts";
 import type {
   BinaryLike,
   Encoding,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
 
 const { ops } = globalThis.__bootstrap.core;
 
diff --git a/ext/node/polyfills/internal/crypto/diffiehellman.ts b/ext/node/polyfills/internal/crypto/diffiehellman.ts
index eb903ccb3..6e35ebaf4 100644
--- a/ext/node/polyfills/internal/crypto/diffiehellman.ts
+++ b/ext/node/polyfills/internal/crypto/diffiehellman.ts
@@ -1,28 +1,28 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 import {
   isAnyArrayBuffer,
   isArrayBufferView,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
-import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/util/types.ts";
+import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts";
 import {
   validateInt32,
   validateString,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   getDefaultEncoding,
   toBuf,
-} from "internal:deno_node/polyfills/internal/crypto/util.ts";
+} from "internal:deno_node/internal/crypto/util.ts";
 import type {
   BinaryLike,
   BinaryToTextEncoding,
   ECDHKeyFormat,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
-import { KeyObject } from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import type { BufferEncoding } from "internal:deno_node/polyfills/_global.d.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
+import { KeyObject } from "internal:deno_node/internal/crypto/keys.ts";
+import type { BufferEncoding } from "internal:deno_node/_global.d.ts";
 
 const DH_GENERATOR = 2;
 
diff --git a/ext/node/polyfills/internal/crypto/hash.ts b/ext/node/polyfills/internal/crypto/hash.ts
index e6e2409a2..7a7c0be8e 100644
--- a/ext/node/polyfills/internal/crypto/hash.ts
+++ b/ext/node/polyfills/internal/crypto/hash.ts
@@ -5,24 +5,24 @@ import {
   TextDecoder,
   TextEncoder,
 } from "internal:deno_web/08_text_encoding.js";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { Transform } from "internal:deno_node/polyfills/stream.ts";
-import { encode as encodeToHex } from "internal:deno_node/polyfills/internal/crypto/_hex.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { Transform } from "internal:deno_node/stream.ts";
+import { encode as encodeToHex } from "internal:deno_node/internal/crypto/_hex.ts";
 import {
   forgivingBase64Encode as encodeToBase64,
   forgivingBase64UrlEncode as encodeToBase64Url,
 } from "internal:deno_web/00_infra.js";
-import type { TransformOptions } from "internal:deno_node/polyfills/_stream.d.ts";
-import { validateString } from "internal:deno_node/polyfills/internal/validators.mjs";
+import type { TransformOptions } from "internal:deno_node/_stream.d.ts";
+import { validateString } from "internal:deno_node/internal/validators.mjs";
 import type {
   BinaryToTextEncoding,
   Encoding,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
 import {
   KeyObject,
   prepareSecretKey,
-} from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+} from "internal:deno_node/internal/crypto/keys.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 
 const { ops } = globalThis.__bootstrap.core;
 
diff --git a/ext/node/polyfills/internal/crypto/hkdf.ts b/ext/node/polyfills/internal/crypto/hkdf.ts
index aebdd9152..1bd652862 100644
--- a/ext/node/polyfills/internal/crypto/hkdf.ts
+++ b/ext/node/polyfills/internal/crypto/hkdf.ts
@@ -5,28 +5,28 @@ import {
   validateFunction,
   validateInteger,
   validateString,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
+} from "internal:deno_node/internal/validators.mjs";
 import {
   ERR_INVALID_ARG_TYPE,
   ERR_OUT_OF_RANGE,
   hideStackFrames,
-} from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
 import {
   toBuf,
   validateByteSource,
-} from "internal:deno_node/polyfills/internal/crypto/util.ts";
+} from "internal:deno_node/internal/crypto/util.ts";
 import {
   createSecretKey,
   isKeyObject,
   KeyObject,
-} from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import type { BinaryLike } from "internal:deno_node/polyfills/internal/crypto/types.ts";
-import { kMaxLength } from "internal:deno_node/polyfills/internal/buffer.mjs";
+} from "internal:deno_node/internal/crypto/keys.ts";
+import type { BinaryLike } from "internal:deno_node/internal/crypto/types.ts";
+import { kMaxLength } from "internal:deno_node/internal/buffer.mjs";
 import {
   isAnyArrayBuffer,
   isArrayBufferView,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+} from "internal:deno_node/internal/util/types.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 
 const validateParameters = hideStackFrames((hash, key, salt, info, length) => {
   key = prepareKey(key);
diff --git a/ext/node/polyfills/internal/crypto/keygen.ts b/ext/node/polyfills/internal/crypto/keygen.ts
index 1a947b95b..d8cd311a9 100644
--- a/ext/node/polyfills/internal/crypto/keygen.ts
+++ b/ext/node/polyfills/internal/crypto/keygen.ts
@@ -1,13 +1,13 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { KeyObject } from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { KeyObject } from "internal:deno_node/internal/crypto/keys.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   KeyFormat,
   KeyType,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
 
 export function generateKey(
   _type: "hmac" | "aes",
diff --git a/ext/node/polyfills/internal/crypto/keys.ts b/ext/node/polyfills/internal/crypto/keys.ts
index 7c9e7bad9..9a2800e7f 100644
--- a/ext/node/polyfills/internal/crypto/keys.ts
+++ b/ext/node/polyfills/internal/crypto/keys.ts
@@ -4,30 +4,30 @@
 import {
   kHandle,
   kKeyObject,
-} from "internal:deno_node/polyfills/internal/crypto/constants.ts";
+} from "internal:deno_node/internal/crypto/constants.ts";
 import {
   ERR_CRYPTO_INVALID_KEY_OBJECT_TYPE,
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
-} from "internal:deno_node/polyfills/internal/errors.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+} from "internal:deno_node/internal/errors.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 import type {
   KeyFormat,
   KeyType,
   PrivateKeyInput,
   PublicKeyInput,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   isAnyArrayBuffer,
   isArrayBufferView,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
-import { hideStackFrames } from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/util/types.ts";
+import { hideStackFrames } from "internal:deno_node/internal/errors.ts";
 import {
   isCryptoKey as isCryptoKey_,
   isKeyObject as isKeyObject_,
   kKeyType,
-} from "internal:deno_node/polyfills/internal/crypto/_keys.ts";
+} from "internal:deno_node/internal/crypto/_keys.ts";
 
 const getArrayBufferOrView = hideStackFrames(
   (
diff --git a/ext/node/polyfills/internal/crypto/pbkdf2.ts b/ext/node/polyfills/internal/crypto/pbkdf2.ts
index a3d821ae7..efd520f76 100644
--- a/ext/node/polyfills/internal/crypto/pbkdf2.ts
+++ b/ext/node/polyfills/internal/crypto/pbkdf2.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { createHash } from "internal:deno_node/polyfills/internal/crypto/hash.ts";
-import { HASH_DATA } from "internal:deno_node/polyfills/internal/crypto/types.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { createHash } from "internal:deno_node/internal/crypto/hash.ts";
+import { HASH_DATA } from "internal:deno_node/internal/crypto/types.ts";
 
 export const MAX_ALLOC = Math.pow(2, 30) - 1;
 
diff --git a/ext/node/polyfills/internal/crypto/random.ts b/ext/node/polyfills/internal/crypto/random.ts
index 158ea40da..def9e639d 100644
--- a/ext/node/polyfills/internal/crypto/random.ts
+++ b/ext/node/polyfills/internal/crypto/random.ts
@@ -1,19 +1,19 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import randomBytes from "internal:deno_node/polyfills/internal/crypto/_randomBytes.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import randomBytes from "internal:deno_node/internal/crypto/_randomBytes.ts";
 import randomFill, {
   randomFillSync,
-} from "internal:deno_node/polyfills/internal/crypto/_randomFill.ts";
-import randomInt from "internal:deno_node/polyfills/internal/crypto/_randomInt.ts";
+} from "internal:deno_node/internal/crypto/_randomFill.ts";
+import randomInt from "internal:deno_node/internal/crypto/_randomInt.ts";
 
-export { default as randomBytes } from "internal:deno_node/polyfills/internal/crypto/_randomBytes.ts";
+export { default as randomBytes } from "internal:deno_node/internal/crypto/_randomBytes.ts";
 export {
   default as randomFill,
   randomFillSync,
-} from "internal:deno_node/polyfills/internal/crypto/_randomFill.ts";
-export { default as randomInt } from "internal:deno_node/polyfills/internal/crypto/_randomInt.ts";
+} from "internal:deno_node/internal/crypto/_randomFill.ts";
+export { default as randomInt } from "internal:deno_node/internal/crypto/_randomInt.ts";
 
 export type LargeNumberLike =
   | ArrayBufferView
diff --git a/ext/node/polyfills/internal/crypto/scrypt.ts b/ext/node/polyfills/internal/crypto/scrypt.ts
index 1bdafb63d..46afd0f8a 100644
--- a/ext/node/polyfills/internal/crypto/scrypt.ts
+++ b/ext/node/polyfills/internal/crypto/scrypt.ts
@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { pbkdf2Sync as pbkdf2 } from "internal:deno_node/polyfills/internal/crypto/pbkdf2.ts";
-import { HASH_DATA } from "internal:deno_node/polyfills/internal/crypto/types.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { pbkdf2Sync as pbkdf2 } from "internal:deno_node/internal/crypto/pbkdf2.ts";
+import { HASH_DATA } from "internal:deno_node/internal/crypto/types.ts";
 
 type Opts = Partial<{
   N: number;
diff --git a/ext/node/polyfills/internal/crypto/sig.ts b/ext/node/polyfills/internal/crypto/sig.ts
index 6c163c8e5..8c9af3b98 100644
--- a/ext/node/polyfills/internal/crypto/sig.ts
+++ b/ext/node/polyfills/internal/crypto/sig.ts
@@ -1,19 +1,19 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { validateString } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import type { WritableOptions } from "internal:deno_node/polyfills/_stream.d.ts";
-import Writable from "internal:deno_node/polyfills/internal/streams/writable.mjs";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { validateString } from "internal:deno_node/internal/validators.mjs";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import type { WritableOptions } from "internal:deno_node/_stream.d.ts";
+import Writable from "internal:deno_node/internal/streams/writable.mjs";
 import type {
   BinaryLike,
   BinaryToTextEncoding,
   Encoding,
   PrivateKeyInput,
   PublicKeyInput,
-} from "internal:deno_node/polyfills/internal/crypto/types.ts";
-import { KeyObject } from "internal:deno_node/polyfills/internal/crypto/keys.ts";
+} from "internal:deno_node/internal/crypto/types.ts";
+import { KeyObject } from "internal:deno_node/internal/crypto/keys.ts";
 
 export type DSAEncoding = "der" | "ieee-p1363";
 
diff --git a/ext/node/polyfills/internal/crypto/types.ts b/ext/node/polyfills/internal/crypto/types.ts
index 3bb9ec160..3231d378e 100644
--- a/ext/node/polyfills/internal/crypto/types.ts
+++ b/ext/node/polyfills/internal/crypto/types.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 export type HASH_DATA = string | ArrayBufferView | Buffer;
 
diff --git a/ext/node/polyfills/internal/crypto/util.ts b/ext/node/polyfills/internal/crypto/util.ts
index 8a7f7a1b6..75e8e4ea7 100644
--- a/ext/node/polyfills/internal/crypto/util.ts
+++ b/ext/node/polyfills/internal/crypto/util.ts
@@ -1,21 +1,21 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   ERR_INVALID_ARG_TYPE,
   hideStackFrames,
-} from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
 import {
   isAnyArrayBuffer,
   isArrayBufferView,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
-import { crypto as constants } from "internal:deno_node/polyfills/internal_binding/constants.ts";
+} from "internal:deno_node/internal/util/types.ts";
+import { crypto as constants } from "internal:deno_node/internal_binding/constants.ts";
 import {
   kHandle,
   kKeyObject,
-} from "internal:deno_node/polyfills/internal/crypto/constants.ts";
+} from "internal:deno_node/internal/crypto/constants.ts";
 
 // TODO(kt3k): Generate this list from `digestAlgorithms`
 // of std/crypto/_wasm/mod.ts
diff --git a/ext/node/polyfills/internal/crypto/x509.ts b/ext/node/polyfills/internal/crypto/x509.ts
index 0722d7865..4e47e1de6 100644
--- a/ext/node/polyfills/internal/crypto/x509.ts
+++ b/ext/node/polyfills/internal/crypto/x509.ts
@@ -1,12 +1,12 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { KeyObject } from "internal:deno_node/polyfills/internal/crypto/keys.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
-import { isArrayBufferView } from "internal:deno_node/polyfills/internal/util/types.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
-import { BinaryLike } from "internal:deno_node/polyfills/internal/crypto/types.ts";
+import { KeyObject } from "internal:deno_node/internal/crypto/keys.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts";
+import { isArrayBufferView } from "internal:deno_node/internal/util/types.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
+import { BinaryLike } from "internal:deno_node/internal/crypto/types.ts";
 
 // deno-lint-ignore no-explicit-any
 export type PeerCertificate = any;
diff --git a/ext/node/polyfills/internal/dgram.ts b/ext/node/polyfills/internal/dgram.ts
index 8e8e50fab..843d5a444 100644
--- a/ext/node/polyfills/internal/dgram.ts
+++ b/ext/node/polyfills/internal/dgram.ts
@@ -20,16 +20,16 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { lookup as defaultLookup } from "internal:deno_node/polyfills/dns.ts";
+import { lookup as defaultLookup } from "internal:deno_node/dns.ts";
 import {
   isInt32,
   validateFunction,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import type { ErrnoException } from "internal:deno_node/polyfills/internal/errors.ts";
-import { ERR_SOCKET_BAD_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
-import { UDP } from "internal:deno_node/polyfills/internal_binding/udp_wrap.ts";
-import { guessHandleType } from "internal:deno_node/polyfills/internal_binding/util.ts";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import type { ErrnoException } from "internal:deno_node/internal/errors.ts";
+import { ERR_SOCKET_BAD_TYPE } from "internal:deno_node/internal/errors.ts";
+import { UDP } from "internal:deno_node/internal_binding/udp_wrap.ts";
+import { guessHandleType } from "internal:deno_node/internal_binding/util.ts";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
 
 export type SocketType = "udp4" | "udp6";
 
diff --git a/ext/node/polyfills/internal/dns/promises.ts b/ext/node/polyfills/internal/dns/promises.ts
index 40f57fd2c..9eb7cd03b 100644
--- a/ext/node/polyfills/internal/dns/promises.ts
+++ b/ext/node/polyfills/internal/dns/promises.ts
@@ -25,8 +25,8 @@ import {
   validateNumber,
   validateOneOf,
   validateString,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import { isIP } from "internal:deno_node/polyfills/internal/net.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import { isIP } from "internal:deno_node/internal/net.ts";
 import {
   emitInvalidHostnameWarning,
   getDefaultResolver,
@@ -35,7 +35,7 @@ import {
   isLookupOptions,
   Resolver as CallbackResolver,
   validateHints,
-} from "internal:deno_node/polyfills/internal/dns/utils.ts";
+} from "internal:deno_node/internal/dns/utils.ts";
 import type {
   LookupAddress,
   LookupAllOptions,
@@ -44,19 +44,19 @@ import type {
   Records,
   ResolveOptions,
   ResolveWithTtlOptions,
-} from "internal:deno_node/polyfills/internal/dns/utils.ts";
+} from "internal:deno_node/internal/dns/utils.ts";
 import {
   dnsException,
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
-} from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
 import {
   ChannelWrapQuery,
   getaddrinfo,
   GetAddrInfoReqWrap,
   QueryReqWrap,
-} from "internal:deno_node/polyfills/internal_binding/cares_wrap.ts";
-import { toASCII } from "internal:deno_node/polyfills/punycode.ts";
+} from "internal:deno_node/internal_binding/cares_wrap.ts";
+import { toASCII } from "internal:deno_node/punycode.ts";
 
 function onlookup(
   this: GetAddrInfoReqWrap,
diff --git a/ext/node/polyfills/internal/dns/utils.ts b/ext/node/polyfills/internal/dns/utils.ts
index 0afd10617..238ede2a9 100644
--- a/ext/node/polyfills/internal/dns/utils.ts
+++ b/ext/node/polyfills/internal/dns/utils.ts
@@ -20,30 +20,30 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { getOptionValue } from "internal:deno_node/polyfills/internal/options.ts";
-import { emitWarning } from "internal:deno_node/polyfills/process.ts";
+import { getOptionValue } from "internal:deno_node/internal/options.ts";
+import { emitWarning } from "internal:deno_node/process.ts";
 import {
   AI_ADDRCONFIG,
   AI_ALL,
   AI_V4MAPPED,
-} from "internal:deno_node/polyfills/internal_binding/ares.ts";
+} from "internal:deno_node/internal_binding/ares.ts";
 import {
   ChannelWrap,
   strerror,
-} from "internal:deno_node/polyfills/internal_binding/cares_wrap.ts";
+} from "internal:deno_node/internal_binding/cares_wrap.ts";
 import {
   ERR_DNS_SET_SERVERS_FAILED,
   ERR_INVALID_ARG_VALUE,
   ERR_INVALID_IP_ADDRESS,
-} from "internal:deno_node/polyfills/internal/errors.ts";
-import type { ErrnoException } from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
+import type { ErrnoException } from "internal:deno_node/internal/errors.ts";
 import {
   validateArray,
   validateInt32,
   validateOneOf,
   validateString,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import { isIP } from "internal:deno_node/polyfills/internal/net.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import { isIP } from "internal:deno_node/internal/net.ts";
 
 export interface LookupOptions {
   family?: number | undefined;
diff --git a/ext/node/polyfills/internal/errors.ts b/ext/node/polyfills/internal/errors.ts
index 67f729f8d..cdc7e8afc 100644
--- a/ext/node/polyfills/internal/errors.ts
+++ b/ext/node/polyfills/internal/errors.ts
@@ -13,18 +13,18 @@
  * ERR_INVALID_PACKAGE_CONFIG // package.json stuff, probably useless
  */
 
-import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
-import { codes } from "internal:deno_node/polyfills/internal/error_codes.ts";
+import { inspect } from "internal:deno_node/internal/util/inspect.mjs";
+import { codes } from "internal:deno_node/internal/error_codes.ts";
 import {
   codeMap,
   errorMap,
   mapSysErrnoToUvErrno,
-} from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import { assert } from "internal:deno_node/polyfills/_util/asserts.ts";
-import { isWindows } from "internal:deno_node/polyfills/_util/os.ts";
-import { os as osConstants } from "internal:deno_node/polyfills/internal_binding/constants.ts";
-import { hideStackFrames } from "internal:deno_node/polyfills/internal/hide_stack_frames.ts";
-import { getSystemErrorName } from "internal:deno_node/polyfills/_utils.ts";
+} from "internal:deno_node/internal_binding/uv.ts";
+import { assert } from "internal:deno_node/_util/asserts.ts";
+import { isWindows } from "internal:deno_node/_util/os.ts";
+import { os as osConstants } from "internal:deno_node/internal_binding/constants.ts";
+import { hideStackFrames } from "internal:deno_node/internal/hide_stack_frames.ts";
+import { getSystemErrorName } from "internal:deno_node/_utils.ts";
 
 export { errorMap };
 
diff --git a/ext/node/polyfills/internal/event_target.mjs b/ext/node/polyfills/internal/event_target.mjs
index d542fba94..39e6ad925 100644
--- a/ext/node/polyfills/internal/event_target.mjs
+++ b/ext/node/polyfills/internal/event_target.mjs
@@ -6,23 +6,23 @@ import {
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_THIS,
   ERR_MISSING_ARGS,
-} from "internal:deno_node/polyfills/internal/errors.ts";
-import { validateObject, validateString } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { emitWarning } from "internal:deno_node/polyfills/process.ts";
-import { nextTick } from "internal:deno_node/polyfills/_next_tick.ts";
+} from "internal:deno_node/internal/errors.ts";
+import { validateObject, validateString } from "internal:deno_node/internal/validators.mjs";
+import { emitWarning } from "internal:deno_node/process.ts";
+import { nextTick } from "internal:deno_node/_next_tick.ts";
 import { Event as WebEvent, EventTarget as WebEventTarget } from "internal:deno_web/02_event.js";
 
 import {
   customInspectSymbol,
   kEmptyObject,
   kEnumerableProperty,
-} from "internal:deno_node/polyfills/internal/util.mjs";
-import { inspect } from "internal:deno_node/polyfills/util.ts";
+} from "internal:deno_node/internal/util.mjs";
+import { inspect } from "internal:deno_node/util.ts";
 
 const kIsEventTarget = Symbol.for("nodejs.event_target");
 const kIsNodeEventTarget = Symbol("kIsNodeEventTarget");
 
-import { EventEmitter } from "internal:deno_node/polyfills/events.ts";
+import { EventEmitter } from "internal:deno_node/events.ts";
 const {
   kMaxEventTargetListeners,
   kMaxEventTargetListenersWarned,
diff --git a/ext/node/polyfills/internal/fs/streams.d.ts b/ext/node/polyfills/internal/fs/streams.d.ts
index 9e70c2431..f5ed3b694 100644
--- a/ext/node/polyfills/internal/fs/streams.d.ts
+++ b/ext/node/polyfills/internal/fs/streams.d.ts
@@ -2,14 +2,14 @@
 // Copyright DefinitelyTyped contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file no-explicit-any
 
-import * as stream from "internal:deno_node/polyfills/_stream.d.ts";
-import * as promises from "internal:deno_node/polyfills/fs/promises.ts";
+import * as stream from "internal:deno_node/_stream.d.ts";
+import * as promises from "internal:deno_node/fs/promises.ts";
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   BufferEncoding,
   ErrnoException,
-} from "internal:deno_node/polyfills/_global.d.ts";
+} from "internal:deno_node/_global.d.ts";
 
 type PathLike = string | Buffer | URL;
 
@@ -253,7 +253,7 @@ interface ReadStreamOptions extends StreamOptions {
  * also required.
  *
  * ```js
- * import { createReadStream } from "internal:deno_node/polyfills/internal/fs/fs";
+ * import { createReadStream } from "internal:deno_node/internal/fs/fs";
  *
  * // Create a stream from some character device.
  * const stream = createReadStream('/dev/input/event0');
@@ -281,7 +281,7 @@ interface ReadStreamOptions extends StreamOptions {
  * An example to read the last 10 bytes of a file which is 100 bytes long:
  *
  * ```js
- * import { createReadStream } from "internal:deno_node/polyfills/internal/fs/fs";
+ * import { createReadStream } from "internal:deno_node/internal/fs/fs";
  *
  * createReadStream('sample.txt', { start: 90, end: 99 });
  * ```
diff --git a/ext/node/polyfills/internal/fs/streams.mjs b/ext/node/polyfills/internal/fs/streams.mjs
index 4d751df76..101ab167b 100644
--- a/ext/node/polyfills/internal/fs/streams.mjs
+++ b/ext/node/polyfills/internal/fs/streams.mjs
@@ -1,26 +1,26 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
-import { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE } from "internal:deno_node/polyfills/internal/errors.ts";
-import { kEmptyObject } from "internal:deno_node/polyfills/internal/util.mjs";
-import { deprecate } from "internal:deno_node/polyfills/util.ts";
-import { validateFunction, validateInteger } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { errorOrDestroy } from "internal:deno_node/polyfills/internal/streams/destroy.mjs";
-import { open as fsOpen } from "internal:deno_node/polyfills/_fs/_fs_open.ts";
-import { read as fsRead } from "internal:deno_node/polyfills/_fs/_fs_read.ts";
-import { write as fsWrite } from "internal:deno_node/polyfills/_fs/_fs_write.mjs";
-import { writev as fsWritev } from "internal:deno_node/polyfills/_fs/_fs_writev.mjs";
-import { close as fsClose } from "internal:deno_node/polyfills/_fs/_fs_close.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE } from "internal:deno_node/internal/errors.ts";
+import { kEmptyObject } from "internal:deno_node/internal/util.mjs";
+import { deprecate } from "internal:deno_node/util.ts";
+import { validateFunction, validateInteger } from "internal:deno_node/internal/validators.mjs";
+import { errorOrDestroy } from "internal:deno_node/internal/streams/destroy.mjs";
+import { open as fsOpen } from "internal:deno_node/_fs/_fs_open.ts";
+import { read as fsRead } from "internal:deno_node/_fs/_fs_read.ts";
+import { write as fsWrite } from "internal:deno_node/_fs/_fs_write.mjs";
+import { writev as fsWritev } from "internal:deno_node/_fs/_fs_writev.mjs";
+import { close as fsClose } from "internal:deno_node/_fs/_fs_close.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   copyObject,
   getOptions,
   getValidatedFd,
   validatePath,
-} from "internal:deno_node/polyfills/internal/fs/utils.mjs";
-import { finished, Readable, Writable } from "internal:deno_node/polyfills/stream.ts";
-import { toPathIfFileURL } from "internal:deno_node/polyfills/internal/url.ts";
-import { nextTick } from "internal:deno_node/polyfills/_next_tick.ts";
+} from "internal:deno_node/internal/fs/utils.mjs";
+import { finished, Readable, Writable } from "internal:deno_node/stream.ts";
+import { toPathIfFileURL } from "internal:deno_node/internal/url.ts";
+import { nextTick } from "internal:deno_node/_next_tick.ts";
 const kIoDone = Symbol("kIoDone");
 const kIsPerformingIO = Symbol("kIsPerformingIO");
 
diff --git a/ext/node/polyfills/internal/fs/utils.mjs b/ext/node/polyfills/internal/fs/utils.mjs
index 9d74c5eee..567212e17 100644
--- a/ext/node/polyfills/internal/fs/utils.mjs
+++ b/ext/node/polyfills/internal/fs/utils.mjs
@@ -1,7 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 "use strict";
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   ERR_FS_EISDIR,
   ERR_FS_INVALID_SYMLINK_TYPE,
@@ -10,17 +10,17 @@ import {
   ERR_OUT_OF_RANGE,
   hideStackFrames,
   uvException,
-} from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal/errors.ts";
 
 import {
   isArrayBufferView,
   isBigUint64Array,
   isDate,
   isUint8Array,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
-import { once } from "internal:deno_node/polyfills/internal/util.mjs";
-import { deprecate } from "internal:deno_node/polyfills/util.ts";
-import { toPathIfFileURL } from "internal:deno_node/polyfills/internal/url.ts";
+} from "internal:deno_node/internal/util/types.ts";
+import { once } from "internal:deno_node/internal/util.mjs";
+import { deprecate } from "internal:deno_node/util.ts";
+import { toPathIfFileURL } from "internal:deno_node/internal/url.ts";
 import {
   validateAbortSignal,
   validateBoolean,
@@ -29,20 +29,20 @@ import {
   validateInteger,
   validateObject,
   validateUint32,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import pathModule from "internal:deno_node/polyfills/path.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import pathModule from "internal:deno_node/path.ts";
 const kType = Symbol("type");
 const kStats = Symbol("stats");
-import assert from "internal:deno_node/polyfills/internal/assert.mjs";
-import { lstat, lstatSync } from "internal:deno_node/polyfills/_fs/_fs_lstat.ts";
-import { stat, statSync } from "internal:deno_node/polyfills/_fs/_fs_stat.ts";
-import { isWindows } from "internal:deno_node/polyfills/_util/os.ts";
-import process from "internal:deno_node/polyfills/process.ts";
+import assert from "internal:deno_node/internal/assert.mjs";
+import { lstat, lstatSync } from "internal:deno_node/_fs/_fs_lstat.ts";
+import { stat, statSync } from "internal:deno_node/_fs/_fs_stat.ts";
+import { isWindows } from "internal:deno_node/_util/os.ts";
+import process from "internal:deno_node/process.ts";
 
 import {
   fs as fsConstants,
   os as osConstants,
-} from "internal:deno_node/polyfills/internal_binding/constants.ts";
+} from "internal:deno_node/internal_binding/constants.ts";
 const {
   F_OK = 0,
   W_OK = 0,
diff --git a/ext/node/polyfills/internal/http.ts b/ext/node/polyfills/internal/http.ts
index f541039dc..136ebca32 100644
--- a/ext/node/polyfills/internal/http.ts
+++ b/ext/node/polyfills/internal/http.ts
@@ -1,8 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
-import { setUnrefTimeout } from "internal:deno_node/polyfills/timers.ts";
-import { notImplemented } from "internal:deno_node/polyfills/_utils.ts";
+import { setUnrefTimeout } from "internal:deno_node/timers.ts";
+import { notImplemented } from "internal:deno_node/_utils.ts";
 
 let utcCache: string | undefined;
 
diff --git a/ext/node/polyfills/internal/net.ts b/ext/node/polyfills/internal/net.ts
index 2e3a92dfd..48b1f5f25 100644
--- a/ext/node/polyfills/internal/net.ts
+++ b/ext/node/polyfills/internal/net.ts
@@ -20,9 +20,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { uvException } from "internal:deno_node/polyfills/internal/errors.ts";
-import { writeBuffer } from "internal:deno_node/polyfills/internal_binding/node_file.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { uvException } from "internal:deno_node/internal/errors.ts";
+import { writeBuffer } from "internal:deno_node/internal_binding/node_file.ts";
 
 // IPv4 Segment
 const v4Seg = "(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])";
diff --git a/ext/node/polyfills/internal/options.ts b/ext/node/polyfills/internal/options.ts
index 68ccf0528..da0368b07 100644
--- a/ext/node/polyfills/internal/options.ts
+++ b/ext/node/polyfills/internal/options.ts
@@ -20,7 +20,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { getOptions } from "internal:deno_node/polyfills/internal_binding/node_options.ts";
+import { getOptions } from "internal:deno_node/internal_binding/node_options.ts";
 
 let optionsMap: Map<string, { value: string }>;
 
diff --git a/ext/node/polyfills/internal/querystring.ts b/ext/node/polyfills/internal/querystring.ts
index c00803afe..c736d2e3c 100644
--- a/ext/node/polyfills/internal/querystring.ts
+++ b/ext/node/polyfills/internal/querystring.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { ERR_INVALID_URI } from "internal:deno_node/polyfills/internal/errors.ts";
+import { ERR_INVALID_URI } from "internal:deno_node/internal/errors.ts";
 
 export const hexTable = new Array(256);
 for (let i = 0; i < 256; ++i) {
diff --git a/ext/node/polyfills/internal/readline/callbacks.mjs b/ext/node/polyfills/internal/readline/callbacks.mjs
index 3be88c899..09f686013 100644
--- a/ext/node/polyfills/internal/readline/callbacks.mjs
+++ b/ext/node/polyfills/internal/readline/callbacks.mjs
@@ -22,11 +22,11 @@
 
 "use strict";
 
-import { ERR_INVALID_ARG_VALUE, ERR_INVALID_CURSOR_POS } from "internal:deno_node/polyfills/internal/errors.ts";
+import { ERR_INVALID_ARG_VALUE, ERR_INVALID_CURSOR_POS } from "internal:deno_node/internal/errors.ts";
 
-import { validateFunction } from "internal:deno_node/polyfills/internal/validators.mjs";
+import { validateFunction } from "internal:deno_node/internal/validators.mjs";
 
-import { CSI } from "internal:deno_node/polyfills/internal/readline/utils.mjs";
+import { CSI } from "internal:deno_node/internal/readline/utils.mjs";
 
 const {
   kClearLine,
diff --git a/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs b/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs
index 7f68dac47..4c6dfa522 100644
--- a/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs
+++ b/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs
@@ -20,15 +20,15 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { charLengthAt, CSI, emitKeys } from "internal:deno_node/polyfills/internal/readline/utils.mjs";
-import { kSawKeyPress } from "internal:deno_node/polyfills/internal/readline/symbols.mjs";
-import { clearTimeout, setTimeout } from "internal:deno_node/polyfills/timers.ts";
+import { charLengthAt, CSI, emitKeys } from "internal:deno_node/internal/readline/utils.mjs";
+import { kSawKeyPress } from "internal:deno_node/internal/readline/symbols.mjs";
+import { clearTimeout, setTimeout } from "internal:deno_node/timers.ts";
 
 const {
   kEscape,
 } = CSI;
 
-import { StringDecoder } from "internal:deno_node/polyfills/string_decoder.ts";
+import { StringDecoder } from "internal:deno_node/string_decoder.ts";
 
 const KEYPRESS_DECODER = Symbol("keypress-decoder");
 const ESCAPE_DECODER = Symbol("escape-decoder");
diff --git a/ext/node/polyfills/internal/readline/interface.mjs b/ext/node/polyfills/internal/readline/interface.mjs
index 41d05fbf2..d8191557f 100644
--- a/ext/node/polyfills/internal/readline/interface.mjs
+++ b/ext/node/polyfills/internal/readline/interface.mjs
@@ -22,30 +22,30 @@
 
 // deno-lint-ignore-file camelcase no-inner-declarations no-this-alias
 
-import { ERR_INVALID_ARG_VALUE, ERR_USE_AFTER_CLOSE } from "internal:deno_node/polyfills/internal/errors.ts";
+import { ERR_INVALID_ARG_VALUE, ERR_USE_AFTER_CLOSE } from "internal:deno_node/internal/errors.ts";
 import {
   validateAbortSignal,
   validateArray,
   validateString,
   validateUint32,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
+} from "internal:deno_node/internal/validators.mjs";
 import {
   //   inspect,
   getStringWidth,
   stripVTControlCharacters,
-} from "internal:deno_node/polyfills/internal/util/inspect.mjs";
-import EventEmitter from "internal:deno_node/polyfills/events.ts";
-import { emitKeypressEvents } from "internal:deno_node/polyfills/internal/readline/emitKeypressEvents.mjs";
+} from "internal:deno_node/internal/util/inspect.mjs";
+import EventEmitter from "internal:deno_node/events.ts";
+import { emitKeypressEvents } from "internal:deno_node/internal/readline/emitKeypressEvents.mjs";
 import {
   charLengthAt,
   charLengthLeft,
   commonPrefix,
   kSubstringSearch,
-} from "internal:deno_node/polyfills/internal/readline/utils.mjs";
-import { clearScreenDown, cursorTo, moveCursor } from "internal:deno_node/polyfills/internal/readline/callbacks.mjs";
-import { Readable } from "internal:deno_node/polyfills/_stream.mjs";
+} from "internal:deno_node/internal/readline/utils.mjs";
+import { clearScreenDown, cursorTo, moveCursor } from "internal:deno_node/internal/readline/callbacks.mjs";
+import { Readable } from "internal:deno_node/_stream.mjs";
 
-import { StringDecoder } from "internal:deno_node/polyfills/string_decoder.ts";
+import { StringDecoder } from "internal:deno_node/string_decoder.ts";
 import {
   kAddHistory,
   kDecoder,
@@ -78,7 +78,7 @@ import {
   kWordLeft,
   kWordRight,
   kWriteToOutput,
-} from "internal:deno_node/polyfills/internal/readline/symbols.mjs";
+} from "internal:deno_node/internal/readline/symbols.mjs";
 
 const kHistorySize = 30;
 const kMincrlfDelay = 100;
diff --git a/ext/node/polyfills/internal/readline/promises.mjs b/ext/node/polyfills/internal/readline/promises.mjs
index 36aa3de12..81677172a 100644
--- a/ext/node/polyfills/internal/readline/promises.mjs
+++ b/ext/node/polyfills/internal/readline/promises.mjs
@@ -1,12 +1,12 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and other Node contributors.
 
-import { ArrayPrototypeJoin, ArrayPrototypePush } from "internal:deno_node/polyfills/internal/primordials.mjs";
+import { ArrayPrototypeJoin, ArrayPrototypePush } from "internal:deno_node/internal/primordials.mjs";
 
-import { CSI } from "internal:deno_node/polyfills/internal/readline/utils.mjs";
-import { validateBoolean, validateInteger } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { isWritable } from "internal:deno_node/polyfills/internal/streams/utils.mjs";
-import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
+import { CSI } from "internal:deno_node/internal/readline/utils.mjs";
+import { validateBoolean, validateInteger } from "internal:deno_node/internal/validators.mjs";
+import { isWritable } from "internal:deno_node/internal/streams/utils.mjs";
+import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts";
 
 const {
   kClearToLineBeginning,
diff --git a/ext/node/polyfills/internal/stream_base_commons.ts b/ext/node/polyfills/internal/stream_base_commons.ts
index dd1c74d0f..6dccc1354 100644
--- a/ext/node/polyfills/internal/stream_base_commons.ts
+++ b/ext/node/polyfills/internal/stream_base_commons.ts
@@ -20,7 +20,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { ownerSymbol } from "internal:deno_node/polyfills/internal/async_hooks.ts";
+import { ownerSymbol } from "internal:deno_node/internal/async_hooks.ts";
 import {
   kArrayBufferOffset,
   kBytesWritten,
@@ -28,17 +28,17 @@ import {
   LibuvStreamWrap,
   streamBaseState,
   WriteWrap,
-} from "internal:deno_node/polyfills/internal_binding/stream_wrap.ts";
-import { isUint8Array } from "internal:deno_node/polyfills/internal/util/types.ts";
-import { errnoException } from "internal:deno_node/polyfills/internal/errors.ts";
+} from "internal:deno_node/internal_binding/stream_wrap.ts";
+import { isUint8Array } from "internal:deno_node/internal/util/types.ts";
+import { errnoException } from "internal:deno_node/internal/errors.ts";
 import {
   getTimerDuration,
   kTimeout,
-} from "internal:deno_node/polyfills/internal/timers.mjs";
-import { setUnrefTimeout } from "internal:deno_node/polyfills/timers.ts";
-import { validateFunction } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { codeMap } from "internal:deno_node/polyfills/internal_binding/uv.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+} from "internal:deno_node/internal/timers.mjs";
+import { setUnrefTimeout } from "internal:deno_node/timers.ts";
+import { validateFunction } from "internal:deno_node/internal/validators.mjs";
+import { codeMap } from "internal:deno_node/internal_binding/uv.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 export const kMaybeDestroy = Symbol("kMaybeDestroy");
 export const kUpdateTimer = Symbol("kUpdateTimer");
diff --git a/ext/node/polyfills/internal/streams/add-abort-signal.mjs b/ext/node/polyfills/internal/streams/add-abort-signal.mjs
index 5d7512f1c..501c20315 100644
--- a/ext/node/polyfills/internal/streams/add-abort-signal.mjs
+++ b/ext/node/polyfills/internal/streams/add-abort-signal.mjs
@@ -2,8 +2,8 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { AbortError, ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts";
-import eos from "internal:deno_node/polyfills/internal/streams/end-of-stream.mjs";
+import { AbortError, ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts";
+import eos from "internal:deno_node/internal/streams/end-of-stream.mjs";
 
 // This method is inlined here for readable-stream
 // It also does not allow for signal to not exist on the stream
diff --git a/ext/node/polyfills/internal/streams/buffer_list.mjs b/ext/node/polyfills/internal/streams/buffer_list.mjs
index 3016ffba5..546b48a61 100644
--- a/ext/node/polyfills/internal/streams/buffer_list.mjs
+++ b/ext/node/polyfills/internal/streams/buffer_list.mjs
@@ -2,8 +2,8 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
-import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
+import { Buffer } from "internal:deno_node/buffer.ts";
+import { inspect } from "internal:deno_node/internal/util/inspect.mjs";
 
 class BufferList {
   constructor() {
diff --git a/ext/node/polyfills/internal/streams/destroy.mjs b/ext/node/polyfills/internal/streams/destroy.mjs
index b065f2119..c4e5c0bb0 100644
--- a/ext/node/polyfills/internal/streams/destroy.mjs
+++ b/ext/node/polyfills/internal/streams/destroy.mjs
@@ -2,8 +2,8 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { aggregateTwoErrors, ERR_MULTIPLE_CALLBACK } from "internal:deno_node/polyfills/internal/errors.ts";
-import * as process from "internal:deno_node/polyfills/_process/process.ts";
+import { aggregateTwoErrors, ERR_MULTIPLE_CALLBACK } from "internal:deno_node/internal/errors.ts";
+import * as process from "internal:deno_node/_process/process.ts";
 
 const kDestroy = Symbol("kDestroy");
 const kConstruct = Symbol("kConstruct");
diff --git a/ext/node/polyfills/internal/streams/duplex.mjs b/ext/node/polyfills/internal/streams/duplex.mjs
index b2086d467..df62f764d 100644
--- a/ext/node/polyfills/internal/streams/duplex.mjs
+++ b/ext/node/polyfills/internal/streams/duplex.mjs
@@ -2,7 +2,7 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { Duplex } from "internal:deno_node/polyfills/_stream.mjs";
+import { Duplex } from "internal:deno_node/_stream.mjs";
 const { from, fromWeb, toWeb } = Duplex;
 
 export default Duplex;
diff --git a/ext/node/polyfills/internal/streams/end-of-stream.mjs b/ext/node/polyfills/internal/streams/end-of-stream.mjs
index b5c380d56..9c9e40cc2 100644
--- a/ext/node/polyfills/internal/streams/end-of-stream.mjs
+++ b/ext/node/polyfills/internal/streams/end-of-stream.mjs
@@ -2,14 +2,14 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { AbortError, ERR_STREAM_PREMATURE_CLOSE } from "internal:deno_node/polyfills/internal/errors.ts";
-import { once } from "internal:deno_node/polyfills/internal/util.mjs";
+import { AbortError, ERR_STREAM_PREMATURE_CLOSE } from "internal:deno_node/internal/errors.ts";
+import { once } from "internal:deno_node/internal/util.mjs";
 import {
   validateAbortSignal,
   validateFunction,
   validateObject,
-} from "internal:deno_node/polyfills/internal/validators.mjs";
-import * as process from "internal:deno_node/polyfills/_process/process.ts";
+} from "internal:deno_node/internal/validators.mjs";
+import * as process from "internal:deno_node/_process/process.ts";
 
 function isRequest(stream) {
   return stream.setHeader && typeof stream.abort === "function";
diff --git a/ext/node/polyfills/internal/streams/lazy_transform.mjs b/ext/node/polyfills/internal/streams/lazy_transform.mjs
index 2bb93bd91..40ddefea9 100644
--- a/ext/node/polyfills/internal/streams/lazy_transform.mjs
+++ b/ext/node/polyfills/internal/streams/lazy_transform.mjs
@@ -2,8 +2,8 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { getDefaultEncoding } from "internal:deno_node/polyfills/internal/crypto/util.ts";
-import stream from "internal:deno_node/polyfills/stream.ts";
+import { getDefaultEncoding } from "internal:deno_node/internal/crypto/util.ts";
+import stream from "internal:deno_node/stream.ts";
 
 function LazyTransform(options) {
   this._options = options;
diff --git a/ext/node/polyfills/internal/streams/legacy.mjs b/ext/node/polyfills/internal/streams/legacy.mjs
index 0de18956f..bb2d30bc4 100644
--- a/ext/node/polyfills/internal/streams/legacy.mjs
+++ b/ext/node/polyfills/internal/streams/legacy.mjs
@@ -2,7 +2,7 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import EE from "internal:deno_node/polyfills/events.ts";
+import EE from "internal:deno_node/events.ts";
 
 function Stream(opts) {
   EE.call(this, opts);
diff --git a/ext/node/polyfills/internal/streams/passthrough.mjs b/ext/node/polyfills/internal/streams/passthrough.mjs
index 136a0484a..dbaa9b215 100644
--- a/ext/node/polyfills/internal/streams/passthrough.mjs
+++ b/ext/node/polyfills/internal/streams/passthrough.mjs
@@ -2,6 +2,6 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { PassThrough } from "internal:deno_node/polyfills/_stream.mjs";
+import { PassThrough } from "internal:deno_node/_stream.mjs";
 
 export default PassThrough;
diff --git a/ext/node/polyfills/internal/streams/readable.mjs b/ext/node/polyfills/internal/streams/readable.mjs
index 36133d297..d9e45f4c2 100644
--- a/ext/node/polyfills/internal/streams/readable.mjs
+++ b/ext/node/polyfills/internal/streams/readable.mjs
@@ -2,7 +2,7 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { Readable } from "internal:deno_node/polyfills/_stream.mjs";
+import { Readable } from "internal:deno_node/_stream.mjs";
 const { ReadableState, _fromList, from, fromWeb, toWeb, wrap } = Readable;
 
 export default Readable;
diff --git a/ext/node/polyfills/internal/streams/transform.mjs b/ext/node/polyfills/internal/streams/transform.mjs
index 3fc4fa5cd..53e841dd0 100644
--- a/ext/node/polyfills/internal/streams/transform.mjs
+++ b/ext/node/polyfills/internal/streams/transform.mjs
@@ -2,6 +2,6 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { Transform } from "internal:deno_node/polyfills/_stream.mjs";
+import { Transform } from "internal:deno_node/_stream.mjs";
 
 export default Transform;
diff --git a/ext/node/polyfills/internal/streams/writable.mjs b/ext/node/polyfills/internal/streams/writable.mjs
index 6f4d77960..308009bce 100644
--- a/ext/node/polyfills/internal/streams/writable.mjs
+++ b/ext/node/polyfills/internal/streams/writable.mjs
@@ -2,7 +2,7 @@
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
-import { Writable } from "internal:deno_node/polyfills/_stream.mjs";
+import { Writable } from "internal:deno_node/_stream.mjs";
 const { WritableState, fromWeb, toWeb } = Writable;
 
 export default Writable;
diff --git a/ext/node/polyfills/internal/test/binding.ts b/ext/node/polyfills/internal/test/binding.ts
index 996cc57aa..86d10f2f8 100644
--- a/ext/node/polyfills/internal/test/binding.ts
+++ b/ext/node/polyfills/internal/test/binding.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
-import { getBinding } from "internal:deno_node/polyfills/internal_binding/mod.ts";
-import type { BindingName } from "internal:deno_node/polyfills/internal_binding/mod.ts";
+import { getBinding } from "internal:deno_node/internal_binding/mod.ts";
+import type { BindingName } from "internal:deno_node/internal_binding/mod.ts";
 
 export function internalBinding(name: BindingName) {
   return getBinding(name);
diff --git a/ext/node/polyfills/internal/timers.mjs b/ext/node/polyfills/internal/timers.mjs
index 6796885ce..bece251de 100644
--- a/ext/node/polyfills/internal/timers.mjs
+++ b/ext/node/polyfills/internal/timers.mjs
@@ -1,10 +1,10 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
-import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
-import { validateFunction, validateNumber } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { ERR_OUT_OF_RANGE } from "internal:deno_node/polyfills/internal/errors.ts";
-import { emitWarning } from "internal:deno_node/polyfills/process.ts";
+import { inspect } from "internal:deno_node/internal/util/inspect.mjs";
+import { validateFunction, validateNumber } from "internal:deno_node/internal/validators.mjs";
+import { ERR_OUT_OF_RANGE } from "internal:deno_node/internal/errors.ts";
+import { emitWarning } from "internal:deno_node/process.ts";
 import {
   setTimeout as setTimeout_,
   clearTimeout as clearTimeout_,
diff --git a/ext/node/polyfills/internal/url.ts b/ext/node/polyfills/internal/url.ts
index 415ad9be6..3259fb9fa 100644
--- a/ext/node/polyfills/internal/url.ts
+++ b/ext/node/polyfills/internal/url.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { fileURLToPath } from "internal:deno_node/polyfills/url.ts";
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { fileURLToPath } from "internal:deno_node/url.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 
 const searchParams = Symbol("query");
 
diff --git a/ext/node/polyfills/internal/util.mjs b/ext/node/polyfills/internal/util.mjs
index ba26c6a6a..114af0c0b 100644
--- a/ext/node/polyfills/internal/util.mjs
+++ b/ext/node/polyfills/internal/util.mjs
@@ -1,10 +1,10 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { validateFunction } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { normalizeEncoding, slowCases } from "internal:deno_node/polyfills/internal/normalize_encoding.mjs";
+import { validateFunction } from "internal:deno_node/internal/validators.mjs";
+import { normalizeEncoding, slowCases } from "internal:deno_node/internal/normalize_encoding.mjs";
 export { normalizeEncoding, slowCases };
-import { ObjectCreate, StringPrototypeToUpperCase } from "internal:deno_node/polyfills/internal/primordials.mjs";
-import { ERR_UNKNOWN_SIGNAL } from "internal:deno_node/polyfills/internal/errors.ts";
-import { os } from "internal:deno_node/polyfills/internal_binding/constants.ts";
+import { ObjectCreate, StringPrototypeToUpperCase } from "internal:deno_node/internal/primordials.mjs";
+import { ERR_UNKNOWN_SIGNAL } from "internal:deno_node/internal/errors.ts";
+import { os } from "internal:deno_node/internal_binding/constants.ts";
 
 export const customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
 export const kEnumerableProperty = Object.create(null);
diff --git a/ext/node/polyfills/internal/util/comparisons.ts b/ext/node/polyfills/internal/util/comparisons.ts
index 1620e468b..3f76089f3 100644
--- a/ext/node/polyfills/internal/util/comparisons.ts
+++ b/ext/node/polyfills/internal/util/comparisons.ts
@@ -19,14 +19,14 @@ import {
   isStringObject,
   isSymbolObject,
   isTypedArray,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
+} from "internal:deno_node/internal/util/types.ts";
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   getOwnNonIndexProperties,
   ONLY_ENUMERABLE,
   SKIP_SYMBOLS,
-} from "internal:deno_node/polyfills/internal_binding/util.ts";
+} from "internal:deno_node/internal_binding/util.ts";
 
 enum valueType {
   noIterator,
diff --git a/ext/node/polyfills/internal/util/debuglog.ts b/ext/node/polyfills/internal/util/debuglog.ts
index 498facbd1..0ae0820bb 100644
--- a/ext/node/polyfills/internal/util/debuglog.ts
+++ b/ext/node/polyfills/internal/util/debuglog.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
-import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
+import { inspect } from "internal:deno_node/internal/util/inspect.mjs";
 
 // `debugImpls` and `testEnabled` are deliberately not initialized so any call
 // to `debuglog()` before `initializeDebugEnv()` is called will throw.
diff --git a/ext/node/polyfills/internal/util/inspect.mjs b/ext/node/polyfills/internal/util/inspect.mjs
index 53a878aa3..424773f9a 100644
--- a/ext/node/polyfills/internal/util/inspect.mjs
+++ b/ext/node/polyfills/internal/util/inspect.mjs
@@ -20,15 +20,15 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import * as types from "internal:deno_node/polyfills/internal/util/types.ts";
-import { validateObject, validateString } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { codes } from "internal:deno_node/polyfills/internal/error_codes.ts";
+import * as types from "internal:deno_node/internal/util/types.ts";
+import { validateObject, validateString } from "internal:deno_node/internal/validators.mjs";
+import { codes } from "internal:deno_node/internal/error_codes.ts";
 
 import {
   ALL_PROPERTIES,
   getOwnNonIndexProperties,
   ONLY_ENUMERABLE,
-} from "internal:deno_node/polyfills/internal_binding/util.ts";
+} from "internal:deno_node/internal_binding/util.ts";
 
 const kObjectType = 0;
 const kArrayType = 1;
diff --git a/ext/node/polyfills/internal/util/types.ts b/ext/node/polyfills/internal/util/types.ts
index 299493bc9..0bbf92547 100644
--- a/ext/node/polyfills/internal/util/types.ts
+++ b/ext/node/polyfills/internal/util/types.ts
@@ -21,11 +21,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import * as bindingTypes from "internal:deno_node/polyfills/internal_binding/types.ts";
+import * as bindingTypes from "internal:deno_node/internal_binding/types.ts";
 export {
   isCryptoKey,
   isKeyObject,
-} from "internal:deno_node/polyfills/internal/crypto/_keys.ts";
+} from "internal:deno_node/internal/crypto/_keys.ts";
 
 // https://tc39.es/ecma262/#sec-get-%typedarray%.prototype-@@tostringtag
 const _getTypedArrayToStringTag = Object.getOwnPropertyDescriptor(
diff --git a/ext/node/polyfills/internal/validators.mjs b/ext/node/polyfills/internal/validators.mjs
index bea9e881a..6fffb4678 100644
--- a/ext/node/polyfills/internal/validators.mjs
+++ b/ext/node/polyfills/internal/validators.mjs
@@ -1,10 +1,10 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
-import { codes } from "internal:deno_node/polyfills/internal/error_codes.ts";
-import { hideStackFrames } from "internal:deno_node/polyfills/internal/hide_stack_frames.ts";
-import { isArrayBufferView } from "internal:deno_node/polyfills/internal/util/types.ts";
-import { normalizeEncoding } from "internal:deno_node/polyfills/internal/normalize_encoding.mjs";
+import { codes } from "internal:deno_node/internal/error_codes.ts";
+import { hideStackFrames } from "internal:deno_node/internal/hide_stack_frames.ts";
+import { isArrayBufferView } from "internal:deno_node/internal/util/types.ts";
+import { normalizeEncoding } from "internal:deno_node/internal/normalize_encoding.mjs";
 
 /**
  * @param {number} value