diff --git a/pages/info/debug.tsx b/pages/info/debug.tsx
index 4b4e6d633..e135b1579 100644
--- a/pages/info/debug.tsx
+++ b/pages/info/debug.tsx
@@ -7,7 +7,7 @@ import DownloadIcon from '@mui/icons-material/Download';
 import { AppPlaceholder } from '../../src/apps/AppPlaceholder';
 
 import { getBackendCapabilities } from '~/modules/backend/store-backend-capabilities';
-import { getPlantUmlServerUrl } from '~/modules/blocks/code/RenderCodePlantUML';
+import { getPlantUmlServerUrl } from '~/modules/blocks/code/code-renderers/RenderCodePlantUML';
 
 import { withNextJSPerPageLayout } from '~/common/layout/withLayout';
 
diff --git a/src/modules/blocks/code/RenderCode.tsx b/src/modules/blocks/code/RenderCode.tsx
index a70cf673b..9986851ec 100644
--- a/src/modules/blocks/code/RenderCode.tsx
+++ b/src/modules/blocks/code/RenderCode.tsx
@@ -18,15 +18,15 @@ import { copyToClipboard } from '~/common/util/clipboardUtils';
 import { useUIPreferencesStore } from '~/common/state/store-ui';
 
 import { OverlayButton, overlayButtonsActiveSx, overlayButtonsClassName, overlayButtonsSx } from '../OverlayButton';
-import { RenderCodeHtmlIFrame } from './RenderCodeHtmlIFrame';
-import { RenderCodeMermaid } from './RenderCodeMermaid';
-import { RenderCodeSVG } from './RenderCodeSVG';
-import { RenderCodeSyntax } from './RenderCodeSyntax';
+import { RenderCodeHtmlIFrame } from './code-renderers/RenderCodeHtmlIFrame';
+import { RenderCodeMermaid } from './code-renderers/RenderCodeMermaid';
+import { RenderCodeSVG } from './code-renderers/RenderCodeSVG';
+import { RenderCodeSyntax } from './code-renderers/RenderCodeSyntax';
 import { heuristicIsBlockPureHTML } from '../danger-html/RenderDangerousHtml';
-import { heuristicIsCodePlantUML, RenderCodePlantUML, usePlantUmlSvg } from './RenderCodePlantUML';
-import { isCodePenSupported, openInCodePen } from './openInCodePen';
-import { isJSFiddleSupported, openInJsFiddle } from './openInJsFiddle';
-import { isStackBlitzSupported, openInStackBlitz } from './openInStackBlitz';
+import { heuristicIsCodePlantUML, RenderCodePlantUML, usePlantUmlSvg } from './code-renderers/RenderCodePlantUML';
+import { isCodePenSupported, openInCodePen } from './buttons/openInCodePen';
+import { isJSFiddleSupported, openInJsFiddle } from './buttons/openInJsFiddle';
+import { isStackBlitzSupported, openInStackBlitz } from './buttons/openInStackBlitz';
 
 // style for line-numbers
 import './RenderCode.css';
