diff --git a/pom.xml b/pom.xml
index aab214c0..1c3659a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbclaudecodegui</groupId>
     <artifactId>netbeans-claude-code-gui</artifactId>
-    <version>0.23.17-SNAPSHOT</version>
+    <version>0.23.18-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Plugin Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>
diff --git a/src/main/java/io/github/nbclaudecodegui/ui/MarkdownDiffPanel.java b/src/main/java/io/github/nbclaudecodegui/ui/MarkdownDiffPanel.java
index 296ce04f..160461d0 100644
--- a/src/main/java/io/github/nbclaudecodegui/ui/MarkdownDiffPanel.java
+++ b/src/main/java/io/github/nbclaudecodegui/ui/MarkdownDiffPanel.java
@@ -1,7 +1,7 @@
 package io.github.nbclaudecodegui.ui;
 
-import io.github.nbclaudecodegui.ui.common.MarkdownRenderer;
-import io.github.nbclaudecodegui.ui.common.markdown.MarkdownFindBar;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownFindBar;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownRenderer;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
diff --git a/src/main/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTab.java b/src/main/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTab.java
index ea4dbdd7..529e1611 100644
--- a/src/main/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTab.java
+++ b/src/main/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTab.java
@@ -1,11 +1,11 @@
 package io.github.nbclaudecodegui.ui;
 
 import io.github.nbclaudecodegui.settings.ClaudeCodePreferences;
-import io.github.nbclaudecodegui.ui.common.MarkdownRenderer;
 import io.github.nbclaudecodegui.ui.common.UiUtils;
 import io.github.nbclaudecodegui.ui.common.Zoomable;
 import io.github.nbclaudecodegui.ui.common.ZoomSupport;
-import io.github.nbclaudecodegui.ui.common.markdown.MarkdownFindBar;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownFindBar;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownRenderer;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 import org.openide.util.NbPreferences;
diff --git a/src/main/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBar.java b/src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBar.java
similarity index 99%
rename from src/main/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBar.java
rename to src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBar.java
index 68ccb1d6..864fd427 100644
--- a/src/main/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBar.java
+++ b/src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBar.java
@@ -1,4 +1,4 @@
-package io.github.nbclaudecodegui.ui.common.markdown;
+package io.github.nbclaudecodegui.ui.markdown;
 
 import java.awt.Color;
 import java.awt.Dimension;
diff --git a/src/main/java/io/github/nbclaudecodegui/ui/common/MarkdownRenderer.java b/src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRenderer.java
similarity index 99%
rename from src/main/java/io/github/nbclaudecodegui/ui/common/MarkdownRenderer.java
rename to src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRenderer.java
index b9b87495..d70c61b5 100644
--- a/src/main/java/io/github/nbclaudecodegui/ui/common/MarkdownRenderer.java
+++ b/src/main/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRenderer.java
@@ -1,4 +1,4 @@
-package io.github.nbclaudecodegui.ui.common;
+package io.github.nbclaudecodegui.ui.markdown;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import io.github.nbclaudecodegui.ui.common.BasicTextContextMenu;
 import javax.swing.JEditorPane;
 import javax.swing.UIManager;
 import javax.swing.text.html.HTMLDocument;
diff --git a/src/test/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTabTest.java b/src/test/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTabTest.java
index d69bc9a9..35782c81 100644
--- a/src/test/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTabTest.java
+++ b/src/test/java/io/github/nbclaudecodegui/ui/MarkdownPreviewTabTest.java
@@ -1,6 +1,6 @@
 package io.github.nbclaudecodegui.ui;
 
-import io.github.nbclaudecodegui.ui.common.MarkdownRenderer;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownRenderer;
 import java.awt.Component;
 import org.openide.windows.TopComponent;
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/io/github/nbclaudecodegui/ui/MarkdownZoomTest.java b/src/test/java/io/github/nbclaudecodegui/ui/MarkdownZoomTest.java
index c0eb3065..8617e2c0 100644
--- a/src/test/java/io/github/nbclaudecodegui/ui/MarkdownZoomTest.java
+++ b/src/test/java/io/github/nbclaudecodegui/ui/MarkdownZoomTest.java
@@ -1,6 +1,6 @@
 package io.github.nbclaudecodegui.ui;
 
