diff --git a/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java b/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
index 4871471644a75dde6e76cbf141852d5b3cd58d7d..034a7f0b2c67c6cbee91c7a3b44a292989d13b31 100644
--- a/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
+++ b/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
@@ -2,8 +2,8 @@ package org.commonmark.ext.gfm.tables.internal;
 
 import org.commonmark.ext.gfm.tables.*;
 import org.commonmark.internal.util.AsciiMatcher;
-import org.commonmark.internal.util.CharMatcher;
 import org.commonmark.node.Node;
+import org.commonmark.parser.beta.CharMatcher;
 import org.commonmark.renderer.NodeRenderer;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
 import org.commonmark.renderer.markdown.MarkdownWriter;
diff --git a/commonmark/src/main/java/module-info.java b/commonmark/src/main/java/module-info.java
index 4101708c8bfa10510bc97cca49b6f0610aee811f..f216d7989969b7452c7c5ab3cae5dbaa15f50bc7 100644
--- a/commonmark/src/main/java/module-info.java
+++ b/commonmark/src/main/java/module-info.java
@@ -8,4 +8,6 @@ module org.commonmark {
     exports org.commonmark.renderer;
     exports org.commonmark.renderer.html;
     exports org.commonmark.renderer.text;
+    exports org.commonmark.renderer.markdown;
+    exports org.commonmark.internal.util;
 }
diff --git a/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java b/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
index 30d6d1a5c09d44207fc4d80146b12eb57408002b..f50e485457fef9ccfc503c9975a75df0ba6f666a 100644
--- a/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
+++ b/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
@@ -1,9 +1,9 @@
 package org.commonmark.renderer.markdown;
 
 import org.commonmark.internal.util.AsciiMatcher;
-import org.commonmark.internal.util.CharMatcher;
-import org.commonmark.internal.util.Parsing;
 import org.commonmark.node.*;
+import org.commonmark.parser.beta.CharMatcher;
+import org.commonmark.parser.beta.Parsing;
 import org.commonmark.renderer.NodeRenderer;
 
 import java.util.Arrays;
diff --git a/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java b/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
index 1231a4a7335b851f67d120a1a639f6c6d35fc6ba..b254b46daf8792d3b883164be757de013231315d 100644
--- a/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
+++ b/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
@@ -1,6 +1,6 @@
 package org.commonmark.renderer.markdown;
 
-import org.commonmark.internal.util.CharMatcher;
+import org.commonmark.parser.beta.CharMatcher;
 
 import java.io.IOException;
 import java.util.LinkedList;