@@ -68,7 +68,7 @@ function RenderCode(props: RenderCodeBaseProps) {
 const _DynamicPrism = React.lazy(async () => {
 
   // Dynamically import the code highlight functions
-  const { highlightCode, inferCodeLanguage } = await import('./codePrism');
+  const { highlightCode, inferCodeLanguage } = await import('./highlight/codePrism');
 
   return {
     default: (props: RenderCodeBaseProps) => <RenderCodeImpl highlightCode={highlightCode} inferCodeLanguage={inferCodeLanguage} {...props} />,
diff --git a/src/modules/blocks/code/openInCodePen.tsx b/src/modules/blocks/code/buttons/openInCodePen.tsx
similarity index 100%
rename from src/modules/blocks/code/openInCodePen.tsx
rename to src/modules/blocks/code/buttons/openInCodePen.tsx
diff --git a/src/modules/blocks/code/openInJsFiddle.tsx b/src/modules/blocks/code/buttons/openInJsFiddle.tsx
similarity index 100%
rename from src/modules/blocks/code/openInJsFiddle.tsx
rename to src/modules/blocks/code/buttons/openInJsFiddle.tsx
diff --git a/src/modules/blocks/code/openInStackBlitz.tsx b/src/modules/blocks/code/buttons/openInStackBlitz.tsx
similarity index 100%
rename from src/modules/blocks/code/openInStackBlitz.tsx
rename to src/modules/blocks/code/buttons/openInStackBlitz.tsx
diff --git a/src/modules/blocks/code/RenderCodeHtmlIFrame.tsx b/src/modules/blocks/code/code-renderers/RenderCodeHtmlIFrame.tsx
similarity index 100%
rename from src/modules/blocks/code/RenderCodeHtmlIFrame.tsx
rename to src/modules/blocks/code/code-renderers/RenderCodeHtmlIFrame.tsx
diff --git a/src/modules/blocks/code/RenderCodeMermaid.tsx b/src/modules/blocks/code/code-renderers/RenderCodeMermaid.tsx
similarity index 98%
rename from src/modules/blocks/code/RenderCodeMermaid.tsx
rename to src/modules/blocks/code/code-renderers/RenderCodeMermaid.tsx
index bb9b68368..95d714be2 100644
--- a/src/modules/blocks/code/RenderCodeMermaid.tsx
+++ b/src/modules/blocks/code/code-renderers/RenderCodeMermaid.tsx
@@ -150,7 +150,7 @@ export function RenderCodeMermaid(props: { mermaidCode: string, fitScreen: boole
     <Box component='div'>
       {hasSvgError && (
         <Typography level='body-sm' color='danger' variant='soft' sx={{ mb: 2, borderRadius: 'xs' }}>
-          Mermaid: issue with generated diagrams code.
+          Unable to display diagram. Issue with the generated Mermaid code.
         </Typography>
       )}
       <Box
diff --git a/src/modules/blocks/code/RenderCodePlantUML.tsx b/src/modules/blocks/code/code-renderers/RenderCodePlantUML.tsx
similarity index 100%
rename from src/modules/blocks/code/RenderCodePlantUML.tsx
rename to src/modules/blocks/code/code-renderers/RenderCodePlantUML.tsx
diff --git a/src/modules/blocks/code/RenderCodeSVG.tsx b/src/modules/blocks/code/code-renderers/RenderCodeSVG.tsx
similarity index 100%
rename from src/modules/blocks/code/RenderCodeSVG.tsx
rename to src/modules/blocks/code/code-renderers/RenderCodeSVG.tsx
diff --git a/src/modules/blocks/code/RenderCodeSyntax.tsx b/src/modules/blocks/code/code-renderers/RenderCodeSyntax.tsx
similarity index 100%
rename from src/modules/blocks/code/RenderCodeSyntax.tsx
rename to src/modules/blocks/code/code-renderers/RenderCodeSyntax.tsx
diff --git a/src/modules/blocks/code/codePrism.ts b/src/modules/blocks/code/highlight/codePrism.ts
similarity index 100%
rename from src/modules/blocks/code/codePrism.ts
rename to src/modules/blocks/code/highlight/codePrism.ts
diff --git a/src/modules/blocks/danger-html/RenderDangerousHtml.tsx b/src/modules/blocks/danger-html/RenderDangerousHtml.tsx
index 6a12c359e..7f35ff81f 100644
--- a/src/modules/blocks/danger-html/RenderDangerousHtml.tsx
+++ b/src/modules/blocks/danger-html/RenderDangerousHtml.tsx
@@ -8,7 +8,7 @@ import WebIcon from '@mui/icons-material/Web';
 import { copyToClipboard } from '~/common/util/clipboardUtils';
 
 import { OverlayButton, overlayButtonsActiveSx, overlayButtonsClassName, overlayButtonsSx } from '../OverlayButton';
-import { RenderCodeHtmlIFrame } from '../code/RenderCodeHtmlIFrame';
+import { RenderCodeHtmlIFrame } from '../code/code-renderers/RenderCodeHtmlIFrame';
 
 
 // this is used by the blocks parser (for full text detection) and by the Code component (for inline rendering)