diff --git a/__tests__/lib/__snapshots__/mdx.test.ts.snap b/__tests__/lib/mdx/__snapshots__/mdx.test.ts.snap
similarity index 100%
rename from __tests__/lib/__snapshots__/mdx.test.ts.snap
rename to __tests__/lib/mdx/__snapshots__/mdx.test.ts.snap
diff --git a/__tests__/lib/compile.test.ts b/__tests__/lib/mdx/compile.test.ts
similarity index 88%
rename from __tests__/lib/compile.test.ts
rename to __tests__/lib/mdx/compile.test.ts
index bfa248104..9806eaeec 100644
--- a/__tests__/lib/compile.test.ts
+++ b/__tests__/lib/mdx/compile.test.ts
@@ -1,4 +1,4 @@
-import { compile } from '../../index';
+import { compile } from '../../../index';
 
 describe('compile', () => {
   describe("{ format: 'md' }", () => {
diff --git a/__tests__/lib/custom-components-mdx.test.tsx b/__tests__/lib/mdx/custom-components.test.tsx
similarity index 93%
rename from __tests__/lib/custom-components-mdx.test.tsx
rename to __tests__/lib/mdx/custom-components.test.tsx
index 3a7b4f47a..0ead4cde8 100644
--- a/__tests__/lib/custom-components-mdx.test.tsx
+++ b/__tests__/lib/mdx/custom-components.test.tsx
@@ -1,10 +1,10 @@
-import type { RMDXModule } from '../../types';
+import type { RMDXModule } from '../../../types';
 
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { compile, run } from '../../lib';
-import { execute } from '../helpers';
+import { compile, run } from '../../../lib';
+import { execute } from '../../helpers';
 
 describe('Custom Components', () => {
   let Example;
diff --git a/__tests__/lib/exports/index.test.ts b/__tests__/lib/mdx/exports/index.test.ts
similarity index 94%
rename from __tests__/lib/exports/index.test.ts
rename to __tests__/lib/mdx/exports/index.test.ts
index baaf077d2..860a1e831 100644
--- a/__tests__/lib/exports/index.test.ts
+++ b/__tests__/lib/mdx/exports/index.test.ts
@@ -1,4 +1,4 @@
-import { exports } from '../../../lib';
+import { exports } from '../../../../lib';
 
 import multipleExportsMdx from './input/multipleExports.mdx?raw';
 import singleExportMdx from './input/singleExport.mdx?raw';
diff --git a/__tests__/lib/exports/input/multipleExports.mdx b/__tests__/lib/mdx/exports/input/multipleExports.mdx
similarity index 100%
rename from __tests__/lib/exports/input/multipleExports.mdx
rename to __tests__/lib/mdx/exports/input/multipleExports.mdx
diff --git a/__tests__/lib/exports/input/singleExport.mdx b/__tests__/lib/mdx/exports/input/singleExport.mdx
similarity index 100%
rename from __tests__/lib/exports/input/singleExport.mdx
rename to __tests__/lib/mdx/exports/input/singleExport.mdx
diff --git a/__tests__/lib/exports/input/weirdExports.mdx b/__tests__/lib/mdx/exports/input/weirdExports.mdx
similarity index 100%
rename from __tests__/lib/exports/input/weirdExports.mdx
rename to __tests__/lib/mdx/exports/input/weirdExports.mdx
diff --git a/__tests__/lib/mdast/__snapshots__/anchor.test.tsx.snap b/__tests__/lib/mdx/mdast/__snapshots__/anchor.test.tsx.snap
similarity index 100%
rename from __tests__/lib/mdast/__snapshots__/anchor.test.tsx.snap
rename to __tests__/lib/mdx/mdast/__snapshots__/anchor.test.tsx.snap
diff --git a/__tests__/lib/mdast/__snapshots__/index.test.ts.snap b/__tests__/lib/mdx/mdast/__snapshots__/index.test.ts.snap
similarity index 100%
rename from __tests__/lib/mdast/__snapshots__/index.test.ts.snap
rename to __tests__/lib/mdx/mdast/__snapshots__/index.test.ts.snap
diff --git a/__tests__/lib/mdast/__snapshots__/variable.test.tsx.snap b/__tests__/lib/mdx/mdast/__snapshots__/variable.test.tsx.snap
similarity index 100%
rename from __tests__/lib/mdast/__snapshots__/variable.test.tsx.snap
rename to __tests__/lib/mdx/mdast/__snapshots__/variable.test.tsx.snap
diff --git a/__tests__/lib/mdast/anchor.test.tsx b/__tests__/lib/mdx/mdast/anchor.test.tsx
similarity index 90%
rename from __tests__/lib/mdast/anchor.test.tsx
rename to __tests__/lib/mdx/mdast/anchor.test.tsx
index 818c2c1ef..48483f34d 100644
--- a/__tests__/lib/mdast/anchor.test.tsx
+++ b/__tests__/lib/mdx/mdast/anchor.test.tsx
@@ -1,5 +1,5 @@
 
-import { mdast } from '../../../lib';
+import { mdast } from '../../../../lib';
 
 describe('convert anchor tag', () => {
     it('converts anchor tag to link node', () => {
diff --git a/__tests__/lib/mdast/esm/in.mdx b/__tests__/lib/mdx/mdast/esm/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/esm/in.mdx
rename to __tests__/lib/mdx/mdast/esm/in.mdx
diff --git a/__tests__/lib/mdast/esm/out.json b/__tests__/lib/mdx/mdast/esm/out.json
similarity index 100%
rename from __tests__/lib/mdast/esm/out.json
rename to __tests__/lib/mdx/mdast/esm/out.json
diff --git a/__tests__/lib/mdast/html-blocks/in.mdx b/__tests__/lib/mdx/mdast/html-blocks/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/html-blocks/in.mdx
rename to __tests__/lib/mdx/mdast/html-blocks/in.mdx
diff --git a/__tests__/lib/mdast/html-blocks/out.json b/__tests__/lib/mdx/mdast/html-blocks/out.json
similarity index 100%
rename from __tests__/lib/mdast/html-blocks/out.json
rename to __tests__/lib/mdx/mdast/html-blocks/out.json
diff --git a/__tests__/lib/mdast/images/inline/in.mdx b/__tests__/lib/mdx/mdast/images/inline/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/images/inline/in.mdx
rename to __tests__/lib/mdx/mdast/images/inline/in.mdx
diff --git a/__tests__/lib/mdast/images/inline/out.json b/__tests__/lib/mdx/mdast/images/inline/out.json
similarity index 100%
rename from __tests__/lib/mdast/images/inline/out.json
rename to __tests__/lib/mdx/mdast/images/inline/out.json
diff --git a/__tests__/lib/mdast/index.test.ts b/__tests__/lib/mdx/mdast/index.test.ts
similarity index 99%
rename from __tests__/lib/mdast/index.test.ts
rename to __tests__/lib/mdx/mdast/index.test.ts
index 3e5364cc6..7b9dcfead 100644
--- a/__tests__/lib/mdast/index.test.ts
+++ b/__tests__/lib/mdx/mdast/index.test.ts
@@ -1,4 +1,4 @@
-import { mdast } from '../../../lib';
+import { mdast } from '../../../../lib';
 
 // @ts-expect-error - these are being imported as strings
 import esmMdx from './esm/in.mdx?raw';
diff --git a/__tests__/lib/mdast/null-attributes/in.mdx b/__tests__/lib/mdx/mdast/null-attributes/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/null-attributes/in.mdx
rename to __tests__/lib/mdx/mdast/null-attributes/in.mdx
diff --git a/__tests__/lib/mdast/null-attributes/out.json b/__tests__/lib/mdx/mdast/null-attributes/out.json
similarity index 100%
rename from __tests__/lib/mdast/null-attributes/out.json
rename to __tests__/lib/mdx/mdast/null-attributes/out.json
diff --git a/__tests__/lib/mdast/tables/in.mdx b/__tests__/lib/mdx/mdast/tables/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/tables/in.mdx
rename to __tests__/lib/mdx/mdast/tables/in.mdx
diff --git a/__tests__/lib/mdast/tables/out.json b/__tests__/lib/mdx/mdast/tables/out.json
similarity index 100%
rename from __tests__/lib/mdast/tables/out.json
rename to __tests__/lib/mdx/mdast/tables/out.json
diff --git a/__tests__/lib/mdast/variable.test.tsx b/__tests__/lib/mdx/mdast/variable.test.tsx
similarity index 90%
rename from __tests__/lib/mdast/variable.test.tsx
rename to __tests__/lib/mdx/mdast/variable.test.tsx
index dcfd31ffb..b2d79a12f 100644
--- a/__tests__/lib/mdast/variable.test.tsx
+++ b/__tests__/lib/mdx/mdast/variable.test.tsx
@@ -1,4 +1,4 @@
-import { mdast } from '../../../lib';
+import { mdast } from '../../../../lib';
 
 describe('convert variable tag', () => {
   it('wraps root-level Variable in a paragraph', () => {
diff --git a/__tests__/lib/mdast/variables-with-spaces/in.mdx b/__tests__/lib/mdx/mdast/variables-with-spaces/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/variables-with-spaces/in.mdx
rename to __tests__/lib/mdx/mdast/variables-with-spaces/in.mdx
diff --git a/__tests__/lib/mdast/variables-with-spaces/out.json b/__tests__/lib/mdx/mdast/variables-with-spaces/out.json
similarity index 100%
rename from __tests__/lib/mdast/variables-with-spaces/out.json
rename to __tests__/lib/mdx/mdast/variables-with-spaces/out.json
diff --git a/__tests__/lib/mdast/variables/in.mdx b/__tests__/lib/mdx/mdast/variables/in.mdx
similarity index 100%
rename from __tests__/lib/mdast/variables/in.mdx
rename to __tests__/lib/mdx/mdast/variables/in.mdx
diff --git a/__tests__/lib/mdast/variables/out.json b/__tests__/lib/mdx/mdast/variables/out.json
similarity index 100%
rename from __tests__/lib/mdast/variables/out.json
rename to __tests__/lib/mdx/mdast/variables/out.json
diff --git a/__tests__/lib/mdx.test.ts b/__tests__/lib/mdx/mdx.test.ts
similarity index 96%
rename from __tests__/lib/mdx.test.ts
rename to __tests__/lib/mdx/mdx.test.ts
index bf4e744ea..597e319a4 100644
--- a/__tests__/lib/mdx.test.ts
+++ b/__tests__/lib/mdx/mdx.test.ts
@@ -1,4 +1,4 @@
-import { mdast, mdx } from '../../index';
+import { mdast, mdx } from '../../../index';
 
 describe('mdast html block parsing', () => {
   it('parses an html block into mdxJsxTextElement', () => {
diff --git a/__tests__/lib/run.test.tsx b/__tests__/lib/mdx/run.test.tsx
similarity index 98%
rename from __tests__/lib/run.test.tsx
rename to __tests__/lib/mdx/run.test.tsx
index d46531ca9..1eab179c6 100644
--- a/__tests__/lib/run.test.tsx
+++ b/__tests__/lib/mdx/run.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { execute } from '../helpers';
+import { execute } from '../../helpers';
 
 describe('run', () => {
   it('resolves user variables in TOC headings', () => {
diff --git a/__tests__/lib/gemoji.test.ts b/__tests__/lib/mdxish/gemoji.test.ts
similarity index 91%
rename from __tests__/lib/gemoji.test.ts
rename to __tests__/lib/mdxish/gemoji.test.ts
index 4e23fe0ef..ebef90679 100644
--- a/__tests__/lib/gemoji.test.ts
+++ b/__tests__/lib/mdxish/gemoji.test.ts
@@ -1,4 +1,4 @@
-import { mix } from '../../lib';
+import { mix } from '../../../lib';
 
 describe('gemoji transformer', () => {
   it('should transform shortcodes back to emojis', () => {
diff --git a/__tests__/lib/hast.test.ts b/__tests__/lib/mdxish/hast.test.ts
similarity index 94%
rename from __tests__/lib/hast.test.ts
rename to __tests__/lib/mdxish/hast.test.ts
index 40f0cce7b..dbb751db7 100644
--- a/__tests__/lib/hast.test.ts
+++ b/__tests__/lib/mdxish/hast.test.ts
@@ -1,6 +1,6 @@
 import { h } from 'hastscript';
 
-import { hast } from '../../lib';
+import { hast } from '../../../lib';
 
 describe('hast transformer', () => {
   it('parses components into the tree', () => {
diff --git a/__tests__/lib/mix.test.ts b/__tests__/lib/mdxish/mix.test.ts
similarity index 88%
rename from __tests__/lib/mix.test.ts
rename to __tests__/lib/mdxish/mix.test.ts
index 61f3cdca7..256a07ad9 100644
--- a/__tests__/lib/mix.test.ts
+++ b/__tests__/lib/mdxish/mix.test.ts
@@ -1,4 +1,4 @@
-import { mix } from '../../lib';
+import { mix } from '../../../lib';
 
 describe('mix', () => {
   it('renders markdown as HTML', () => {
diff --git a/__tests__/lib/renderMdxish.test.tsx b/__tests__/lib/mdxish/renderMdxish.test.tsx
similarity index 97%
rename from __tests__/lib/renderMdxish.test.tsx
rename to __tests__/lib/mdxish/renderMdxish.test.tsx
index 3ec3e7d53..5198b4c5a 100644
--- a/__tests__/lib/renderMdxish.test.tsx
+++ b/__tests__/lib/mdxish/renderMdxish.test.tsx
@@ -1,12 +1,12 @@
-import type { RMDXModule } from '../../types';
+import type { RMDXModule } from '../../../types';
 import type { MDXProps } from 'mdx/types';
 
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { compile, mdxish, run } from '../../lib';
-import renderMdxish from '../../lib/renderMdxish';
+import { compile, mdxish, run } from '../../../lib';
+import renderMdxish from '../../../lib/renderMdxish';
 
 describe('renderMdxish', () => {
   it('renders simple HTML content', () => {
diff --git a/__tests__/lib/plain.test.ts b/__tests__/lib/plain/plain.test.ts
similarity index 98%
rename from __tests__/lib/plain.test.ts
rename to __tests__/lib/plain/plain.test.ts
index c2cba42c7..85dc8ecb9 100644
--- a/__tests__/lib/plain.test.ts
+++ b/__tests__/lib/plain/plain.test.ts
@@ -1,4 +1,4 @@
-import { hast, mdxish, plain } from '../../index';
+import { hast, mdxish, plain } from '../../../index';
 
 describe('plain compiler', () => {
   it('returns plain text of markdown components', () => {