diff --git a/frontends/nextjs/src/lib/rendering/builder-types.ts b/frontends/nextjs/src/lib/rendering/page/builder-types.ts
similarity index 100%
rename from frontends/nextjs/src/lib/rendering/builder-types.ts
rename to frontends/nextjs/src/lib/rendering/page/builder-types.ts
diff --git a/frontends/nextjs/src/lib/rendering/page-definition-builder.ts b/frontends/nextjs/src/lib/rendering/page/page-definition-builder.ts
similarity index 100%
rename from frontends/nextjs/src/lib/rendering/page-definition-builder.ts
rename to frontends/nextjs/src/lib/rendering/page/page-definition-builder.ts
diff --git a/frontends/nextjs/src/lib/rendering/page-renderer.ts b/frontends/nextjs/src/lib/rendering/page/page-renderer.ts
similarity index 100%
rename from frontends/nextjs/src/lib/rendering/page-renderer.ts
rename to frontends/nextjs/src/lib/rendering/page/page-renderer.ts
diff --git a/frontends/nextjs/src/lib/rendering/declarative-component-renderer.test.ts b/frontends/nextjs/src/lib/rendering/tests/declarative-component-renderer.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/rendering/declarative-component-renderer.test.ts
rename to frontends/nextjs/src/lib/rendering/tests/declarative-component-renderer.test.ts
diff --git a/frontends/nextjs/src/lib/rendering/page-renderer.test.ts b/frontends/nextjs/src/lib/rendering/tests/page-renderer.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/rendering/page-renderer.test.ts
rename to frontends/nextjs/src/lib/rendering/tests/page-renderer.test.ts