diff --git a/.eslintrc.json b/.eslintrc.json
index 628193dac..e3d430edf 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -47,6 +47,8 @@
                 "@typescript-eslint/no-non-null-assertion": "warn",
                 "@typescript-eslint/no-explicit-any": "warn",
                 "@typescript-eslint/explicit-function-return-type": "error",
+                "@typescript-eslint/no-duplicate-imports": "error",
+                "@typescript-eslint/consistent-type-imports": "error",
 
                 "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
             }
diff --git a/bench/memory/sax-parser.js b/bench/memory/sax-parser.js
index c7e5526b1..0460035ee 100644
--- a/bench/memory/sax-parser.js
+++ b/bench/memory/sax-parser.js
@@ -1,7 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import format from 'human-format';
 import memwatch from '@airbnb/node-memwatch';
-import { SAXParser } from 'parse5-sax-parser/dist/index.js';
+import { SAXParser } from '../../packages/parse5-sax-parser/dist/index.js';
 import { finished } from 'parse5-test-utils/dist/common.js';
 
 main();
diff --git a/packages/parse5-html-rewriting-stream/lib/index.ts b/packages/parse5-html-rewriting-stream/lib/index.ts
index ebbb1660d..a2700e415 100644
--- a/packages/parse5-html-rewriting-stream/lib/index.ts
+++ b/packages/parse5-html-rewriting-stream/lib/index.ts
@@ -1,7 +1,14 @@
+import { html, type Token } from 'parse5';
+import {
+    SAXParser,
+    type EndTag,
+    type StartTag,
+    type Doctype,
+    type Text,
+    type Comment,
+    type SaxToken,
+} from 'parse5-sax-parser';
 import { escapeText, escapeAttribute } from 'entities';
-import type { Location } from 'parse5/dist/common/token.js';
-import { SAXParser, EndTag, StartTag, Doctype, Text, Comment, SaxToken } from 'parse5-sax-parser';
-import { hasUnescapedText } from 'parse5/dist/serializer/index.js';
 
 /**
  * Streaming [SAX](https://en.wikipedia.org/wiki/Simple_API_for_XML)-style HTML rewriter.
@@ -65,7 +72,7 @@ export class RewritingStream extends SAXParser {
         return '';
     }
 
-    private _getRawHtml(location: Location): string {
+    private _getRawHtml(location: Token.Location): string {
         const { droppedBufferSize, html } = this.tokenizer.preprocessor;
         const start = location.startOffset - droppedBufferSize;
         const end = location.endOffset - droppedBufferSize;
@@ -130,7 +137,8 @@ export class RewritingStream extends SAXParser {
     /** Emits a serialized text token into the output stream. */
     public emitText({ text }: Text): void {
         this.push(
-            !this.parserFeedbackSimulator.inForeignContent && hasUnescapedText(this.tokenizer.lastStartTagName, true)
+            !this.parserFeedbackSimulator.inForeignContent &&
+                html.hasUnescapedText(this.tokenizer.lastStartTagName, true)
                 ? text
                 : escapeText(text)
         );
diff --git a/packages/parse5-html-rewriting-stream/package.json b/packages/parse5-html-rewriting-stream/package.json
index f9fd05121..9a1f3b045 100644
--- a/packages/parse5-html-rewriting-stream/package.json
+++ b/packages/parse5-html-rewriting-stream/package.json
@@ -18,7 +18,9 @@
     ],
     "license": "MIT",
     "main": "dist/index.js",