-import io.github.nbclaudecodegui.ui.common.MarkdownRenderer;
+import io.github.nbclaudecodegui.ui.markdown.MarkdownRenderer;
 import java.awt.event.KeyEvent;
 import javax.swing.JComponent;
 import javax.swing.JEditorPane;
diff --git a/src/test/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBarTest.java b/src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBarTest.java
similarity index 98%
rename from src/test/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBarTest.java
rename to src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBarTest.java
index 9eb18ee7..69d8ce23 100644
--- a/src/test/java/io/github/nbclaudecodegui/ui/common/markdown/MarkdownFindBarTest.java
+++ b/src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownFindBarTest.java
@@ -1,4 +1,4 @@
-package io.github.nbclaudecodegui.ui.common.markdown;
+package io.github.nbclaudecodegui.ui.markdown;
 
 import java.util.List;
 import javax.swing.JEditorPane;
diff --git a/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java b/src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRendererTest.java
similarity index 97%
rename from src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java
rename to src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRendererTest.java
index 94f51dd4..333953a0 100644
--- a/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java
+++ b/src/test/java/io/github/nbclaudecodegui/ui/markdown/MarkdownRendererTest.java
@@ -1,4 +1,4 @@
-package io.github.nbclaudecodegui.ui.common;
+package io.github.nbclaudecodegui.ui.markdown;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -18,7 +18,7 @@
  * Unit tests for {@link MarkdownRenderer}.
  *
  * <p>toHtml() tests are fixture-based: each case is a pair of resource files under
- * {@code io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/}:
+ * {@code io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/}:
  * <ul>
  *   <li>{@code <case>.src.md} — input markdown</li>
  *   <li>{@code <case>.expectedHtml.html} — expected HTML output</li>
