diff --git a/__fixtures__/test-project-rsa/web/src/AboutCounter.tsx b/__fixtures__/test-project-rsa/web/src/AboutCounter.tsx
deleted file mode 100644
index c86915e87f8b..000000000000
--- a/__fixtures__/test-project-rsa/web/src/AboutCounter.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-'use client'
-
-import React from 'react'
-
-// @ts-expect-error no types
-import styles from './Counter.module.css'
-import './Counter.css'
-
-export const AboutCounter = () => {
-  const [count, setCount] = React.useState(0)
-
-  return (
-    <div style={{ border: '3px blue dashed', margin: '1em', padding: '1em' }}>
-      <p>Count: {count}</p>
-      <button onClick={() => setCount((c) => c + 1)}>Increment</button>
-      <h3 className={styles.header}>This is a client component.</h3>
-      <p>RSC on client: {globalThis.RWJS_EXP_RSC ? 'enabled' : 'disabled'}</p>
-    </div>
-  )
-}
diff --git a/__fixtures__/test-project-rsa/web/src/AboutPage.css b/__fixtures__/test-project-rsa/web/src/AboutPage.css
deleted file mode 100644
index 995b3bbde1e0..000000000000
--- a/__fixtures__/test-project-rsa/web/src/AboutPage.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.about-page {
-}
diff --git a/__fixtures__/test-project-rsa/web/src/AboutPage.tsx b/__fixtures__/test-project-rsa/web/src/AboutPage.tsx
deleted file mode 100644
index 0caf6a955090..000000000000
--- a/__fixtures__/test-project-rsa/web/src/AboutPage.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Assets } from '@redwoodjs/vite/assets'
-import { ProdRwRscServerGlobal } from '@redwoodjs/vite/rwRscGlobal'
-
-import { AboutCounter } from './AboutCounter'
-
-import './AboutPage.css'
-
-// TODO (RSC) Something like this will probably be needed
-// const RwRscGlobal = import.meta.env.PROD ? ProdRwRscServerGlobal : DevRwRscServerGlobal;
-
-globalThis.rwRscGlobal = new ProdRwRscServerGlobal()
-
-const AboutPage = () => {
-  return (
-    <div className="about-page">
-      {/* TODO (RSC) <Assets /> should be part of the router later */}
-      <Assets />
-      <div style={{ border: '3px red dashed', margin: '1em', padding: '1em' }}>
-        <h1>About Redwood</h1>
-        <AboutCounter />
-        <p>RSC on server: {globalThis.RWJS_EXP_RSC ? 'enabled' : 'disabled'}</p>
-      </div>
-    </div>
-  )
-}
-
-export default AboutPage
diff --git a/__fixtures__/test-project-rsa/web/src/HomePage.css b/__fixtures__/test-project-rsa/web/src/HomePage.css
deleted file mode 100644
index 9be6b50cd8f7..000000000000
--- a/__fixtures__/test-project-rsa/web/src/HomePage.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.home-page {
-}
diff --git a/__fixtures__/test-project-rsa/web/src/HomePage.module.css b/__fixtures__/test-project-rsa/web/src/HomePage.module.css
deleted file mode 100644
index 29212ea8142d..000000000000
--- a/__fixtures__/test-project-rsa/web/src/HomePage.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.title {
-  color: green;
-}
diff --git a/__fixtures__/test-project-rsa/web/src/HomePage.tsx b/__fixtures__/test-project-rsa/web/src/HomePage.tsx
deleted file mode 100644
index aae0c8ed7e73..000000000000
--- a/__fixtures__/test-project-rsa/web/src/HomePage.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Assets } from '@redwoodjs/vite/assets'
-import { ProdRwRscServerGlobal } from '@redwoodjs/vite/rwRscGlobal'
-
-import { onSend } from './chat'
-import { Form } from './Form'
-// @ts-expect-error no types
-import styles from './HomePage.module.css'
-
-import './HomePage.css'
-
-// TODO (RSC) Something like this will probably be needed
-// const RwRscGlobal = import.meta.env.PROD ? ProdRwRscServerGlobal : DevRwRscServerGlobal;
-
-globalThis.rwRscGlobal = new ProdRwRscServerGlobal()
-
-const HomePage = ({ name = 'Anonymous' }) => {
-  return (
-    <div className="home-page">
-      {/* TODO (RSC) <Assets /> should be part of the router later */}
-      <Assets />
-      <div style={{ border: '3px red dashed', margin: '1em', padding: '1em' }}>
-        <h1 className={styles.title}>Hello {name}!!</h1>
-        <Form onSend={onSend} />
-      </div>
-    </div>
-  )
-}
-
-export default HomePage
diff --git a/__fixtures__/test-project-rsa/web/src/entry.server.tsx b/__fixtures__/test-project-rsa/web/src/entry.server.tsx
index 58bdc5fb8a13..a52b268b771d 100644
--- a/__fixtures__/test-project-rsa/web/src/entry.server.tsx
+++ b/__fixtures__/test-project-rsa/web/src/entry.server.tsx
@@ -1,5 +1,5 @@
+import App from './App'
 import { Document } from './Document'
-import HomePage from './HomePage'
 
 interface Props {
   css: string[]
@@ -9,7 +9,7 @@ interface Props {
 export const ServerEntry: React.FC<Props> = ({ css, meta }) => {
   return (
     <Document css={css} meta={meta}>
-      <HomePage />
+      <App />
     </Document>
   )
 }
diff --git a/__fixtures__/test-project-rsc-external-packages/web/src/entry.server.tsx b/__fixtures__/test-project-rsc-external-packages/web/src/entry.server.tsx
index 58bdc5fb8a13..a52b268b771d 100644
--- a/__fixtures__/test-project-rsc-external-packages/web/src/entry.server.tsx
+++ b/__fixtures__/test-project-rsc-external-packages/web/src/entry.server.tsx
@@ -1,5 +1,5 @@
+import App from './App'
 import { Document } from './Document'
-import HomePage from './HomePage'
 
 interface Props {
   css: string[]
@@ -9,7 +9,7 @@ interface Props {
 export const ServerEntry: React.FC<Props> = ({ css, meta }) => {
   return (
     <Document css={css} meta={meta}>
-      <HomePage />
+      <App />
     </Document>
   )
 }
diff --git a/__fixtures__/test-project-rsc-external-packages/web/src/actions.ts b/__fixtures__/test-project-rsc-external-packages/web/src/pages/HomePage/actions.ts
similarity index 100%
rename from __fixtures__/test-project-rsc-external-packages/web/src/actions.ts
rename to __fixtures__/test-project-rsc-external-packages/web/src/pages/HomePage/actions.ts
diff --git a/__fixtures__/test-project-rsc-external-packages/web/src/words.ts b/__fixtures__/test-project-rsc-external-packages/web/src/pages/HomePage/words.ts
similarity index 100%
rename from __fixtures__/test-project-rsc-external-packages/web/src/words.ts
rename to __fixtures__/test-project-rsc-external-packages/web/src/pages/HomePage/words.ts