-    "exports": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": "./dist/index.js",
     "dependencies": {
         "entities": "^4.2.0",
         "parse5": "^6.0.1",
diff --git a/packages/parse5-html-rewriting-stream/test/rewriting-stream.test.ts b/packages/parse5-html-rewriting-stream/test/rewriting-stream.test.ts
index 202c96860..5c7892a61 100644
--- a/packages/parse5-html-rewriting-stream/test/rewriting-stream.test.ts
+++ b/packages/parse5-html-rewriting-stream/test/rewriting-stream.test.ts
@@ -2,8 +2,12 @@ import * as assert from 'node:assert';
 import { outdent } from 'outdent';
 import { RewritingStream } from '../lib/index.js';
 import { loadSAXParserTestData } from 'parse5-test-utils/utils/load-sax-parser-test-data.js';
-import { getStringDiffMsg, writeChunkedToStream, WritableStreamStub } from 'parse5-test-utils/utils/common.js';
-import { finished } from 'parse5-test-utils/utils/common.js';
+import {
+    finished,
+    getStringDiffMsg,
+    writeChunkedToStream,
+    WritableStreamStub,
+} from 'parse5-test-utils/utils/common.js';
 
 const srcHtml = outdent`
   <!DOCTYPE html "">
diff --git a/packages/parse5-htmlparser2-tree-adapter/lib/index.ts b/packages/parse5-htmlparser2-tree-adapter/lib/index.ts
index 3fd3d9254..6f6d08df5 100644
--- a/packages/parse5-htmlparser2-tree-adapter/lib/index.ts
+++ b/packages/parse5-htmlparser2-tree-adapter/lib/index.ts
@@ -1,10 +1,7 @@
-import * as doctype from 'parse5/dist/common/doctype.js';
-import { DOCUMENT_MODE, NAMESPACES as NS } from 'parse5/dist/common/html.js';
-import type { Attribute, ElementLocation } from 'parse5/dist/common/token.js';
-import type { TreeAdapter, TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
+import { type TreeAdapterTypeMap, type TreeAdapter, type Token, html } from 'parse5';
 import {
-    Node,
-    NodeWithChildren,
+    type Node,
+    type NodeWithChildren,
     Element,
     Document,
     ProcessingInstruction,
@@ -33,6 +30,33 @@ function createTextNode(value: string): Text {
     return new Text(value);
 }
 
+function enquoteDoctypeId(id: string): string {
+    const quote = id.includes('"') ? "'" : '"';
+
+    return quote + id + quote;
+}
+
+/** @internal */
+export function serializeDoctypeContent(name: string, publicId: string, systemId: string): string {
+    let str = '!DOCTYPE ';
+
+    if (name) {
+        str += name;
+    }
+
+    if (publicId) {
+        str += ` PUBLIC ${enquoteDoctypeId(publicId)}`;
+    } else if (systemId) {
+        str += ' SYSTEM';
+    }
+
+    if (systemId) {
+        str += ` ${enquoteDoctypeId(systemId)}`;
+    }
+
+    return str;
+}
+
 export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
     // Re-exports from domhandler
     isCommentNode: isComment,
@@ -42,7 +66,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
     //Node construction
     createDocument(): Document {
         const node = new Document([]);
-        node['x-mode'] = DOCUMENT_MODE.NO_QUIRKS;
+        node['x-mode'] = html.DOCUMENT_MODE.NO_QUIRKS;
         return node;
     },
 
@@ -50,7 +74,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         return new Document([]);
     },
 
-    createElement(tagName: string, namespaceURI: NS, attrs: Attribute[]): Element {
+    createElement(tagName: string, namespaceURI: html.NS, attrs: Token.Attribute[]): Element {
         const attribs = Object.create(null);
         const attribsNamespace = Object.create(null);
         const attribsPrefix = Object.create(null);
@@ -112,7 +136,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
     },
 
     setDocumentType(document: Document, name: string, publicId: string, systemId: string): void {
-        const data = doctype.serializeContent(name, publicId, systemId);
+        const data = serializeDoctypeContent(name, publicId, systemId);
         let doctypeNode = document.children.find(
             (node): node is ProcessingInstruction => isDirective(node) && node.name === '!doctype'
         );
@@ -129,12 +153,12 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         doctypeNode['x-systemId'] = systemId ?? undefined;
     },
 
-    setDocumentMode(document: Document, mode: DOCUMENT_MODE): void {
+    setDocumentMode(document: Document, mode: html.DOCUMENT_MODE): void {
         document['x-mode'] = mode;
     },
 
-    getDocumentMode(document: Document): DOCUMENT_MODE {
-        return document['x-mode'] as DOCUMENT_MODE;
+    getDocumentMode(document: Document): html.DOCUMENT_MODE {
+        return document['x-mode'] as html.DOCUMENT_MODE;
     },
 
     detachNode(node: Node): void {
@@ -178,7 +202,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         }
     },
 
-    adoptAttributes(recipient: Element, attrs: Attribute[]): void {
+    adoptAttributes(recipient: Element, attrs: Token.Attribute[]): void {
         for (let i = 0; i < attrs.length; i++) {
             const attrName = attrs[i].name;
 
@@ -203,7 +227,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         return node.parent;
     },
 
-    getAttrList(element: Element): Attribute[] {
+    getAttrList(element: Element): Token.Attribute[] {
         return element.attributes;
     },
 
@@ -212,8 +236,8 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         return element.name;
     },
 
-    getNamespaceURI(element: Element): NS {
-        return element.namespace as NS;
+    getNamespaceURI(element: Element): html.NS {
+        return element.namespace as html.NS;
     },
 
     getTextNodeContent(textNode: Text): string {
@@ -243,7 +267,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
     },
 
     // Source code location
-    setNodeSourceCodeLocation(node: Node, location: ElementLocation | null): void {
+    setNodeSourceCodeLocation(node: Node, location: Token.ElementLocation | null): void {
         if (location) {
             node.startIndex = location.startOffset;
             node.endIndex = location.endOffset;
@@ -252,11 +276,11 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
         node.sourceCodeLocation = location;
     },
 
-    getNodeSourceCodeLocation(node: Node): ElementLocation | null | undefined {
+    getNodeSourceCodeLocation(node: Node): Token.ElementLocation | null | undefined {
         return node.sourceCodeLocation;
     },
 
-    updateNodeSourceCodeLocation(node: Node, endLocation: ElementLocation): void {
+    updateNodeSourceCodeLocation(node: Node, endLocation: Token.ElementLocation): void {
         if (endLocation.endOffset != null) node.endIndex = endLocation.endOffset;
 
         node.sourceCodeLocation = {
diff --git a/packages/parse5-htmlparser2-tree-adapter/package.json b/packages/parse5-htmlparser2-tree-adapter/package.json
index 9aaddbc3b..8d86c29ee 100644
--- a/packages/parse5-htmlparser2-tree-adapter/package.json
+++ b/packages/parse5-htmlparser2-tree-adapter/package.json
@@ -15,6 +15,9 @@
     ],
     "license": "MIT",
     "main": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": "./dist/index.js",
     "dependencies": {
         "domhandler": "^4.3.1",
         "parse5": "^6.0.1"
diff --git a/packages/parse5-parser-stream/lib/index.ts b/packages/parse5-parser-stream/lib/index.ts
index 74b737664..699005ee4 100644
--- a/packages/parse5-parser-stream/lib/index.ts
+++ b/packages/parse5-parser-stream/lib/index.ts
@@ -1,7 +1,5 @@
 import { Writable } from 'node:stream';
-import { Parser, ParserOptions } from 'parse5/dist/parser/index.js';
-import type { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
-import type { DefaultTreeAdapterMap } from 'parse5/dist/tree-adapters/default.js';
+import { Parser, type ParserOptions, type TreeAdapterTypeMap, type DefaultTreeAdapterMap } from 'parse5';
 
 /* eslint-disable unicorn/consistent-function-scoping -- The rule seems to be broken here. */
 
diff --git a/packages/parse5-parser-stream/package.json b/packages/parse5-parser-stream/package.json
index 8eb736045..45309a9a5 100644
--- a/packages/parse5-parser-stream/package.json
+++ b/packages/parse5-parser-stream/package.json
@@ -15,6 +15,9 @@
     ],
     "license": "MIT",
     "main": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": "./dist/index.js",
     "dependencies": {
         "parse5": "^6.0.1"
     },
diff --git a/packages/parse5-parser-stream/test/scripting.test.ts b/packages/parse5-parser-stream/test/scripting.test.ts
index a0f166c8a..953ef6e5a 100644
--- a/packages/parse5-parser-stream/test/scripting.test.ts
+++ b/packages/parse5-parser-stream/test/scripting.test.ts
@@ -1,8 +1,7 @@
 import { ParserStream } from '../lib/index.js';
 import { generateParsingTests } from 'parse5-test-utils/utils/generate-parsing-tests.js';
-import { makeChunks, generateTestsForEachTreeAdapter } from 'parse5-test-utils/utils/common.js';
+import { makeChunks, generateTestsForEachTreeAdapter, finished } from 'parse5-test-utils/utils/common.js';
 import { runInNewContext } from 'node:vm';
-import { finished } from 'parse5-test-utils/utils/common.js';
 
 function pause(): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, 5));
diff --git a/packages/parse5-parser-stream/test/utils/parse-chunked.ts b/packages/parse5-parser-stream/test/utils/parse-chunked.ts
index 90370a2bf..f219bc012 100644
--- a/packages/parse5-parser-stream/test/utils/parse-chunked.ts
+++ b/packages/parse5-parser-stream/test/utils/parse-chunked.ts
@@ -1,5 +1,4 @@
-import type { ParserOptions } from 'parse5';
-import type { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
+import type { ParserOptions, TreeAdapterTypeMap } from 'parse5';
 import { ParserStream } from '../../lib/index.js';
 import { makeChunks } from 'parse5-test-utils/utils/common.js';
 
diff --git a/packages/parse5-plain-text-conversion-stream/lib/index.ts b/packages/parse5-plain-text-conversion-stream/lib/index.ts
index 8ba6a37ab..f07946e6c 100644
--- a/packages/parse5-plain-text-conversion-stream/lib/index.ts
+++ b/packages/parse5-plain-text-conversion-stream/lib/index.ts
@@ -1,7 +1,7 @@
-import type { ParserOptions } from 'parse5';
+import { type ParserOptions, type TreeAdapterTypeMap, html } from 'parse5';
 import { ParserStream } from 'parse5-parser-stream';
-import { TAG_ID as $, TAG_NAMES as TN } from 'parse5/dist/common/html.js';
-import type { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
+
+const { TAG_ID: $, TAG_NAMES: TN } = html;
 
 /**
  * Converts plain text files into HTML document as required by [HTML specification](https://html.spec.whatwg.org/#read-text).
diff --git a/packages/parse5-plain-text-conversion-stream/package.json b/packages/parse5-plain-text-conversion-stream/package.json
index 9fa538fb3..ad62b3e4a 100644
--- a/packages/parse5-plain-text-conversion-stream/package.json
+++ b/packages/parse5-plain-text-conversion-stream/package.json
@@ -18,6 +18,9 @@
     ],
     "license": "MIT",
     "main": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": "./dist/index.js",
     "dependencies": {
         "parse5": "^6.0.1",
         "parse5-parser-stream": "^6.0.1"
diff --git a/packages/parse5-plain-text-conversion-stream/test/plain-text-conversion-stream.test.ts b/packages/parse5-plain-text-conversion-stream/test/plain-text-conversion-stream.test.ts
index fa61da664..da8e28201 100644
--- a/packages/parse5-plain-text-conversion-stream/test/plain-text-conversion-stream.test.ts
+++ b/packages/parse5-plain-text-conversion-stream/test/plain-text-conversion-stream.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'node:assert';
-import * as parse5 from 'parse5';
+import { serialize } from 'parse5';
 import { PlainTextConversionStream } from '../lib/index.js';
 import { generateTestsForEachTreeAdapter } from 'parse5-test-utils/utils/common.js';
 
@@ -12,7 +12,7 @@ generateTestsForEachTreeAdapter('plain-test-conversion-stream', (treeAdapter) =>
         converter.write('\u0000');
         converter.end('<html><head><body>');
 
-        const result = parse5.serialize(converter.document, { treeAdapter });
+        const result = serialize(converter.document, { treeAdapter });
 
         assert.strictEqual(
             result,
diff --git a/packages/parse5-sax-parser/lib/index.ts b/packages/parse5-sax-parser/lib/index.ts
index e16c5a72b..8b51209ff 100644
--- a/packages/parse5-sax-parser/lib/index.ts
+++ b/packages/parse5-sax-parser/lib/index.ts
@@ -1,13 +1,5 @@
 import { Transform } from 'node:stream';
-import type { Tokenizer, TokenHandler } from 'parse5/dist/tokenizer/index.js';
-import type {
-    Attribute,
-    Location,
-    TagToken,
-    CommentToken,
-    DoctypeToken,
-    CharacterToken,
-} from 'parse5/dist/common/token.js';
+import type { Tokenizer, TokenHandler, Token } from 'parse5';
 import { DevNullStream } from './dev-null-stream.js';
 import { ParserFeedbackSimulator } from './parser-feedback-simulator.js';
 
@@ -135,7 +127,7 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onCharacter({ chars, location }: CharacterToken): void {
+    onCharacter({ chars, location }: Token.CharacterToken): void {
         if (this.pendingText === null) {
             this.pendingText = { text: chars, sourceCodeLocation: location };
         } else {
@@ -158,12 +150,12 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onWhitespaceCharacter(token: CharacterToken): void {
+    onWhitespaceCharacter(token: Token.CharacterToken): void {
         this.onCharacter(token);
     }
 
     /** @internal */
-    onNullCharacter(token: CharacterToken): void {
+    onNullCharacter(token: Token.CharacterToken): void {
         this.onCharacter(token);
     }
 
@@ -174,7 +166,7 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onStartTag(token: TagToken): void {
+    onStartTag(token: Token.TagToken): void {
         this._emitPendingText();
 
         const startTag: StartTag = {
@@ -187,7 +179,7 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onEndTag(token: TagToken): void {
+    onEndTag(token: Token.TagToken): void {
         this._emitPendingText();
 
         const endTag: EndTag = {
@@ -198,7 +190,7 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onDoctype(token: DoctypeToken): void {
+    onDoctype(token: Token.DoctypeToken): void {
         this._emitPendingText();
 
         const doctype: Doctype = {
@@ -211,7 +203,7 @@ export class SAXParser extends Transform implements TokenHandler {
     }
 
     /** @internal */
-    onComment(token: CommentToken): void {
+    onComment(token: Token.CommentToken): void {
         this._emitPendingText();
 
         const comment: Comment = {
@@ -245,14 +237,14 @@ export class SAXParser extends Transform implements TokenHandler {
 
 export interface SaxToken {
     /** Source code location info. Available if location info is enabled via {@link SAXParserOptions}. */
-    sourceCodeLocation?: Location | null;
+    sourceCodeLocation?: Token.Location | null;
 }
 
 export interface StartTag extends SaxToken {
     /** Tag name */
     tagName: string;
     /** List of attributes */
-    attrs: Attribute[];
+    attrs: Token.Attribute[];
     /** Indicates if the tag is self-closing */
     selfClosing: boolean;
 }
diff --git a/packages/parse5-sax-parser/lib/parser-feedback-simulator.ts b/packages/parse5-sax-parser/lib/parser-feedback-simulator.ts
index 06f9d31aa..116637dd1 100644
--- a/packages/parse5-sax-parser/lib/parser-feedback-simulator.ts
+++ b/packages/parse5-sax-parser/lib/parser-feedback-simulator.ts
@@ -1,30 +1,40 @@
-import { Tokenizer, TokenizerOptions, TokenizerMode, TokenHandler } from 'parse5/dist/tokenizer/index.js';
-import { TokenType, TagToken, CommentToken, DoctypeToken, CharacterToken, EOFToken } from 'parse5/dist/common/token.js';
-import * as foreignContent from 'parse5/dist/common/foreign-content.js';
-import * as unicode from 'parse5/dist/common/unicode.js';
-import { TAG_ID as $, TAG_NAMES as TN, NAMESPACES as NS, getTagID } from 'parse5/dist/common/html.js';
-
-//ParserFeedbackSimulator
-//Simulates adjustment of the Tokenizer which performed by standard parser during tree construction.
+import {
+    Tokenizer,
+    type TokenizerOptions,
+    TokenizerMode,
+    type TokenHandler,
+    Token,
+    foreignContent,
+    html,
+} from 'parse5';
+
+const $ = html.TAG_ID;
+
+const REPLACEMENT_CHARACTER = '\uFFFD';
+const LINE_FEED_CODE_POINT = 0x0a;
+
+/**
+ * Simulates adjustments of the Tokenizer which are performed by the standard parser during tree construction.
+ */
 export class ParserFeedbackSimulator implements TokenHandler {
-    private namespaceStack: NS[] = [];
+    private namespaceStack: html.NS[] = [];
     public inForeignContent = false;
     public skipNextNewLine = false;
     public tokenizer: Tokenizer;
 
     constructor(options: TokenizerOptions, private handler: TokenHandler) {
         this.tokenizer = new Tokenizer(options, this);
-        this._enterNamespace(NS.HTML);
+        this._enterNamespace(html.NS.HTML);
     }
 
     /** @internal */
-    onNullCharacter(token: CharacterToken): void {
+    onNullCharacter(token: Token.CharacterToken): void {
         this.skipNextNewLine = false;
 
         if (this.inForeignContent) {
             this.handler.onCharacter({
-                type: TokenType.CHARACTER,
-                chars: unicode.REPLACEMENT_CHARACTER,
+                type: Token.TokenType.CHARACTER,
+                chars: REPLACEMENT_CHARACTER,
                 location: token.location,
             });
         } else {
@@ -33,8 +43,8 @@ export class ParserFeedbackSimulator implements TokenHandler {
     }
 
     /** @internal */
-    onWhitespaceCharacter(token: CharacterToken): void {
-        if (this.skipNextNewLine && token.chars.charCodeAt(0) === unicode.CODE_POINTS.LINE_FEED) {
+    onWhitespaceCharacter(token: Token.CharacterToken): void {
+        if (this.skipNextNewLine && token.chars.charCodeAt(0) === LINE_FEED_CODE_POINT) {
             this.skipNextNewLine = false;
 
             if (token.chars.length === 1) {
@@ -48,44 +58,44 @@ export class ParserFeedbackSimulator implements TokenHandler {
     }
 
     /** @internal */
-    onCharacter(token: CharacterToken): void {
+    onCharacter(token: Token.CharacterToken): void {
         this.skipNextNewLine = false;
         this.handler.onCharacter(token);
     }
 
     /** @internal */
-    onComment(token: CommentToken): void {
+    onComment(token: Token.CommentToken): void {
         this.skipNextNewLine = false;
         this.handler.onComment(token);
     }
 
     /** @internal */
-    onDoctype(token: DoctypeToken): void {
+    onDoctype(token: Token.DoctypeToken): void {
         this.skipNextNewLine = false;
         this.handler.onDoctype(token);
     }
 
     /** @internal */
-    onEof(token: EOFToken): void {
+    onEof(token: Token.EOFToken): void {
         this.skipNextNewLine = false;
         this.handler.onEof(token);
     }
 
     //Namespace stack mutations
-    private _enterNamespace(namespace: NS): void {
+    private _enterNamespace(namespace: html.NS): void {
         this.namespaceStack.unshift(namespace);
-        this.inForeignContent = namespace !== NS.HTML;
+        this.inForeignContent = namespace !== html.NS.HTML;
         this.tokenizer.inForeignNode = this.inForeignContent;
     }
 
     private _leaveCurrentNamespace(): void {
         this.namespaceStack.shift();
-        this.inForeignContent = this.namespaceStack[0] !== NS.HTML;
+        this.inForeignContent = this.namespaceStack[0] !== html.NS.HTML;
         this.tokenizer.inForeignNode = this.inForeignContent;
     }
 
     //Token handlers
-    private _ensureTokenizerMode(tn: $): void {
+    private _ensureTokenizerMode(tn: html.TAG_ID): void {
         switch (tn) {
             case $.TEXTAREA:
             case $.TITLE: {
@@ -115,16 +125,16 @@ export class ParserFeedbackSimulator implements TokenHandler {
     }
 
     /** @internal */
-    onStartTag(token: TagToken): void {
+    onStartTag(token: Token.TagToken): void {
         let tn = token.tagID;
 
         switch (tn) {
             case $.SVG: {
-                this._enterNamespace(NS.SVG);
+                this._enterNamespace(html.NS.SVG);
                 break;
             }
             case $.MATH: {
-                this._enterNamespace(NS.MATHML);
+                this._enterNamespace(html.NS.MATHML);
                 break;
             }
             default:
@@ -137,9 +147,9 @@ export class ParserFeedbackSimulator implements TokenHandler {
             } else {
                 const currentNs = this.namespaceStack[0];
 
-                if (currentNs === NS.MATHML) {
+                if (currentNs === html.NS.MATHML) {
                     foreignContent.adjustTokenMathMLAttrs(token);
-                } else if (currentNs === NS.SVG) {
+                } else if (currentNs === html.NS.SVG) {
                     foreignContent.adjustTokenSVGTagName(token);
                     foreignContent.adjustTokenSVGAttrs(token);
                 }
@@ -149,7 +159,7 @@ export class ParserFeedbackSimulator implements TokenHandler {
                 tn = token.tagID;
 
                 if (!token.selfClosing && foreignContent.isIntegrationPoint(tn, currentNs, token.attrs)) {
-                    this._enterNamespace(NS.HTML);
+                    this._enterNamespace(html.NS.HTML);
                 }
             }
         } else {
@@ -161,7 +171,7 @@ export class ParserFeedbackSimulator implements TokenHandler {
                     break;
                 }
                 case $.IMAGE: {
-                    token.tagName = TN.IMG;
+                    token.tagName = html.TAG_NAMES.IMG;
                     token.tagID = $.IMG;
                     break;
                 }
@@ -176,17 +186,17 @@ export class ParserFeedbackSimulator implements TokenHandler {
     }
 
     /** @internal */
-    onEndTag(token: TagToken): void {
+    onEndTag(token: Token.TagToken): void {
         let tn = token.tagID;
 
         if (!this.inForeignContent) {
             const previousNs = this.namespaceStack[1];
 
-            if (previousNs === NS.SVG) {
+            if (previousNs === html.NS.SVG) {
                 const adjustedTagName = foreignContent.SVG_TAG_NAMES_ADJUSTMENT_MAP.get(token.tagName);
 
                 if (adjustedTagName) {
-                    tn = getTagID(adjustedTagName);
+                    tn = html.getTagID(adjustedTagName);
                 }
             }
 
@@ -195,14 +205,14 @@ export class ParserFeedbackSimulator implements TokenHandler {
                 this._leaveCurrentNamespace();
             }
         } else if (
-            (tn === $.SVG && this.namespaceStack[0] === NS.SVG) ||
-            (tn === $.MATH && this.namespaceStack[0] === NS.MATHML)
+            (tn === $.SVG && this.namespaceStack[0] === html.NS.SVG) ||
+            (tn === $.MATH && this.namespaceStack[0] === html.NS.MATHML)
         ) {
             this._leaveCurrentNamespace();
         }
 
         // NOTE: adjust end tag name as well for consistency
-        if (this.namespaceStack[0] === NS.SVG) {
+        if (this.namespaceStack[0] === html.NS.SVG) {
             foreignContent.adjustTokenSVGTagName(token);
         }
 
diff --git a/packages/parse5-sax-parser/package.json b/packages/parse5-sax-parser/package.json
index c4bd18b7c..f0ce2db63 100644
--- a/packages/parse5-sax-parser/package.json
+++ b/packages/parse5-sax-parser/package.json
@@ -16,6 +16,9 @@
     ],
     "license": "MIT",
     "main": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": "./dist/index.js",
     "dependencies": {
         "parse5": "^6.0.1"
     },
diff --git a/packages/parse5-sax-parser/test/location-info.test.ts b/packages/parse5-sax-parser/test/location-info.test.ts
index e546f60ec..dba662dc6 100644
--- a/packages/parse5-sax-parser/test/location-info.test.ts
+++ b/packages/parse5-sax-parser/test/location-info.test.ts
@@ -2,9 +2,9 @@ import * as assert from 'node:assert';
 import { SAXParser } from '../lib/index.js';
 import { loadSAXParserTestData } from 'parse5-test-utils/utils/load-sax-parser-test-data.js';
 import { writeChunkedToStream } from 'parse5-test-utils/utils/common.js';
-import type { Location } from 'parse5/dist/common/token.js';
+import type { Token } from 'parse5';
 
-function assertLocation({ sourceCodeLocation }: { sourceCodeLocation: Location }): void {
+function assertLocation({ sourceCodeLocation }: { sourceCodeLocation: Token.Location }): void {
     assert.strictEqual(typeof sourceCodeLocation.startLine, 'number');
     assert.strictEqual(typeof sourceCodeLocation.startCol, 'number');
     assert.strictEqual(typeof sourceCodeLocation.startOffset, 'number');
diff --git a/packages/parse5-sax-parser/test/sax-parser.test.ts b/packages/parse5-sax-parser/test/sax-parser.test.ts
index 11a7d8754..20ee3e6da 100644
--- a/packages/parse5-sax-parser/test/sax-parser.test.ts
+++ b/packages/parse5-sax-parser/test/sax-parser.test.ts
@@ -1,9 +1,10 @@
 import * as assert from 'node:assert';
 import * as fs from 'node:fs';
-import { finished } from 'parse5-test-utils/utils/common.js';
-import { SAXParser, SAXParserOptions } from '../lib/index.js';
+import type { SAXParserOptions } from '../lib/index.js';
+import { SAXParser } from '../lib/index.js';
 import { loadSAXParserTestData } from 'parse5-test-utils/utils/load-sax-parser-test-data.js';
 import {
+    finished,
     getStringDiffMsg,
     writeChunkedToStream,
     removeNewLines,
diff --git a/packages/parse5/lib/common/doctype.ts b/packages/parse5/lib/common/doctype.ts
index d57b7f9e8..a4c1b9382 100644
--- a/packages/parse5/lib/common/doctype.ts
+++ b/packages/parse5/lib/common/doctype.ts
@@ -1,5 +1,5 @@
 import { DOCUMENT_MODE } from './html.js';
-import { DoctypeToken } from './token.js';
+import type { DoctypeToken } from './token.js';
 
 //Const
 const VALID_DOCTYPE_NAME = 'html';
@@ -84,12 +84,6 @@ const LIMITED_QUIRKS_WITH_SYSTEM_ID_PUBLIC_ID_PREFIXES = [
 ];
 
 //Utils
-function enquoteDoctypeId(id: string): string {
-    const quote = id.includes('"') ? "'" : '"';
-
-    return quote + id + quote;
-}
-
 function hasPrefix(publicId: string, prefixes: string[]): boolean {
     return prefixes.some((prefix) => publicId.startsWith(prefix));
 }
@@ -139,23 +133,3 @@ export function getDocumentMode(token: DoctypeToken): DOCUMENT_MODE {
 
     return DOCUMENT_MODE.NO_QUIRKS;
 }
-
-export function serializeContent(name: string, publicId: string, systemId: string): string {
-    let str = '!DOCTYPE ';
-
-    if (name) {
-        str += name;
-    }
-
-    if (publicId) {
-        str += ` PUBLIC ${enquoteDoctypeId(publicId)}`;
-    } else if (systemId) {
-        str += ' SYSTEM';
-    }
-
-    if (systemId) {
-        str += ` ${enquoteDoctypeId(systemId)}`;
-    }
-
-    return str;
-}
diff --git a/packages/parse5/lib/common/error-codes.ts b/packages/parse5/lib/common/error-codes.ts
index cff89bfd9..e8387848f 100644
--- a/packages/parse5/lib/common/error-codes.ts
+++ b/packages/parse5/lib/common/error-codes.ts
@@ -1,4 +1,4 @@
-import { Location } from './token.js';
+import type { Location } from './token.js';
 
 export interface ParserError extends Location {
     code: ERR;
diff --git a/packages/parse5/lib/common/foreign-content.ts b/packages/parse5/lib/common/foreign-content.ts
index 6ad04506f..891e83329 100644
--- a/packages/parse5/lib/common/foreign-content.ts
+++ b/packages/parse5/lib/common/foreign-content.ts
@@ -1,4 +1,4 @@
-import { TAG_ID as $, NAMESPACES as NS, ATTRS, getTagID } from './html.js';
+import { TAG_ID as $, NS, ATTRS, getTagID } from './html.js';
 import type { TagToken, Attribute } from './token.js';
 
 //MIME types
diff --git a/packages/parse5/lib/common/html.ts b/packages/parse5/lib/common/html.ts
index 51e1ced6b..48e27317f 100644
--- a/packages/parse5/lib/common/html.ts
+++ b/packages/parse5/lib/common/html.ts
@@ -1,4 +1,5 @@
-export enum NAMESPACES {
+/** All valid namespaces in HTML. */
+export enum NS {
     HTML = 'http://www.w3.org/1999/xhtml',
     MATHML = 'http://www.w3.org/1998/Math/MathML',
     SVG = 'http://www.w3.org/2000/svg',
@@ -7,8 +8,6 @@ export enum NAMESPACES {
     XMLNS = 'http://www.w3.org/2000/xmlns/',
 }
 
-const NS = NAMESPACES;
-
 export enum ATTRS {
     TYPE = 'type',
     ACTION = 'action',
@@ -461,7 +460,7 @@ export function getTagID(tagName: string): TAG_ID {
 
 const $ = TAG_ID;
 
-export const SPECIAL_ELEMENTS: Record<NAMESPACES, Set<TAG_ID>> = {
+export const SPECIAL_ELEMENTS: Record<NS, Set<TAG_ID>> = {
     [NS.HTML]: new Set([
         $.ADDRESS,
         $.APPLET,
@@ -555,3 +554,17 @@ export const SPECIAL_ELEMENTS: Record<NAMESPACES, Set<TAG_ID>> = {
 export function isNumberedHeader(tn: TAG_ID): boolean {
     return tn === $.H1 || tn === $.H2 || tn === $.H3 || tn === $.H4 || tn === $.H5 || tn === $.H6;
 }
+
+const UNESCAPED_TEXT = new Set<string>([
+    TAG_NAMES.STYLE,
+    TAG_NAMES.SCRIPT,
+    TAG_NAMES.XMP,
+    TAG_NAMES.IFRAME,
+    TAG_NAMES.NOEMBED,
+    TAG_NAMES.NOFRAMES,
+    TAG_NAMES.PLAINTEXT,
+]);
+
+export function hasUnescapedText(tn: string, scriptingEnabled: boolean): boolean {
+    return UNESCAPED_TEXT.has(tn) || (scriptingEnabled && tn === TAG_NAMES.NOSCRIPT);
+}
diff --git a/packages/parse5/lib/index.ts b/packages/parse5/lib/index.ts
index c94f3aa5a..807d6712e 100644
--- a/packages/parse5/lib/index.ts
+++ b/packages/parse5/lib/index.ts
@@ -1,10 +1,22 @@
-import { Parser, ParserOptions } from './parser/index.js';
+import { Parser, type ParserOptions } from './parser/index.js';
 
 import type { DefaultTreeAdapterMap } from './tree-adapters/default.js';
 import type { TreeAdapterTypeMap } from './tree-adapters/interface.js';
 
-export { ParserOptions } from './parser/index.js';
-export { serialize, serializeOuter, SerializerOptions } from './serializer/index.js';
+export { type DefaultTreeAdapterMap, defaultTreeAdapter } from './tree-adapters/default.js';
+export type { TreeAdapter, TreeAdapterTypeMap } from './tree-adapters/interface.js';
+export { type ParserOptions, /** @internal */ Parser } from './parser/index.js';
+export { serialize, serializeOuter, type SerializerOptions } from './serializer/index.js';
+export type { ParserError } from './common/error-codes.js';
+
+/** @internal */
+export * as foreignContent from './common/foreign-content.js';
+/** @internal */
+export * as html from './common/html.js';
+/** @internal */
+export * as Token from './common/token.js';
+/** @internal */
+export { Tokenizer, TokenizerOptions, TokenizerMode, TokenHandler } from './tokenizer/index.js';
 
 // Shorthands
 
diff --git a/packages/parse5/lib/parser/formatting-element-list.test.ts b/packages/parse5/lib/parser/formatting-element-list.test.ts
index e848a4851..cd3f9af48 100644
--- a/packages/parse5/lib/parser/formatting-element-list.test.ts
+++ b/packages/parse5/lib/parser/formatting-element-list.test.ts
@@ -1,6 +1,6 @@
 import * as assert from 'node:assert';
-import { TAG_NAMES as $, NAMESPACES as NS, getTagID } from '../common/html.js';
-import { TagToken, TokenType } from '../common/token.js';
+import { TAG_NAMES as $, NS, getTagID } from '../common/html.js';
+import { type TagToken, TokenType } from '../common/token.js';
 import { FormattingElementList, EntryType } from './formatting-element-list.js';
 import { generateTestsForEachTreeAdapter } from 'parse5-test-utils/utils/common.js';
 
diff --git a/packages/parse5/lib/parser/index.test.ts b/packages/parse5/lib/parser/index.test.ts
index 60bec2c7c..fdbc092c3 100644
--- a/packages/parse5/lib/parser/index.test.ts
+++ b/packages/parse5/lib/parser/index.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'node:assert';
-import * as parse5 from 'parse5';
+import { parseFragment, parse } from 'parse5';
 import { jest } from '@jest/globals';
 import { generateParsingTests } from 'parse5-test-utils/utils/generate-parsing-tests.js';
 import { treeAdapters } from 'parse5-test-utils/utils/common.js';
@@ -20,9 +20,7 @@ generateParsingTests(
         ],
     },
     (test, opts) => ({
-        node: test.fragmentContext
-            ? parse5.parseFragment(test.fragmentContext, test.input, opts)
-            : parse5.parse(test.input, opts),
+        node: test.fragmentContext ? parseFragment(test.fragmentContext, test.input, opts) : parse(test.input, opts),
     })
 );
 
@@ -35,16 +33,14 @@ generateParsingTests(
         expectErrors: ['505.search-element', '506.search-element'],
     },
     (test, opts) => ({
-        node: test.fragmentContext
-            ? parse5.parseFragment(test.fragmentContext, test.input, opts)
-            : parse5.parse(test.input, opts),
+        node: test.fragmentContext ? parseFragment(test.fragmentContext, test.input, opts) : parse(test.input, opts),
     })
 );
 
 describe('parser', () => {
     it('Regression - HTML5 Legacy Doctype Misparsed with htmlparser2 tree adapter (GH-45)', () => {
         const html = '<!DOCTYPE html SYSTEM "about:legacy-compat"><html><head></head><body>Hi there!</body></html>';
-        const document = parse5.parse(html, { treeAdapter: treeAdapters.htmlparser2 });
+        const document = parse(html, { treeAdapter: treeAdapters.htmlparser2 });
 
         assert.ok(treeAdapters.htmlparser2.isDocumentTypeNode(document.childNodes[0]));
         assert.strictEqual(document.childNodes[0].data, '!DOCTYPE html SYSTEM "about:legacy-compat"');
@@ -64,7 +60,7 @@ describe('parser', () => {
         });
 
         it('parses correctly', () => {
-            const fragment = parse5.parseFragment('<div id="123">', {
+            const fragment = parseFragment('<div id="123">', {
                 treeAdapter: treeAdapters.htmlparser2,
             });
 
@@ -74,7 +70,7 @@ describe('parser', () => {
     });
 
     it('Regression - DOCTYPE empty fields (GH-236)', () => {
-        const document = parse5.parse('<!DOCTYPE>');
+        const document = parse('<!DOCTYPE>');
         const doctype = document.childNodes[0];
 
         expect(doctype).toHaveProperty('name', '');
@@ -86,7 +82,7 @@ describe('parser', () => {
         it('should support onItemPush and onItemPop', () => {
             const onItemPush = jest.fn();
             const onItemPop = jest.fn();
-            const document = parse5.parse('<p><p>', {
+            const document = parse('<p><p>', {
                 treeAdapter: {
                     ...treeAdapters.default,
                     onItemPush,
diff --git a/packages/parse5/lib/parser/index.ts b/packages/parse5/lib/parser/index.ts
index bb38706d5..00fb7af8c 100644
--- a/packages/parse5/lib/parser/index.ts
+++ b/packages/parse5/lib/parser/index.ts
@@ -1,15 +1,15 @@
-import { TokenHandler, Tokenizer, TokenizerMode } from '../tokenizer/index.js';
-import { OpenElementStack, StackHandler } from './open-element-stack.js';
-import { FormattingElementList, ElementEntry, EntryType } from './formatting-element-list.js';
-import { defaultTreeAdapter, DefaultTreeAdapterMap } from '../tree-adapters/default.js';
+import { Tokenizer, TokenizerMode, type TokenHandler } from '../tokenizer/index.js';
+import { OpenElementStack, type StackHandler } from './open-element-stack.js';
+import { FormattingElementList, EntryType, type ElementEntry } from './formatting-element-list.js';
+import { defaultTreeAdapter, type DefaultTreeAdapterMap } from '../tree-adapters/default.js';
 import * as doctype from '../common/doctype.js';
 import * as foreignContent from '../common/foreign-content.js';
-import { ERR, ParserErrorHandler } from '../common/error-codes.js';
+import { ERR, type ParserErrorHandler } from '../common/error-codes.js';
 import * as unicode from '../common/unicode.js';
 import {
     TAG_ID as $,
     TAG_NAMES as TN,
-    NAMESPACES as NS,
+    NS,
     ATTRS,
     SPECIAL_ELEMENTS,
     DOCUMENT_MODE,
@@ -20,14 +20,14 @@ import type { TreeAdapter, TreeAdapterTypeMap } from '../tree-adapters/interface
 import {
     TokenType,
     getTokenAttr,
-    Token,
-    CommentToken,
-    CharacterToken,
-    TagToken,
-    DoctypeToken,
-    EOFToken,
-    LocationWithAttributes,
-    ElementLocation,
+    type Token,
+    type CommentToken,
+    type CharacterToken,
+    type TagToken,
+    type DoctypeToken,
+    type EOFToken,
+    type LocationWithAttributes,
+    type ElementLocation,
 } from '../common/token.js';
 
 //Misc constants
diff --git a/packages/parse5/lib/parser/open-element-stack.test.ts b/packages/parse5/lib/parser/open-element-stack.test.ts
index ba0b7d9b9..2ebbebe43 100644
--- a/packages/parse5/lib/parser/open-element-stack.test.ts
+++ b/packages/parse5/lib/parser/open-element-stack.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'node:assert';
-import { TAG_ID as $, TAG_NAMES as TN, NAMESPACES as NS } from '../common/html.js';
+import { TAG_ID as $, TAG_NAMES as TN, NS } from '../common/html.js';
 import { OpenElementStack } from './open-element-stack.js';
 import type { TreeAdapterTypeMap } from '../tree-adapters/interface';
 import { generateTestsForEachTreeAdapter } from 'parse5-test-utils/utils/common.js';
diff --git a/packages/parse5/lib/parser/open-element-stack.ts b/packages/parse5/lib/parser/open-element-stack.ts
index 0df1fb366..9572b44fe 100644
--- a/packages/parse5/lib/parser/open-element-stack.ts
+++ b/packages/parse5/lib/parser/open-element-stack.ts
@@ -1,4 +1,4 @@
-import { TAG_ID as $, NAMESPACES as NS, isNumberedHeader } from '../common/html.js';
+import { TAG_ID as $, NS, isNumberedHeader } from '../common/html.js';
 import type { TreeAdapter, TreeAdapterTypeMap } from '../tree-adapters/interface';
 
 //Element utils
diff --git a/packages/parse5/lib/parser/parser-location-info.test.ts b/packages/parse5/lib/parser/parser-location-info.test.ts
index 82d7c3fdd..e9cee7333 100644
--- a/packages/parse5/lib/parser/parser-location-info.test.ts
+++ b/packages/parse5/lib/parser/parser-location-info.test.ts
@@ -1,20 +1,16 @@
 import * as assert from 'node:assert';
 import { outdent } from 'outdent';
-import * as parse5 from 'parse5';
+import { type ParserOptions, type TreeAdapterTypeMap, parse, parseFragment } from 'parse5';
 import {
     generateLocationInfoParserTests,
     assertStartTagLocation,
     assertNodeLocation,
 } from 'parse5-test-utils/utils/generate-location-info-parser-tests.js';
 import { generateTestsForEachTreeAdapter, treeAdapters } from 'parse5-test-utils/utils/common.js';
-import { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
 
-generateLocationInfoParserTests(
-    'location-info-parser',
-    (input: string, opts: parse5.ParserOptions<TreeAdapterTypeMap>) => ({
-        node: parse5.parse(input, opts),
-    })
-);
+generateLocationInfoParserTests('location-info-parser', (input: string, opts: ParserOptions<TreeAdapterTypeMap>) => ({
+    node: parse(input, opts),
+}));
 
 generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
     test('Regression - Incorrect LocationInfo.endOffset for implicitly closed <p> element (GH-109)', () => {
@@ -25,7 +21,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const firstP = treeAdapter.getChildNodes(fragment)[0];
         const firstPLocation = treeAdapter.getNodeSourceCodeLocation(firstP);
 
@@ -41,7 +37,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const firstChild = treeAdapter.getChildNodes(fragment)[0];
         const location = treeAdapter.getNodeSourceCodeLocation(firstChild);
 
@@ -57,7 +53,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const firstChild = treeAdapter.getChildNodes(fragment)[0];
 
         assert.ok(treeAdapter.getNodeSourceCodeLocation(firstChild));
@@ -72,7 +68,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
         };
 
         assert.doesNotThrow(() => {
-            parse5.parseFragment(html, opts);
+            parseFragment(html, opts);
         });
     });
 
@@ -84,7 +80,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const firstChild = treeAdapter.getChildNodes(fragment)[0];
 
         assert.ok(treeAdapter.getNodeSourceCodeLocation(firstChild)?.attrs?.['test-attr']);
@@ -104,7 +100,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const document = parse5.parse(html, opts);
+        const document = parse(html, opts);
         const htmlEl = treeAdapter.getChildNodes(document)[0];
         const bodyEl = treeAdapter.getChildNodes(htmlEl)[1];
         const scriptEl = treeAdapter.getChildNodes(bodyEl)[0];
@@ -122,7 +118,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const p = treeAdapter.getChildNodes(fragment)[0];
         const location = treeAdapter.getNodeSourceCodeLocation(p);
 
@@ -141,7 +137,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const svg = treeAdapter.getChildNodes(fragment)[0];
         const foreignObject = treeAdapter.getChildNodes(svg)[0];
         const location = treeAdapter.getNodeSourceCodeLocation(foreignObject);
@@ -161,7 +157,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const fragment = parse5.parseFragment(html, opts);
+        const fragment = parseFragment(html, opts);
         const script = treeAdapter.getChildNodes(fragment)[0];
         const location = treeAdapter.getNodeSourceCodeLocation(script);
         const textLocation = treeAdapter.getNodeSourceCodeLocation(treeAdapter.getChildNodes(script)[0]);
@@ -187,7 +183,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const document = parse5.parse(html, opts);
+        const document = parse(html, opts);
         const htmlEl = treeAdapter.getChildNodes(document)[0];
         const bodyEl = treeAdapter.getChildNodes(htmlEl)[1];
 
@@ -218,7 +214,7 @@ generateTestsForEachTreeAdapter('location-info-parser', (treeAdapter) => {
             sourceCodeLocationInfo: true,
         };
 
-        const document = parse5.parse(html, opts);
+        const document = parse(html, opts);
         const htmlEl = treeAdapter.getChildNodes(document)[0];
         const bodyEl = treeAdapter.getChildNodes(htmlEl)[1];
 
@@ -263,7 +259,7 @@ describe('location-info-parser', () => {
             },
         };
         const treeAdapter = { ...treeAdapters.default, ...sourceCodeLocationSetter };
-        const document = parse5.parse('<!doctype><body>Testing location</body>', {
+        const document = parse('<!doctype><body>Testing location</body>', {
             treeAdapter,
             sourceCodeLocationInfo: true,
         });
diff --git a/packages/parse5/lib/serializer/index.test.ts b/packages/parse5/lib/serializer/index.test.ts
index 573307452..985f5e855 100644
--- a/packages/parse5/lib/serializer/index.test.ts
+++ b/packages/parse5/lib/serializer/index.test.ts
@@ -1,61 +1,59 @@
 import * as assert from 'node:assert';
-import * as parse5 from 'parse5';
+import { html, parse, parseFragment, serialize, serializeOuter, type DefaultTreeAdapterMap } from 'parse5';
 import { generateSerializerTests } from 'parse5-test-utils/utils/generate-serializer-tests.js';
 import { treeAdapters } from 'parse5-test-utils/utils/common.js';
-import { type Element } from 'parse5/dist/tree-adapters/default.js';
-import { NAMESPACES } from 'parse5/dist/common/html.js';
 
-generateSerializerTests('serializer', 'Serializer', parse5.serialize);
+generateSerializerTests('serializer', 'Serializer', serialize);
 
 describe('serializer', () => {
     describe("Regression - Get text node's parent tagName only if it's an Element node (GH-38)", () => {
         it('serializes correctly', () => {
-            const document = parse5.parse('<template>yo<div></div>42</template>');
+            const document = parse('<template>yo<div></div>42</template>');
             const treeAdapter: typeof treeAdapters.default = {
                 ...treeAdapters.default,
-                getTagName: (element: Element) => {
+                getTagName: (element: DefaultTreeAdapterMap['element']) => {
                     assert.ok(element.tagName);
 
                     return treeAdapters.default.getTagName(element);
                 },
             };
 
-            parse5.serialize(document, { treeAdapter });
+            serialize(document, { treeAdapter });
         });
     });
 
     describe('serializeOuter', () => {
         it('serializes outerHTML correctly', () => {
-            const document = parse5.parseFragment('<div><button>Hello</button></div>');
+            const document = parseFragment('<div><button>Hello</button></div>');
             const div = document.childNodes[0];
             assert.ok(treeAdapters.default.isElementNode(div));
-            const html = parse5.serializeOuter(div);
+            const html = serializeOuter(div);
 
             assert.equal(html, '<div><button>Hello</button></div>');
         });
     });
 
     it('serializes <template> elements inner content', () => {
-        const document = parse5.parseFragment('<template><button>Hello</button></template>');
+        const document = parseFragment('<template><button>Hello</button></template>');
         const template = document.childNodes[0];
         assert.ok(treeAdapters.default.isElementNode(template));
-        const html = parse5.serialize(template);
+        const html = serialize(template);
 
         assert.equal(html, '<button>Hello</button>');
     });
 
     it('serializes the children of void elements as the empty string (GH-289)', () => {
-        const br = treeAdapters.default.createElement('br', NAMESPACES.HTML, []);
+        const br = treeAdapters.default.createElement('br', html.NS.HTML, []);
 
         // Add child node to `br`, to make sure they are skipped.
-        treeAdapters.default.appendChild(br, treeAdapters.default.createElement('div', NAMESPACES.HTML, []));
+        treeAdapters.default.appendChild(br, treeAdapters.default.createElement('div', html.NS.HTML, []));
 
-        assert.equal(parse5.serialize(br), '');
+        assert.equal(serialize(br), '');
 
         // If the namespace is not HTML, the serializer should not skip the children.
-        const svgBr = treeAdapters.default.createElement('br', NAMESPACES.SVG, []);
-        treeAdapters.default.appendChild(svgBr, treeAdapters.default.createElement('div', NAMESPACES.HTML, []));
+        const svgBr = treeAdapters.default.createElement('br', html.NS.SVG, []);
+        treeAdapters.default.appendChild(svgBr, treeAdapters.default.createElement('div', html.NS.HTML, []));
 
-        assert.equal(parse5.serialize(svgBr), '<div></div>');
+        assert.equal(serialize(svgBr), '<div></div>');
     });
 });
diff --git a/packages/parse5/lib/serializer/index.ts b/packages/parse5/lib/serializer/index.ts
index 31d2f3e81..405fcf1f4 100644
--- a/packages/parse5/lib/serializer/index.ts
+++ b/packages/parse5/lib/serializer/index.ts
@@ -1,5 +1,5 @@
+import { TAG_NAMES as $, NS, hasUnescapedText } from '../common/html.js';
 import { escapeText, escapeAttribute } from 'entities';
-import { TAG_NAMES as $, NAMESPACES as NS } from '../common/html.js';
 import type { TreeAdapter, TreeAdapterTypeMap } from '../tree-adapters/interface';
 import { defaultTreeAdapter, type DefaultTreeAdapterMap } from '../tree-adapters/default.js';
 
@@ -33,12 +33,6 @@ function isVoidElement<T extends TreeAdapterTypeMap>(node: T['node'], options: I
     );
 }
 
-const UNESCAPED_TEXT = new Set<string>([$.STYLE, $.SCRIPT, $.XMP, $.IFRAME, $.NOEMBED, $.NOFRAMES, $.PLAINTEXT]);
-
-export function hasUnescapedText(tn: string, scriptingEnabled: boolean): boolean {
-    return UNESCAPED_TEXT.has(tn) || (scriptingEnabled && tn === $.NOSCRIPT);
-}
-
 export interface SerializerOptions<T extends TreeAdapterTypeMap> {
     /**
      * Specifies input tree format.
diff --git a/packages/parse5/lib/tokenizer/index.test.ts b/packages/parse5/lib/tokenizer/index.test.ts
index 8e543f2e4..ec478affe 100644
--- a/packages/parse5/lib/tokenizer/index.test.ts
+++ b/packages/parse5/lib/tokenizer/index.test.ts
@@ -1,4 +1,4 @@
-import { Tokenizer } from 'parse5/dist/tokenizer/index.js';
+import { Tokenizer } from 'parse5';
 import { generateTokenizationTests } from 'parse5-test-utils/utils/generate-tokenization-tests.js';
 
 const dataPath = new URL('../../../../test/data/html5lib-tests/tokenizer', import.meta.url);
diff --git a/packages/parse5/lib/tokenizer/index.ts b/packages/parse5/lib/tokenizer/index.ts
index bd39df998..db330d4d7 100644
--- a/packages/parse5/lib/tokenizer/index.ts
+++ b/packages/parse5/lib/tokenizer/index.ts
@@ -9,18 +9,18 @@ import {
 } from '../common/unicode.js';
 import {
     TokenType,
-    Token,
-    CharacterToken,
-    DoctypeToken,
-    TagToken,
-    EOFToken,
     getTokenAttr,
-    CommentToken,
-    Attribute,
-    Location,
+    type Token,
+    type CharacterToken,
+    type DoctypeToken,
+    type TagToken,
+    type EOFToken,
+    type CommentToken,
+    type Attribute,
+    type Location,
 } from '../common/token.js';
 import { htmlDecodeTree, BinTrieFlags, determineBranch } from 'entities/lib/decode.js';
-import { ERR, ParserErrorHandler } from '../common/error-codes.js';
+import { ERR, type ParserErrorHandler } from '../common/error-codes.js';
 import { TAG_ID, getTagID } from '../common/html.js';
 
 //C1 Unicode control character reference replacements
diff --git a/packages/parse5/lib/tokenizer/preprocessor.ts b/packages/parse5/lib/tokenizer/preprocessor.ts
index b4165f29b..798ad1bbe 100644
--- a/packages/parse5/lib/tokenizer/preprocessor.ts
+++ b/packages/parse5/lib/tokenizer/preprocessor.ts
@@ -6,7 +6,7 @@ import {
     isSurrogatePair,
     isUndefinedCodePoint,
 } from '../common/unicode.js';
-import { ERR, ParserError, ParserErrorHandler } from '../common/error-codes.js';
+import { ERR, type ParserError, type ParserErrorHandler } from '../common/error-codes.js';
 
 //Const
 const DEFAULT_BUFFER_WATERLINE = 1 << 16;
diff --git a/packages/parse5/lib/tokenizer/tokenizer-location-info.test.ts b/packages/parse5/lib/tokenizer/tokenizer-location-info.test.ts
index 6d99fe9f9..b0da0b255 100644
--- a/packages/parse5/lib/tokenizer/tokenizer-location-info.test.ts
+++ b/packages/parse5/lib/tokenizer/tokenizer-location-info.test.ts
@@ -1,6 +1,6 @@
 import * as assert from 'node:assert';
-import { Tokenizer, TokenizerMode, TokenHandler } from './index.js';
-import { Location, EOFToken, CharacterToken, DoctypeToken, TagToken, CommentToken } from '../common/token.js';
+import { Tokenizer, TokenizerMode, type TokenHandler } from './index.js';
+import type { Location, EOFToken, CharacterToken, DoctypeToken, TagToken, CommentToken } from '../common/token.js';
 import { getSubstringByLineCol, normalizeNewLine } from 'parse5-test-utils/utils/common.js';
 
 /** Receives events and immediately compares them against the expected values. */
diff --git a/packages/parse5/lib/tree-adapters/default.ts b/packages/parse5/lib/tree-adapters/default.ts
index 9da7f9764..4291d52ac 100644
--- a/packages/parse5/lib/tree-adapters/default.ts
+++ b/packages/parse5/lib/tree-adapters/default.ts
@@ -1,4 +1,4 @@
-import { DOCUMENT_MODE, NAMESPACES } from '../common/html.js';
+import { DOCUMENT_MODE, type NS } from '../common/html.js';
 import type { Attribute, Location, ElementLocation } from '../common/token.js';
 import type { TreeAdapter, TreeAdapterTypeMap } from './interface.js';
 
@@ -41,7 +41,7 @@ export interface Element {
     /** List of element attributes. */
     attrs: Attribute[];
     /** Element namespace. */
-    namespaceURI: NAMESPACES;
+    namespaceURI: NS;
     /** Element source code location info, with attributes. Available if location info is enabled. */
     sourceCodeLocation?: ElementLocation | null;
     /** Parent node. */
@@ -135,7 +135,7 @@ export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
         };
     },
 
-    createElement(tagName: string, namespaceURI: NAMESPACES, attrs: Attribute[]): Element {
+    createElement(tagName: string, namespaceURI: NS, attrs: Attribute[]): Element {
         return {
             nodeName: tagName,
             tagName,
@@ -268,7 +268,7 @@ export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
         return element.tagName;
     },
 
-    getNamespaceURI(element: Element): NAMESPACES {
+    getNamespaceURI(element: Element): NS {
         return element.namespaceURI;
     },
 
diff --git a/packages/parse5/lib/tree-adapters/interface.ts b/packages/parse5/lib/tree-adapters/interface.ts
index eaffab277..96331a89d 100644
--- a/packages/parse5/lib/tree-adapters/interface.ts
+++ b/packages/parse5/lib/tree-adapters/interface.ts
@@ -1,4 +1,4 @@
-import { DOCUMENT_MODE, NAMESPACES } from '../common/html.js';
+import type { DOCUMENT_MODE, NS } from '../common/html.js';
 import type { Attribute, ElementLocation } from '../common/token.js';
 
 export interface TreeAdapterTypeMap<
@@ -73,7 +73,7 @@ export interface TreeAdapter<T extends TreeAdapterTypeMap = TreeAdapterTypeMap>
      * @param namespaceURI - Namespace of the element.
      * @param attrs - Attribute name-value pair array. Foreign attributes may contain `namespace` and `prefix` fields as well.
      */
-    createElement(tagName: string, namespaceURI: NAMESPACES, attrs: Attribute[]): T['element'];
+    createElement(tagName: string, namespaceURI: NS, attrs: Attribute[]): T['element'];
 
     /**
      * Removes a node from its parent.
@@ -144,7 +144,7 @@ export interface TreeAdapter<T extends TreeAdapterTypeMap = TreeAdapterTypeMap>
      *
      * @param element - Element.
      */
-    getNamespaceURI(element: T['element']): NAMESPACES;
+    getNamespaceURI(element: T['element']): NS;
 
     /**
      * Returns the given node's source code location information.
diff --git a/packages/parse5/package.json b/packages/parse5/package.json
index cd4fc74c4..5266364e2 100644
--- a/packages/parse5/package.json
+++ b/packages/parse5/package.json
@@ -35,10 +35,6 @@
         ".": {
             "import": "./dist/index.js",
             "require": "./dist/cjs/index.js"
-        },
-        "./dist/*": {
-            "import": "./dist/*",
-            "require": "./dist/cjs/*"
         }
     },
     "repository": {
diff --git a/scripts/generate-parser-feedback-test/index.ts b/scripts/generate-parser-feedback-test/index.ts
index f1a9ce614..a05490c49 100644
--- a/scripts/generate-parser-feedback-test/index.ts
+++ b/scripts/generate-parser-feedback-test/index.ts
@@ -1,12 +1,9 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { basename } from 'node:path';
-import { Parser } from 'parse5/dist/parser/index.js';
-import { type DefaultTreeAdapterMap, defaultTreeAdapter } from 'parse5/dist/tree-adapters/default.js';
-import { HtmlLibToken } from 'parse5-test-utils/utils/generate-tokenization-tests.js';
+import { Parser, type DefaultTreeAdapterMap, type TreeAdapterTypeMap, type Token, defaultTreeAdapter } from 'parse5';
+import type { HtmlLibToken } from 'parse5-test-utils/utils/generate-tokenization-tests.js';
 import { parseDatFile } from 'parse5-test-utils/utils/parse-dat-file.js';
 import { addSlashes } from 'parse5-test-utils/utils/common.js';
-import { CharacterToken, CommentToken, DoctypeToken, TagToken } from '../../packages/parse5/dist/common/token.js';
-import type { TreeAdapterTypeMap } from '../../packages/parse5/dist/tree-adapters/interface.js';
 
 // eslint-disable-next-line no-console
 main().catch(console.error);
@@ -60,19 +57,19 @@ function collectParserTokens(html: string): HtmlLibToken[] {
             }
         }
 
-        override onComment(token: CommentToken): void {
+        override onComment(token: Token.CommentToken): void {
             this.guardTopLevel(
                 () => super.onComment(token),
                 () => ['Comment', token.data]
             );
         }
-        override onDoctype(token: DoctypeToken): void {
+        override onDoctype(token: Token.DoctypeToken): void {
             this.guardTopLevel(
                 () => super.onDoctype(token),
                 () => ['DOCTYPE', token.name, token.publicId, token.systemId, !token.forceQuirks]
             );
         }
-        override onStartTag(token: TagToken): void {
+        override onStartTag(token: Token.TagToken): void {
             this.guardTopLevel(
                 () => super.onStartTag(token),
                 () => {
@@ -87,7 +84,7 @@ function collectParserTokens(html: string): HtmlLibToken[] {
                 }
             );
         }
-        override onEndTag(token: TagToken): void {
+        override onEndTag(token: Token.TagToken): void {
             this.guardTopLevel(
                 () => super.onEndTag(token),
                 // NOTE: parser feedback simulator can produce adjusted SVG
@@ -95,19 +92,19 @@ function collectParserTokens(html: string): HtmlLibToken[] {
                 () => ['EndTag', token.tagName.toLowerCase()]
             );
         }
-        override onCharacter(token: CharacterToken): void {
+        override onCharacter(token: Token.CharacterToken): void {
             this.guardTopLevel(
                 () => super.onCharacter(token),
                 () => ['Character', token.chars]
             );
         }
-        override onNullCharacter(token: CharacterToken): void {
+        override onNullCharacter(token: Token.CharacterToken): void {
             this.guardTopLevel(
                 () => super.onNullCharacter(token),
                 () => ['Character', token.chars]
             );
         }
-        override onWhitespaceCharacter(token: CharacterToken): void {
+        override onWhitespaceCharacter(token: Token.CharacterToken): void {
             const { skipNextNewLine } = this;
             const { chars } = token;
 
diff --git a/test/utils/common.ts b/test/utils/common.ts
index 79ea3f743..81aa1e370 100644
--- a/test/utils/common.ts
+++ b/test/utils/common.ts
@@ -1,9 +1,7 @@
-import { Writable, Readable, finished as finishedCb } from 'node:stream';
+import { Writable, finished as finishedCb, type Readable } from 'node:stream';
 import * as assert from 'node:assert';
-import type { TreeAdapter } from 'parse5/dist/tree-adapters/interface.js';
-import { defaultTreeAdapter } from 'parse5/dist/tree-adapters/default.js';
+import { type TreeAdapter, type Token, defaultTreeAdapter } from 'parse5';
 import { adapter as htmlparser2Adapter } from 'parse5-htmlparser2-tree-adapter';
-import type { Location } from 'parse5/dist/common/token.js';
 
 // Ensure the default tree adapter matches the expected type.
 export const treeAdapters = {
@@ -117,7 +115,7 @@ export function getStringDiffMsg(actual: string, expected: string): string {
     return '';
 }
 
-export function getSubstringByLineCol(lines: string[], loc: Location): string {
+export function getSubstringByLineCol(lines: string[], loc: Token.Location): string {
     lines = lines.slice(loc.startLine - 1, loc.endLine);
 
     const last = lines.length - 1;
diff --git a/test/utils/generate-location-info-parser-tests.ts b/test/utils/generate-location-info-parser-tests.ts
index b6cc688ef..5559f3e83 100644
--- a/test/utils/generate-location-info-parser-tests.ts
+++ b/test/utils/generate-location-info-parser-tests.ts
@@ -1,10 +1,7 @@
-import { ParserOptions } from 'parse5/dist/parser/index';
-import { Location, ElementLocation } from 'parse5/dist/common/token.js';
-import { TreeAdapter, TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
 import * as assert from 'node:assert';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as parse5 from 'parse5/dist/index.js';
+import { type TreeAdapterTypeMap, type TreeAdapter, type ParserOptions, type Token, serializeOuter } from 'parse5';
 import {
     removeNewLines,
     getSubstringByLineCol,
@@ -12,7 +9,7 @@ import {
     normalizeNewLine,
     generateTestsForEachTreeAdapter,
 } from './common.js';
-import * as doctype from 'parse5/dist/common/doctype.js';
+import { serializeDoctypeContent } from 'parse5-htmlparser2-tree-adapter';
 
 function walkTree<T extends TreeAdapterTypeMap>(
     parent: T['parentNode'],
@@ -28,7 +25,7 @@ function walkTree<T extends TreeAdapterTypeMap>(
     }
 }
 
-function assertLocation(loc: Location, expected: string, html: string, lines: string[]): void {
+function assertLocation(loc: Token.Location, expected: string, html: string, lines: string[]): void {
     //Offsets
     let actual = html.substring(loc.startOffset, loc.endOffset);
 
@@ -46,7 +43,7 @@ function assertLocation(loc: Location, expected: string, html: string, lines: st
 
 //NOTE: Based on the idea that the serialized fragment starts with the startTag
 export function assertStartTagLocation(
-    location: ElementLocation,
+    location: Token.ElementLocation,
     serializedNode: string,
     html: string,
     lines: string[]
@@ -59,7 +56,12 @@ export function assertStartTagLocation(
 }
 
 //NOTE: Based on the idea that the serialized fragment ends with the endTag
-function assertEndTagLocation(location: ElementLocation, serializedNode: string, html: string, lines: string[]): void {
+function assertEndTagLocation(
+    location: Token.ElementLocation,
+    serializedNode: string,
+    html: string,
+    lines: string[]
+): void {
     assert.ok(location.endTag, 'Expected endTag to be defined');
     const length = location.endTag.endOffset - location.endTag.startOffset;
     const expected = serializedNode.slice(-length);
@@ -67,7 +69,12 @@ function assertEndTagLocation(location: ElementLocation, serializedNode: string,
     assertLocation(location.endTag, expected, html, lines);
 }
 
-function assertAttrsLocation(location: ElementLocation, serializedNode: string, html: string, lines: string[]): void {
+function assertAttrsLocation(
+    location: Token.ElementLocation,
+    serializedNode: string,
+    html: string,
+    lines: string[]
+): void {
     assert.ok(location.attrs, 'Expected attrs to be defined');
 
     for (const attr of Object.values(location.attrs)) {
@@ -80,7 +87,12 @@ function assertAttrsLocation(location: ElementLocation, serializedNode: string,
     }
 }
 
-export function assertNodeLocation(location: Location, serializedNode: string, html: string, lines: string[]): void {
+export function assertNodeLocation(
+    location: Token.Location,
+    serializedNode: string,
+    html: string,
+    lines: string[]
+): void {
     const expected = removeNewLines(serializedNode);
 
     assertLocation(location, expected, html, lines);
@@ -128,12 +140,12 @@ export function generateLocationInfoParserTests(
                     assert.ok(location);
 
                     const serializedNode = treeAdapter.isDocumentTypeNode(node)
-                        ? `<${doctype.serializeContent(
+                        ? `<${serializeDoctypeContent(
                               treeAdapter.getDocumentTypeNodeName(node),
                               treeAdapter.getDocumentTypeNodePublicId(node),
                               treeAdapter.getDocumentTypeNodeSystemId(node)
                           )}>`
-                        : parse5.serializeOuter(node, { treeAdapter });
+                        : serializeOuter(node, { treeAdapter });
 
                     assertLocation(location, serializedNode, html, lines);
 
diff --git a/test/utils/generate-parsing-tests.ts b/test/utils/generate-parsing-tests.ts
index 4f913d1a6..2a2371ab5 100644
--- a/test/utils/generate-parsing-tests.ts
+++ b/test/utils/generate-parsing-tests.ts
@@ -1,12 +1,10 @@
-import { ParserOptions } from 'parse5';
-import { ParserError } from 'parse5/dist/common/error-codes.js';
+import type { ParserOptions, TreeAdapter, TreeAdapterTypeMap, ParserError } from 'parse5';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as assert from 'node:assert';
 import { serializeToDatFileFormat } from './serialize-to-dat-file-format.js';
 import { generateTestsForEachTreeAdapter } from './common.js';
-import { parseDatFile, DatFile } from './parse-dat-file.js';
-import type { TreeAdapter, TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
+import { parseDatFile, type DatFile } from './parse-dat-file.js';
 
 export interface TreeConstructionTestData<T extends TreeAdapterTypeMap> extends DatFile<T> {
     idx: number;
diff --git a/test/utils/generate-serializer-tests.ts b/test/utils/generate-serializer-tests.ts
index 553c3ac58..39198122f 100644
--- a/test/utils/generate-serializer-tests.ts
+++ b/test/utils/generate-serializer-tests.ts
@@ -1,7 +1,6 @@
 import * as assert from 'node:assert';
 import * as fs from 'node:fs';
-import * as parse5 from 'parse5';
-import type { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
+import { type TreeAdapterTypeMap, type SerializerOptions, parse } from 'parse5';
 import { generateTestsForEachTreeAdapter, getStringDiffMsg } from './common.js';
 
 export function generateSerializerTests(
@@ -9,13 +8,13 @@ export function generateSerializerTests(
     prefix: string,
     serialize: (
         document: TreeAdapterTypeMap['document'],
-        opts: parse5.SerializerOptions<TreeAdapterTypeMap>
+        opts: SerializerOptions<TreeAdapterTypeMap>
     ) => Promise<string> | string
 ): void {
     const data = fs.readFileSync(new URL('../data/serialization/tests.json', import.meta.url)).toString('utf8');
     const tests = JSON.parse(data) as {
         name: string;
-        options?: parse5.SerializerOptions<TreeAdapterTypeMap>;
+        options?: SerializerOptions<TreeAdapterTypeMap>;
         input: string;
         expected: string;
     }[];
@@ -24,7 +23,7 @@ export function generateSerializerTests(
         for (const [idx, test] of tests.entries()) {
             it(`${prefix} - ${idx}.${test.name}`, async () => {
                 const opts = { ...test.options, treeAdapter };
-                const document = parse5.parse(test.input, opts);
+                const document = parse(test.input, opts);
                 const serializedResult = await serialize(document, opts);
 
                 //NOTE: use ok assertion, so output will not be polluted by the whole content of the strings
diff --git a/test/utils/generate-tokenization-tests.ts b/test/utils/generate-tokenization-tests.ts
index 0c3976328..8e79d8dcd 100644
--- a/test/utils/generate-tokenization-tests.ts
+++ b/test/utils/generate-tokenization-tests.ts
@@ -1,10 +1,9 @@
 import * as assert from 'node:assert';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { type Tokenizer, TokenizerMode, type TokenHandler } from 'parse5/dist/tokenizer/index.js';
+import type { ParserError, Token } from 'parse5';
+import { type Tokenizer, TokenizerMode, type TokenHandler } from 'parse5';
 import { makeChunks } from './common.js';
-import type { CommentToken, DoctypeToken, TagToken, CharacterToken } from 'parse5/dist/common/token.js';
-import type { ParserError } from 'parse5/dist/common/error-codes.js';
 
 export type HtmlLibToken = [string, string | null, ...unknown[]];
 
@@ -31,13 +30,13 @@ class TokenizeHandler implements TokenSourceData, TokenHandler {
         this.tokens.push(token);
     }
 
-    onComment(token: CommentToken): void {
+    onComment(token: Token.CommentToken): void {
         this.addToken(['Comment', token.data]);
     }
-    onDoctype(token: DoctypeToken): void {
+    onDoctype(token: Token.DoctypeToken): void {
         this.addToken(['DOCTYPE', token.name, token.publicId, token.systemId, !token.forceQuirks]);
     }
-    onStartTag(token: TagToken): void {
+    onStartTag(token: Token.TagToken): void {
         const reformatedAttrs = Object.fromEntries(token.attrs.map(({ name, value }) => [name, value]));
         const startTagEntry: HtmlLibToken = ['StartTag', token.tagName, reformatedAttrs];
 
@@ -47,7 +46,7 @@ class TokenizeHandler implements TokenSourceData, TokenHandler {
 
         this.addToken(startTagEntry);
     }
-    onEndTag(token: TagToken): void {
+    onEndTag(token: Token.TagToken): void {
         // NOTE: parser feedback simulator can produce adjusted SVG
         // tag names for end tag tokens so we need to lower case it
         this.addToken(['EndTag', token.tagName.toLowerCase()]);
@@ -55,7 +54,7 @@ class TokenizeHandler implements TokenSourceData, TokenHandler {
     onEof(): void {
         this.sawEof = true;
     }
-    onCharacter(token: CharacterToken): void {
+    onCharacter(token: Token.CharacterToken): void {
         const lastEntry = this.tokens[this.tokens.length - 1];
 
         if (lastEntry && lastEntry[0] === 'Character' && lastEntry[1] != null) {
@@ -70,10 +69,10 @@ class TokenizeHandler implements TokenSourceData, TokenHandler {
         assert.ok(typeof actual[1] === 'string');
         assert.ok(expected[1]?.startsWith(actual[1]));
     }
-    onNullCharacter(token: CharacterToken): void {
+    onNullCharacter(token: Token.CharacterToken): void {
         this.onCharacter(token);
     }
-    onWhitespaceCharacter(token: CharacterToken): void {
+    onWhitespaceCharacter(token: Token.CharacterToken): void {
         this.onCharacter(token);
     }
     onParseError(err: ParserError): void {
diff --git a/test/utils/parse-dat-file.ts b/test/utils/parse-dat-file.ts
index 06e3d55ac..edb41b964 100644
--- a/test/utils/parse-dat-file.ts
+++ b/test/utils/parse-dat-file.ts
@@ -1,6 +1,4 @@
-import { TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
-import type { TreeAdapter } from 'parse5/dist/tree-adapters/interface.js';
-import { NAMESPACES as NS } from 'parse5/dist/common/html.js';
+import { html, type TreeAdapterTypeMap, type TreeAdapter } from 'parse5';
 
 function createFragmentContext<T extends TreeAdapterTypeMap>(
     tagName: string | undefined,
@@ -10,16 +8,16 @@ function createFragmentContext<T extends TreeAdapterTypeMap>(
         return null;
     }
 
-    let namespace = NS.HTML;
+    let namespace = html.NS.HTML;
     const parts = tagName.split(' ');
 
     if (parts.length > 1) {
         tagName = parts[1];
 
         if (parts[0] === 'svg') {
-            namespace = NS.SVG;
+            namespace = html.NS.SVG;
         } else if (parts[0] === 'math') {
-            namespace = NS.MATHML;
+            namespace = html.NS.MATHML;
         }
     }
 
diff --git a/test/utils/serialize-to-dat-file-format.ts b/test/utils/serialize-to-dat-file-format.ts
index ecba98d87..c6bb23a45 100644
--- a/test/utils/serialize-to-dat-file-format.ts
+++ b/test/utils/serialize-to-dat-file-format.ts
@@ -1,6 +1,4 @@
-import type { Attribute } from 'parse5/dist/common/token.js';
-import type { TreeAdapter, TreeAdapterTypeMap } from 'parse5/dist/tree-adapters/interface.js';
-import { TAG_NAMES as $, NAMESPACES as NS } from 'parse5/dist/common/html.js';
+import { html, type TreeAdapter, type TreeAdapterTypeMap, type Token } from 'parse5';
 
 function getSerializedTreeIndent(indent: number): string {
     return '|'.padEnd(indent + 2, ' ');
@@ -11,9 +9,9 @@ function getElementSerializedNamespaceURI<T extends TreeAdapterTypeMap>(
     treeAdapter: TreeAdapter<T>
 ): string {
     switch (treeAdapter.getNamespaceURI(element)) {
-        case NS.SVG:
+        case html.NS.SVG:
             return 'svg ';
-        case NS.MATHML:
+        case html.NS.MATHML:
             return 'math ';
         default:
             return '';
@@ -51,7 +49,7 @@ function serializeNodeList<T extends TreeAdapterTypeMap>(
             str += `<${getElementSerializedNamespaceURI(node, treeAdapter) + tn}>\n`;
 
             let childrenIndent = indent + 2;
-            const serializedAttrs = treeAdapter.getAttrList(node).map((attr: Attribute) => {
+            const serializedAttrs = treeAdapter.getAttrList(node).map((attr: Token.Attribute) => {
                 let attrStr = getSerializedTreeIndent(childrenIndent);
 
                 if (attr.prefix) {
@@ -65,7 +63,7 @@ function serializeNodeList<T extends TreeAdapterTypeMap>(
 
             str += serializedAttrs.sort().join('');
 
-            if (tn === $.TEMPLATE && treeAdapter.getNamespaceURI(node) === NS.HTML) {
+            if (tn === html.TAG_NAMES.TEMPLATE && treeAdapter.getNamespaceURI(node) === html.NS.HTML) {
                 str += `${getSerializedTreeIndent(childrenIndent)}content\n`;
                 childrenIndent += 2;
                 node = treeAdapter.getTemplateContent(node);