@@ -27,7 +27,7 @@
 class MarkdownRendererTest {
 
     private static final String TO_HTML_RESOURCE_DIR =
-            "io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html";
+            "io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html";
 
     static Stream<Object[]> toHtmlTestCases() throws Exception {
         URL dirUrl = MarkdownRendererTest.class.getClassLoader().getResource(TO_HTML_RESOURCE_DIR);
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/blockquote.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/blockquote.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/blockquote.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/blockquote.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/blockquote.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/blockquote.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/blockquote.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/blockquote.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block-html-escaped.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block-html-escaped.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block-html-escaped.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block-html-escaped.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block-html-escaped.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block-html-escaped.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block-html-escaped.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block-html-escaped.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/fenced-code-block.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/fenced-code-block.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-after-list-code-block.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-after-list-code-block.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-after-list-code-block.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-after-list-code-block.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-after-list-code-block.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-after-list-code-block.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-after-list-code-block.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-after-list-code-block.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-h1-h2-h3.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-h1-h2-h3.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-h1-h2-h3.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-h1-h2-h3.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-h1-h2-h3.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-h1-h2-h3.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-h1-h2-h3.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-h1-h2-h3.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-slug-punctuation.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-slug-punctuation.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-slug-punctuation.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-slug-punctuation.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-slug-punctuation.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-slug-punctuation.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/heading-slug-punctuation.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/heading-slug-punctuation.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/image-in-paragraph.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/image-in-paragraph.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/image-in-paragraph.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/image-in-paragraph.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/image-in-paragraph.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/image-in-paragraph.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/image-in-paragraph.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/image-in-paragraph.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/indented-code-block-no-leading-spaces.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/indented-code-block-no-leading-spaces.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/indented-code-block-no-leading-spaces.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/indented-code-block-no-leading-spaces.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/indented-code-block-no-leading-spaces.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/indented-code-block-no-leading-spaces.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/indented-code-block-no-leading-spaces.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/indented-code-block-no-leading-spaces.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/link-in-paragraph.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/link-in-paragraph.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/link-in-paragraph.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/link-in-paragraph.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/link-in-paragraph.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/link-in-paragraph.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/link-in-paragraph.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/link-in-paragraph.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/list-returns-to-outer-after-sublist.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/list-returns-to-outer-after-sublist.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/list-returns-to-outer-after-sublist.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/list-returns-to-outer-after-sublist.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/list-returns-to-outer-after-sublist.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/list-returns-to-outer-after-sublist.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/list-returns-to-outer-after-sublist.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/list-returns-to-outer-after-sublist.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/mixed-nested-list.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/mixed-nested-list.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/mixed-nested-list.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/mixed-nested-list.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/mixed-nested-list.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/mixed-nested-list.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/mixed-nested-list.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/mixed-nested-list.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-multiple-code-blocks.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-multiple-code-blocks.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-multiple-code-blocks.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-multiple-code-blocks.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-multiple-code-blocks.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-multiple-code-blocks.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-multiple-code-blocks.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-multiple-code-blocks.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-sub-items-after-code-block.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-sub-items-after-code-block.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-sub-items-after-code-block.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-sub-items-after-code-block.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-sub-items-after-code-block.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-sub-items-after-code-block.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/nested-list-sub-items-after-code-block.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/nested-list-sub-items-after-code-block.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/non-list-continuation-inside-li.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/non-list-continuation-inside-li.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/non-list-continuation-inside-li.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/non-list-continuation-inside-li.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/non-list-continuation-inside-li.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/non-list-continuation-inside-li.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/non-list-continuation-inside-li.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/non-list-continuation-inside-li.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-code-block-inside-li.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-code-block-inside-li.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-code-block-inside-li.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-code-block-inside-li.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-code-block-inside-li.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-code-block-inside-li.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-code-block-inside-li.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-code-block-inside-li.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-explicit-start.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-explicit-start.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-explicit-start.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-explicit-start.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-explicit-start.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-explicit-start.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-explicit-start.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-explicit-start.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-simple.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-simple.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-simple.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-simple.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-simple.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-simple.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-simple.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-simple.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-with-code-block.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-with-code-block.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-with-code-block.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-with-code-block.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-with-code-block.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-with-code-block.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/ordered-list-with-code-block.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/ordered-list-with-code-block.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/outer-item-after-code-block-in-sublist.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/paragraph.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/paragraph.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/paragraph.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/paragraph.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/paragraph.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/paragraph.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/paragraph.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/paragraph.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-basic.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-basic.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-basic.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-basic.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-basic.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-basic.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-basic.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-basic.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-followed-by-paragraph.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-followed-by-paragraph.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-followed-by-paragraph.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-followed-by-paragraph.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-followed-by-paragraph.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-followed-by-paragraph.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-followed-by-paragraph.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-followed-by-paragraph.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-html-escaped.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-html-escaped.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-html-escaped.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-html-escaped.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-html-escaped.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-html-escaped.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-html-escaped.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-html-escaped.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-inline-markdown.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-inline-markdown.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-inline-markdown.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-inline-markdown.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-inline-markdown.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-inline-markdown.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/table-inline-markdown.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/table-inline-markdown.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-code-block-resets-numbering.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-code-block-resets-numbering.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-code-block-resets-numbering.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-code-block-resets-numbering.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-code-block-resets-numbering.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-code-block-resets-numbering.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-code-block-resets-numbering.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-code-block-resets-numbering.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-list-code-block-after-heading.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-list-code-block-after-heading.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-list-code-block-after-heading.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-list-code-block-after-heading.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-list-code-block-after-heading.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-list-code-block-after-heading.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/top-level-list-code-block-after-heading.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/top-level-list-code-block-after-heading.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-code-block-not-split.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-code-block-not-split.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-code-block-not-split.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-code-block-not-split.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-code-block-not-split.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-code-block-not-split.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-code-block-not-split.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-code-block-not-split.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-nested.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-nested.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-nested.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-nested.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-nested.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-nested.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-nested.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-nested.src.md
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-simple.expectedHtml.html b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-simple.expectedHtml.html
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-simple.expectedHtml.html
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-simple.expectedHtml.html
diff --git a/src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-simple.src.md b/src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-simple.src.md
similarity index 100%
rename from src/test/resources/io/github/nbclaudecodegui/ui/common/markdown-renderer/to-html/unordered-list-simple.src.md
rename to src/test/resources/io/github/nbclaudecodegui/ui/markdown/markdown-renderer/to-html/unordered-list-simple.src.md